All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v2: - Drop changes to digsy_mtc and xilinx-ppc - Add changes to smartweb and sniper
arch/Kconfig | 1 + arch/arm/include/asm/arch-lpc32xx/config.h | 2 -- include/configs/VCMA9.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/apf27.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/aspenite.h | 5 ----- include/configs/at91-sama5_common.h | 2 -- include/configs/at91rm9200ek.h | 2 -- include/configs/at91sam9260ek.h | 2 -- include/configs/at91sam9261ek.h | 2 -- include/configs/at91sam9263ek.h | 2 -- include/configs/at91sam9m10g45ek.h | 2 -- include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9rlek.h | 2 -- include/configs/at91sam9x5ek.h | 2 -- include/configs/bcm28155_ap.h | 1 - include/configs/bcm_ep_board.h | 2 -- include/configs/bur_am335x_common.h | 2 -- include/configs/calimain.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/cm_t54.h | 3 --- include/configs/colibri_pxa270.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/corvus.h | 1 - include/configs/da850evm.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/dns325.h | 1 - include/configs/dockstar.h | 2 -- include/configs/dreamplug.h | 1 - include/configs/edminiv2.h | 3 --- include/configs/ethernut5.h | 2 -- include/configs/exynos-common.h | 2 -- include/configs/flea3.h | 1 - include/configs/goflexhome.h | 2 -- include/configs/gplugd.h | 5 ----- include/configs/guruplug.h | 2 -- include/configs/h2200.h | 1 - include/configs/highbank.h | 1 - include/configs/ib62x0.h | 2 -- include/configs/iconnect.h | 2 -- include/configs/imx31_phycore.h | 2 -- include/configs/integrator-common.h | 1 - include/configs/ipam390.h | 1 - include/configs/km/km_arm.h | 2 -- include/configs/kzm9g.h | 1 - include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atwr.h | 2 -- include/configs/ls2085a_common.h | 2 -- include/configs/lsxl.h | 2 -- include/configs/m53evk.h | 1 - include/configs/maxbcm.h | 1 - include/configs/mcx.h | 2 -- include/configs/mx25pdk.h | 1 - include/configs/mx31ads.h | 2 -- include/configs/mx31pdk.h | 2 -- include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53ard.h | 2 -- include/configs/mx53evk.h | 2 -- include/configs/mx53loco.h | 2 -- include/configs/mx53smd.h | 2 -- include/configs/mx6_common.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mxs.h | 5 ----- include/configs/nas220.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/pm9261.h | 2 -- include/configs/pm9263.h | 2 -- include/configs/pm9g45.h | 2 -- include/configs/pogo_e02.h | 2 -- include/configs/rcar-gen2-common.h | 1 - include/configs/rpi-common.h | 1 - include/configs/s5p_goni.h | 2 -- include/configs/sheevaplug.h | 2 -- include/configs/siemens-am33x-common.h | 2 -- include/configs/smartweb.h | 1 - include/configs/smdk2410.h | 2 -- include/configs/smdkc100.h | 2 -- include/configs/snapper9260.h | 1 - include/configs/sniper.h | 1 - include/configs/socfpga_common.h | 2 -- include/configs/spear-common.h | 2 -- include/configs/stm32f429-discovery.h | 1 - include/configs/stv0991.h | 1 - include/configs/sunxi-common.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/taurus.h | 1 - include/configs/tegra-common.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/tricorder.h | 2 -- include/configs/uniphier.h | 2 -- include/configs/usb_a9263.h | 1 - include/configs/usbarmory.h | 1 - include/configs/vexpress_aemv8a.h | 3 --- include/configs/vexpress_common.h | 1 - include/configs/vf610twr.h | 1 - include/configs/woodburn_common.h | 1 - include/configs/work_92105.h | 1 - include/configs/x600.h | 1 - include/configs/xilinx_zynqmp.h | 2 -- include/configs/zmx25.h | 2 -- include/configs/zynq-common.h | 2 -- 109 files changed, 1 insertion(+), 173 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig index e952bb1..f4732c8 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -24,6 +24,7 @@ config ARM select CREATE_ARCH_SYMLINK select HAVE_PRIVATE_LIBGCC if !ARM64 select HAVE_GENERIC_BOARD + select SYS_GENERIC_BOARD select SUPPORT_OF_CONTROL
config AVR32 diff --git a/arch/arm/include/asm/arch-lpc32xx/config.h b/arch/arm/include/asm/arch-lpc32xx/config.h index d57bc48..ad2fbeb 100644 --- a/arch/arm/include/asm/arch-lpc32xx/config.h +++ b/arch/arm/include/asm/arch-lpc32xx/config.h @@ -9,8 +9,6 @@ #ifndef _LPC32XX_CONFIG_H #define _LPC32XX_CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD - /* Basic CPU architecture */ #define CONFIG_ARCH_CPU_INIT
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 5b2e092..6ce88f6 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -27,7 +27,6 @@
#define CONFIG_SYS_TEXT_BASE 0x0
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 654b778..0bf0af7 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -19,7 +19,6 @@ #define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP3_AM3517CRANE 1 /* working with CRANEBOARD */ #define CONFIG_OMAP_COMMON -#define CONFIG_SYS_GENERIC_BOARD /* Common ARM Erratas */ #define CONFIG_ARM_ERRATA_454179 #define CONFIG_ARM_ERRATA_430973 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 7049091..9aa14f4 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -19,7 +19,6 @@ #define CONFIG_OMAP 1 /* in a TI OMAP core */ #define CONFIG_OMAP3_AM3517EVM 1 /* working with AM3517EVM */ #define CONFIG_OMAP_COMMON -#define CONFIG_SYS_GENERIC_BOARD /* Common ARM Erratas */ #define CONFIG_ARM_ERRATA_454179 #define CONFIG_ARM_ERRATA_430973 diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 43fbdd3..a91b7c2 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -20,7 +20,6 @@ */ #define CONFIG_MX27 /* This is a Freescale i.MX27 Chip */ #define CONFIG_MACH_TYPE 1698 /* APF27 */ -#define CONFIG_SYS_GENERIC_BOARD
/* * Enable the call to miscellaneous platform dependent initialization. diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 7f5cbcc..dfbd60d 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -41,7 +41,6 @@ #define CONFIG_USE_ARCH_MEMCPY #define CONFIG_TMU_TIMER #define CONFIG_SYS_DCACHE_OFF -#define CONFIG_SYS_GENERIC_BOARD
/* STACK */ #define CONFIG_SYS_INIT_SP_ADDR 0xE8083000 diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index 62c5374..fcb5f81 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -11,11 +11,6 @@ #define __CONFIG_ASPENITE_H
/* - * Generic board support - */ -#define CONFIG_SYS_GENERIC_BOARD - -/* * Version number information */ #define CONFIG_IDENT_STRING "\nMarvell-Aspenite DB" diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 2bded45..6155671 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -30,8 +30,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT /* Device Tree support */
-#define CONFIG_SYS_GENERIC_BOARD - /* general purpose I/O */ #define CONFIG_AT91_GPIO
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 7e026ef..259b0ea 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -61,8 +61,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD - /* * Memory Configuration */ diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 459b8f9..808246b 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -48,8 +48,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ #define CONFIG_AT91_GPIO diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 9c595f2..492f6d2 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -33,8 +33,6 @@
#define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_ATMEL_LEGACY #define CONFIG_SYS_TEXT_BASE 0x21f00000
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 3eb0154..233e7aa 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -48,8 +48,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD - /* * Hardware drivers */ diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 4d90209..774eb96 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -33,8 +33,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ #define CONFIG_AT91_GPIO diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index ea0a94b..510035b 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -31,7 +31,6 @@ #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_OF_LIBFDT -#define CONFIG_SYS_GENERIC_BOARD
/* general purpose I/O */ #define CONFIG_AT91_GPIO diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index f7a174e..1c3b7ba 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -34,8 +34,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_ATMEL_LEGACY #define CONFIG_AT91_GPIO 1 #define CONFIG_AT91_GPIO_PULLUP 1 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 9f76786..53d8e40 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -29,8 +29,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ #define CONFIG_AT91_GPIO diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index b7c5716..bbe1ec6 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -13,7 +13,6 @@ /* CPU, chip, mach, etc */ #define CONFIG_KONA #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SYS_GENERIC_BOARD
/* * Memory configuration diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index ba26964..d40b411 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -11,8 +11,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_GENERIC_BOARD - /* * Memory configuration * (these must be defined elsewhere) diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 838ef1f..0473cda 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -28,8 +28,6 @@
#define CONFIG_CMD_TIME
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_AM33XX #define CONFIG_OMAP #define CONFIG_OMAP_COMMON diff --git a/include/configs/calimain.h b/include/configs/calimain.h index c8b15fb..a5b2f9e 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -18,7 +18,6 @@ #define CONFIG_DRIVER_TI_EMAC #define MACH_TYPE_CALIMAIN 3528 #define CONFIG_MACH_TYPE MACH_TYPE_CALIMAIN -#define CONFIG_SYS_GENERIC_BOARD
/* * SoC Configuration diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 281d614..1d5b44e 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -25,7 +25,6 @@ #define CONFIG_CMD_GPIO #define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */ #define CONFIG_OMAP_COMMON -#define CONFIG_SYS_GENERIC_BOARD /* Common ARM Erratas */ #define CONFIG_ARM_ERRATA_454179 #define CONFIG_ARM_ERRATA_430973 diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 33b22a7..731fcc1 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -16,7 +16,6 @@ #define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_CM_T3517 /* working with CM-T3517 */ #define CONFIG_OMAP_COMMON -#define CONFIG_SYS_GENERIC_BOARD /* Common ARM Erratas */ #define CONFIG_ARM_ERRATA_454179 #define CONFIG_ARM_ERRATA_430973 diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 95a5a60..6d57cd6 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -18,9 +18,6 @@
#undef CONFIG_SPL_OS_BOOT
-/* Enable Generic board */ -#define CONFIG_SYS_GENERIC_BOARD - /* Device Tree defines */ #define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index a1b64c6..8e2a25e 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -14,7 +14,6 @@ * High Level Board Configuration Options */ #define CONFIG_CPU_PXA27X 1 /* Marvell PXA270 CPU */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_TEXT_BASE 0x0 /* Avoid overwriting factory configuration block */ #define CONFIG_BOARD_SIZE_LIMIT 0x40000 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 2583155..c2c324c 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -19,7 +19,6 @@ #define CONFIG_USE_ARCH_MEMCPY #define CONFIG_USE_ARCH_MEMSET
-#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_ARCH_MISC_INIT #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 2d2f3c1..c59cbe8 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -16,7 +16,6 @@
#include <asm/hardware.h>
-#define CONFIG_SYS_GENERIC_BOARD /* * Warning: changing CONFIG_SYS_TEXT_BASE requires * adapting the initial boot program. diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 1cd11c0..5aa643a 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -258,7 +258,6 @@ /* * U-Boot general configuration */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_MISC_INIT_R #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOOTFILE "uImage" /* Boot file name */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 1dd4182..61446e6 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_L2_PL310
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO_LATE
/* diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index eec2ba9..7802dd3 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -14,7 +14,6 @@ #define CONFIG_DB_784MP_GP /* Board target name for DDR training */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO_LATE
/* diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 54be415..c59a324 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -26,7 +26,6 @@ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_SYS_GENERIC_BOARD
/* * Commands configuration diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index a62f4e3..82035bc 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -12,8 +12,6 @@ #ifndef _CONFIG_DOCKSTAR_H #define _CONFIG_DOCKSTAR_H
-#define CONFIG_SYS_GENERIC_BOARD - /* * Version number information */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 133c7f4..2815ad8 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -37,7 +37,6 @@ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_SYS_GENERIC_BOARD
/* Add target to build it automatically upon "make" */ #define CONFIG_BUILD_TARGET "u-boot.kwb" diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 8b38d7e..7fb1894 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -12,9 +12,6 @@ #ifndef _CONFIG_EDMINIV2_H #define _CONFIG_EDMINIV2_H
-/* general settings */ -#define CONFIG_SYS_GENERIC_BOARD - /* * SPL */ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index b49b903..7126d56 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -12,8 +12,6 @@
#include <asm/hardware.h>
-#define CONFIG_SYS_GENERIC_BOARD - /* The first stage boot loader expects u-boot running at this address. */ #define CONFIG_SYS_TEXT_BASE 0x27000000 /* 16MB available */
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index d7bf80b..0a2d610 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -16,8 +16,6 @@ #include <asm/arch/cpu.h> /* get chip and board defs */ #include <linux/sizes.h>
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_ARCH_CPU_INIT #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 5b4b011..f613d20 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_CACHELINE_SIZE 32
#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_SYS_GENERIC_BOARD
/* Only in case the value is not present in mach-types.h */ #ifndef MACH_TYPE_FLEA3 diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 2a42e7c..910552b 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -15,8 +15,6 @@ #ifndef _CONFIG_GOFLEXHOME_H #define _CONFIG_GOFLEXHOME_H
-#define CONFIG_SYS_GENERIC_BOARD - /* * Version number information */ diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 0de6ae8..f2fd2ae 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -26,11 +26,6 @@ #endif
/* - * Generic board support - */ -#define CONFIG_SYS_GENERIC_BOARD - -/* * Version number information */ #define CONFIG_IDENT_STRING "\nMarvell-gplugD" diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 5f09567..7d72240 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -10,8 +10,6 @@ #ifndef _CONFIG_GURUPLUG_H #define _CONFIG_GURUPLUG_H
-#define CONFIG_SYS_GENERIC_BOARD - /* * Version number information */ diff --git a/include/configs/h2200.h b/include/configs/h2200.h index e8dfa74..6fbbe6e 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -12,7 +12,6 @@ #define MACH_TYPE_H2200 341 #define CONFIG_MACH_TYPE MACH_TYPE_H2200
-#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_CPU_PXA25X 1 #define CONFIG_BOARD_H2200
diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 7f331a6..f02575a 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -13,7 +13,6 @@ #define CONFIG_SYS_THUMB_BUILD
#define CONFIG_SYS_NO_FLASH -#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_OF_BOARD_SETUP #define CONFIG_FIT diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 6afe340..41136d6 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -9,8 +9,6 @@ #ifndef _CONFIG_IB62x0_H #define _CONFIG_IB62x0_H
-#define CONFIG_SYS_GENERIC_BOARD - /* * Version number information */ diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index bce97dc..6a47523 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -9,8 +9,6 @@ #ifndef _CONFIG_ICONNECT_H #define _CONFIG_ICONNECT_H
-#define CONFIG_SYS_GENERIC_BOARD - /* * Version number information */ diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 86f327c..0fc4106 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -18,8 +18,6 @@ #define CONFIG_MX31 /* This is a mx31 */ #define CONFIG_MX31_CLK32 32000
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index a22efd6..639a30a 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -29,7 +29,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_OF_LIBFDT /* enable passing a Device Tree */ #define CONFIG_MISC_INIT_R /* call misc_init_r during start up */ -#define CONFIG_SYS_GENERIC_BOARD
/* * There are various dependencies on the core module (CM) fitted diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index b1cd7df..583f7b3 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -18,7 +18,6 @@ /* * Board */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DRIVER_TI_EMAC #define CONFIG_BARIX_IPAM390
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 15fca1a..44f58e3 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -20,8 +20,6 @@ #ifndef _CONFIG_KM_ARM_H #define _CONFIG_KM_ARM_H
-#define CONFIG_SYS_GENERIC_BOARD - /* We got removed from Linux mach-types.h */ #define MACH_TYPE_KM_KIRKWOOD 2255
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 8a451ec..94b0f03 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -14,7 +14,6 @@ #define CONFIG_KZM_A9_GT #define CONFIG_RMOBILE_BOARD_STRING "KMC KZM-A9-GT" #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G -#define CONFIG_SYS_GENERIC_BOARD
#include <asm/arch/rmobile.h>
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 0871a71..09f0524 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -11,8 +11,6 @@
#define CONFIG_ARMV7_PSCI
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index df7af3c..79139e6 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -11,8 +11,6 @@
#define CONFIG_ARMV7_PSCI
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h index 39fb464..c7be13a 100644 --- a/include/configs/ls2085a_common.h +++ b/include/configs/ls2085a_common.h @@ -7,8 +7,6 @@ #ifndef __LS2_COMMON_H #define __LS2_COMMON_H
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_REMAKE_ELF #define CONFIG_FSL_LSCH3 #define CONFIG_LS2085A diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 1837258..cd81302 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -8,8 +8,6 @@ #ifndef _CONFIG_LSXL_H #define _CONFIG_LSXL_H
-#define CONFIG_SYS_GENERIC_BOARD - /* * Version number information */ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 35058e2..787cfdb 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -9,7 +9,6 @@ #define __M53EVK_CONFIG_H__
#define CONFIG_MX53 -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_MXC_GPIO
#include <asm/arch/imx-regs.h> diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 3530a26..bc4fc71 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -12,7 +12,6 @@ */ #define CONFIG_ARMADA_XP /* SOC Family Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO_LATE
/* diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 0f70c47..a1d68ea 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -25,8 +25,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_MCX #define CONFIG_BOARD_LATE_INIT
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_SYS_CACHELINE_SIZE 64
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index bd7216e..ca928ab 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -14,7 +14,6 @@ #define CONFIG_MX25 #define CONFIG_SYS_TEXT_BASE 0x81200000 #define CONFIG_MXC_GPIO -#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_TIMER_RATE 32768 #define CONFIG_SYS_TIMER_COUNTER \ diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index c4513d2..3499adb 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -14,8 +14,6 @@ /* High Level Configuration Options */ #define CONFIG_MX31 1 /* This is a mx31 */
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 72d28c9..a06a737 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -19,8 +19,6 @@ /* High Level Configuration Options */ #define CONFIG_MX31 /* This is a mx31 */
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index c9983f3..ab45e00 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -19,7 +19,6 @@ #define CONFIG_MX35
#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_SYS_GENERIC_BOARD
/* Set TEXT at the beginning of the NOR flash */ #define CONFIG_SYS_TEXT_BASE 0xA0000000 diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 2203c15..3cbc53e 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -26,7 +26,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_OF_LIBFDT
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 0479195..b13015a 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -23,8 +23,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 82c8af8..f489847 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -23,8 +23,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_OF_LIBFDT
/* Size of malloc() pool */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index ad2629d..10a03c3 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -22,8 +22,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
-#define CONFIG_SYS_GENERIC_BOARD - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index bcdb054..2600af9 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -23,8 +23,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index ef4cb68..4ae1673 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -45,7 +45,6 @@
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_CPUINFO -#define CONFIG_SYS_GENERIC_BOARD
/* ATAGs */ #define CONFIG_CMDLINE_TAG diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 6ae736f..42fd8c6 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -22,7 +22,6 @@
#define CONFIG_MX6 #define CONFIG_ROM_UNIFIED_SECTIONS -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 9d823de..60893c8 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -37,11 +37,6 @@ #include <asm/arch/iomux-mx28.h> #endif
-/* - * CPU specifics - */ -#define CONFIG_SYS_GENERIC_BOARD - /* MXS uses FDT */ #define CONFIG_OF_LIBFDT
diff --git a/include/configs/nas220.h b/include/configs/nas220.h index ebf6750..e5ff7e1 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -24,7 +24,6 @@ */ #define CONFIG_FEROCEON_88FR131 /* #define CPU Core subversion */ #define CONFIG_KW88F6192 /* SOC Name */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
/* power-on led, regulator, sata0, sata1 */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 915df52..52369be 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -28,7 +28,6 @@ #define CONFIG_OMAP3_RX51 /* working with RX51 */ #define CONFIG_SYS_L2CACHE_OFF /* pretend there is no L2 CACHE */ #define CONFIG_OMAP_COMMON -#define CONFIG_SYS_GENERIC_BOARD /* Common ARM Erratas */ #define CONFIG_ARM_ERRATA_454179 #define CONFIG_ARM_ERRATA_430973 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index cef2243..a59fd42 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -17,7 +17,6 @@ * High Level Configuration Options */ #define CONFIG_OMAP3_ZOOM1 1 /* working with Zoom MDK Rev1 */ -#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_NAND #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index d9a3aa4..80d57f4 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -195,7 +195,6 @@ /* * U-Boot general configuration */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_MISC_INIT_R #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOOTFILE "uImage" /* Boot file name */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index f4f96a7..a8e4b50 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -20,8 +20,6 @@ #include <asm/hardware.h> /* ARM asynchronous clock */
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_DISPLAY_BOARDINFO
#define MASTER_PLL_DIV 15 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index bd43577..10aa4a9 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -18,8 +18,6 @@ */ #include <asm/hardware.h>
-#define CONFIG_SYS_GENERIC_BOARD - /* ARM asynchronous clock */ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 09f0744..d4cd90e 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -22,8 +22,6 @@ */ #include <asm/hardware.h>
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45"
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 8cf3ad8..ef13af9 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -13,8 +13,6 @@ #ifndef _CONFIG_POGO_E02_H #define _CONFIG_POGO_E02_H
-#define CONFIG_SYS_GENERIC_BOARD - /* * Machine type definition and ID */ diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 7dd9260..f0a3a18 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -26,7 +26,6 @@ #define CONFIG_CMD_EXT4_WRITE
#define CONFIG_SYS_THUMB_BUILD -#define CONFIG_SYS_GENERIC_BOARD
/* Support File sytems */ #define CONFIG_FAT_WRITE diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h index 8830a10..4070726 100644 --- a/include/configs/rpi-common.h +++ b/include/configs/rpi-common.h @@ -11,7 +11,6 @@ #include <asm/arch/timer.h>
/* Architecture, CPU, etc.*/ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_BCM2835 #define CONFIG_ARCH_CPU_INIT
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index aff264b..0805e1a 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -278,6 +278,4 @@
#define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD - #endif /* __CONFIG_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 272e3ca..961e822 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -10,8 +10,6 @@ #ifndef _CONFIG_SHEEVAPLUG_H #define _CONFIG_SHEEVAPLUG_H
-#define CONFIG_SYS_GENERIC_BOARD - /* * Version number information */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index bcc8dcb..96761f4 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -45,8 +45,6 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_TIME
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_ENV_VARS_UBOOT_CONFIG #ifndef CONFIG_SPL_BUILD #define CONFIG_ROOTPATH "/opt/eldk" diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index d696d4b..a702523 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -50,7 +50,6 @@
/* setting board specific options */ # define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index a6bfa76..0df2b65 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -23,8 +23,6 @@
#define CONFIG_SYS_TEXT_BASE 0x0
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
/* input clock of PLL (the SMDK2410 has 12MHz input clock) */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 4ec9c65..f3a5390 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -215,6 +215,4 @@
#define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD - #endif /* __CONFIG_H */ diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 7758b0f..afcd16a 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -20,7 +20,6 @@ /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 /* External Crystal, in Hz */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 -#define CONFIG_SYS_GENERIC_BOARD
/* CPU */ #define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/sniper.h b/include/configs/sniper.h index a0ee5bd..f168e8f 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -34,7 +34,6 @@ * Board */
-#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_MISC_INIT_R
/* diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 5ca45a9..427bb0a 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -6,8 +6,6 @@ #ifndef __CONFIG_SOCFPGA_CYCLONE5_COMMON_H__ #define __CONFIG_SOCFPGA_CYCLONE5_COMMON_H__
-#define CONFIG_SYS_GENERIC_BOARD - /* Virtual target or real hardware */ #undef CONFIG_SOCFPGA_VIRTUAL_TARGET
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index fb1bf66..d70d62b 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -11,8 +11,6 @@ * Common configurations used for both spear3xx as well as spear6xx */
-#define CONFIG_SYS_GENERIC_BOARD - /* U-boot Load Address */ #define CONFIG_SYS_TEXT_BASE 0x00700000
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 19d9cf9..1796995 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -10,7 +10,6 @@
#define CONFIG_STM32F4 #define CONFIG_STM32F4DISCOVERY -#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_OF_LIBFDT
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index b1b6919..1526d13 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -13,7 +13,6 @@
#define CONFIG_SYS_CORTEX_R4
-#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_NO_FLASH
/* ram memory-related information */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 1abf73c..a91cfb9 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -167,7 +167,6 @@ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ -#define CONFIG_SYS_GENERIC_BOARD
/* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 801220a..f993433 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -16,7 +16,6 @@ #define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP_GPIO #define CONFIG_OMAP_COMMON -#define CONFIG_SYS_GENERIC_BOARD /* Common ARM Erratas */ #define CONFIG_ARM_ERRATA_454179 #define CONFIG_ARM_ERRATA_430973 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 408895f..4de00f6 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -20,7 +20,6 @@
#define CONFIG_OMAP_GPIO #define CONFIG_OMAP_COMMON -#define CONFIG_SYS_GENERIC_BOARD /* Common ARM Erratas */ #define CONFIG_ARM_ERRATA_454179 #define CONFIG_ARM_ERRATA_430973 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 2c9f5da..025307a 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -21,7 +21,6 @@ */ #include <asm/hardware.h>
-#define CONFIG_SYS_GENERIC_BOARD
#if defined(CONFIG_SPL_BUILD) #define CONFIG_SYS_THUMB_BUILD diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 6fe5f2c..7f4b8ef 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -144,7 +144,6 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT
-#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 18fca02..cc74d2e 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -18,7 +18,6 @@ #define __CONFIG_TI_ARMV7_COMMON_H__
/* Common define for many platforms. */ -#define CONFIG_SYS_GENERIC_BOARD
/* * We typically do not contain NOR flash. In the cases where we do, we diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index f04b572..87fcd61 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -38,8 +38,6 @@ #include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/omap.h>
-#define CONFIG_SYS_GENERIC_BOARD - /* Display CPU and Board information */ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 908be26..770244a 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -145,8 +145,6 @@ /* serial console configuration */ #define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_GENERIC_BOARD - #if !defined(CONFIG_SPL_BUILD) #define CONFIG_USE_ARCH_MEMSET #define CONFIG_USE_ARCH_MEMCPY diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 10a1664..54daede 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -34,7 +34,6 @@ #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_OF_LIBFDT -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_TEXT_BASE 0x23f00000
/* diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 4a7702c..219f0da 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -16,7 +16,6 @@ #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_OF_LIBFDT -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_MXC_GPIO
#include <asm/arch/imx-regs.h> diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 6107c64..704f591 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -8,9 +8,6 @@ #ifndef __VEXPRESS_AEMV8A_H #define __VEXPRESS_AEMV8A_H
-/* We use generic board and device manager for v8 Versatile Express */ -#define CONFIG_SYS_GENERIC_BOARD - #ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #ifndef CONFIG_SEMIHOSTING #error CONFIG_TARGET_VEXPRESS64_BASE_FVP requires CONFIG_SEMIHOSTING diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 98f6ae9..cec510c 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -122,7 +122,6 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_SYS_L2CACHE_OFF 1 #define CONFIG_INITRD_TAG 1 -#define CONFIG_SYS_GENERIC_BOARD
/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index c5131af..f32e4e3 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -13,7 +13,6 @@
#define CONFIG_VF610
-#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 5d9f529..d44c954 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -21,7 +21,6 @@ #define CONFIG_SYS_CACHELINE_SIZE 32
#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_SYS_GENERIC_BOARD
/* Only in case the value is not present in mach-types.h */ #ifndef MACH_TYPE_FLEA3 diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 15ee284..f77d065 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -103,7 +103,6 @@ /* * U-Boot General Configurations */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/x600.h b/include/configs/x600.h index edb16b1..08fc710 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -16,7 +16,6 @@ */ #define CONFIG_SPEAR600 /* SPEAr600 SoC */ #define CONFIG_X600 /* on X600 board */ -#define CONFIG_SYS_GENERIC_BOARD
#include <asm/arch/hardware.h>
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 01b7993..5c569e5 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -17,8 +17,6 @@
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_GENERIC_BOARD - /* Generic Interrupt Controller Definitions */ #define CONFIG_GICV2 #define GICD_BASE 0xF9010000 diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 81b9ce4..3d8566c 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -15,8 +15,6 @@ #define CONFIG_MX25 #define CONFIG_SYS_TEXT_BASE 0xA0000000
-#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_SYS_TIMER_RATE 32768 #define CONFIG_SYS_TIMER_COUNTER \ (&((struct gpt_regs *)IMX_GPT1_BASE)->counter) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index cc72c86..615898d 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -376,6 +376,4 @@
#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_GENERIC_BOARD - #endif /* __CONFIG_ZYNQ_COMMON_H */