CONFIG_SYS_GENERIC_BOARD: Finish migration
While we have long since migrated to CONFIG_SYS_GENERIC_BOARD being enabled, we had just a few places left that still referenced or defined it. Update. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
92e738f555
commit
0bdea7c430
@ -13,26 +13,8 @@
|
|||||||
#ifndef _XTENSA_U_BOOT_H
|
#ifndef _XTENSA_U_BOOT_H
|
||||||
#define _XTENSA_U_BOOT_H
|
#define _XTENSA_U_BOOT_H
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_GENERIC_BOARD
|
|
||||||
/* Use the generic board which requires a unified bd_info */
|
/* Use the generic board which requires a unified bd_info */
|
||||||
#include <asm-generic/u-boot.h>
|
#include <asm-generic/u-boot.h>
|
||||||
#else
|
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
typedef struct bd_info {
|
|
||||||
int bi_baudrate; /* serial console baudrate */
|
|
||||||
unsigned long bi_ip_addr; /* IP Address */
|
|
||||||
unsigned char bi_enetaddr[6]; /* Ethernet adress */
|
|
||||||
unsigned long bi_boot_params; /* where this board expects params */
|
|
||||||
unsigned long bi_memstart; /* start of DRAM memory VA */
|
|
||||||
unsigned long bi_memsize; /* size of DRAM memory in bytes */
|
|
||||||
unsigned long bi_flashstart; /* start of FLASH memory */
|
|
||||||
unsigned long bi_flashsize; /* size of FLASH memory */
|
|
||||||
unsigned long bi_flashoffset; /* offset to skip UBoot image */
|
|
||||||
} bd_t;
|
|
||||||
#endif /* __ ASSEMBLY__ */
|
|
||||||
|
|
||||||
#endif /* CONFIG_SYS_GENERIC_BOARD */
|
|
||||||
|
|
||||||
/* For image.h:image_check_target_arch() */
|
/* For image.h:image_check_target_arch() */
|
||||||
#define IH_ARCH_DEFAULT IH_ARCH_XTENSA
|
#define IH_ARCH_DEFAULT IH_ARCH_XTENSA
|
||||||
|
@ -14,8 +14,6 @@
|
|||||||
|
|
||||||
#define CONFIG_MACH_TYPE 4886
|
#define CONFIG_MACH_TYPE 4886
|
||||||
|
|
||||||
#define CONFIG_SYS_GENERIC_BOARD
|
|
||||||
|
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <asm/arch/imx-regs.h>
|
||||||
#include <asm/mach-imx/gpio.h>
|
#include <asm/mach-imx/gpio.h>
|
||||||
|
|
||||||
|
@ -32,11 +32,6 @@ extern phys_addr_t prior_stage_fdt_address;
|
|||||||
|
|
||||||
#endif /* __ASSEMBLY__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
/*
|
|
||||||
* Generic board configuration.
|
|
||||||
*/
|
|
||||||
#define CONFIG_SYS_GENERIC_BOARD
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* CPU configuration.
|
* CPU configuration.
|
||||||
*/
|
*/
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
|
|
||||||
#undef CONFIG_DISPLAY_BOARDINFO
|
#undef CONFIG_DISPLAY_BOARDINFO
|
||||||
|
|
||||||
#define CONFIG_SYS_GENERIC_BOARD
|
|
||||||
|
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <asm/arch/imx-regs.h>
|
||||||
#include <asm/mach-imx/gpio.h>
|
#include <asm/mach-imx/gpio.h>
|
||||||
|
|
||||||
|
@ -2992,7 +2992,6 @@ CONFIG_SYS_GBIT_MII1_BUSNAME
|
|||||||
CONFIG_SYS_GBIT_MII_BUSNAME
|
CONFIG_SYS_GBIT_MII_BUSNAME
|
||||||
CONFIG_SYS_GBL_DATA_OFFSET
|
CONFIG_SYS_GBL_DATA_OFFSET
|
||||||
CONFIG_SYS_GBL_DATA_SIZE
|
CONFIG_SYS_GBL_DATA_SIZE
|
||||||
CONFIG_SYS_GENERIC_BOARD
|
|
||||||
CONFIG_SYS_GIC400_ADDR
|
CONFIG_SYS_GIC400_ADDR
|
||||||
CONFIG_SYS_GP1DIR
|
CONFIG_SYS_GP1DIR
|
||||||
CONFIG_SYS_GP1ODR
|
CONFIG_SYS_GP1ODR
|
||||||
|
Loading…
Reference in New Issue
Block a user