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 --- arch/xtensa/include/asm/u-boot.h | 18 ------------------ include/configs/apalis_imx6.h | 2 -- include/configs/bcmstb.h | 5 ----- include/configs/colibri_imx6.h | 2 -- scripts/config_whitelist.txt | 1 - 5 files changed, 28 deletions(-)
diff --git a/arch/xtensa/include/asm/u-boot.h b/arch/xtensa/include/asm/u-boot.h index a3dba8db7993..24c4fce64308 100644 --- a/arch/xtensa/include/asm/u-boot.h +++ b/arch/xtensa/include/asm/u-boot.h @@ -13,26 +13,8 @@ #ifndef _XTENSA_U_BOOT_H #define _XTENSA_U_BOOT_H
-#ifdef CONFIG_SYS_GENERIC_BOARD /* Use the generic board which requires a unified bd_info */ #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() */ #define IH_ARCH_DEFAULT IH_ARCH_XTENSA diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 7225c03ac50f..443a02e7f89e 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -14,8 +14,6 @@
#define CONFIG_MACH_TYPE 4886
-#define CONFIG_SYS_GENERIC_BOARD - #include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h>
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index c74fe4086e75..b903569c6a88 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -33,11 +33,6 @@ extern phys_addr_t prior_stage_fdt_address; #endif /* __ASSEMBLY__ */
/* - * Generic board configuration. - */ -#define CONFIG_SYS_GENERIC_BOARD - -/* * CPU configuration. */ #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 7e3463e1844f..7ecde42f58b4 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -12,8 +12,6 @@
#undef CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD - #include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h>
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1a5606d1238b..1f1c8493b162 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2992,7 +2992,6 @@ CONFIG_SYS_GBIT_MII1_BUSNAME CONFIG_SYS_GBIT_MII_BUSNAME CONFIG_SYS_GBL_DATA_OFFSET CONFIG_SYS_GBL_DATA_SIZE -CONFIG_SYS_GENERIC_BOARD CONFIG_SYS_GIC400_ADDR CONFIG_SYS_GP1DIR CONFIG_SYS_GP1ODR