* [U-Boot] [PATCH 1/2] arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards
2015-08-13 21:19 [U-Boot] [PATCH 0/2] arm: Move all boards over to generic board Simon Glass
@ 2015-08-13 21:19 ` Simon Glass
2015-08-13 22:38 ` Masahiro Yamada
` (3 more replies)
2015-08-13 21:19 ` [U-Boot] [PATCH 2/2] arm: Drop old non-generic-board code Simon Glass
2015-08-18 13:03 ` [U-Boot] [PATCH 0/2] arm: Move all boards over to generic board Pavel Machek
2 siblings, 4 replies; 10+ messages in thread
From: Simon Glass @ 2015-08-13 21:19 UTC (permalink / raw)
To: u-boot
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>
---
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/cm5200.h | 3 ---
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/digsy_mtc.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/km82xx.h | 1 -
include/configs/km8360.h | 1 -
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/p1_p2_rdb_pc.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/smdk2410.h | 2 --
include/configs/smdkc100.h | 2 --
include/configs/snapper9260.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-ppc.h | 2 --
include/configs/xilinx_zynqmp.h | 2 --
include/configs/zmx25.h | 2 --
include/configs/zynq-common.h | 2 --
113 files changed, 1 insertion(+), 180 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 60c2948..be8852b 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 600fefb..fd90d06 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 30f31a9..8894d90 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 a0a26bb..4ab9e9e 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 c2621ff..9455f00 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 6f1f65f..477ce20 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 e98cf0c..6577057 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 42461d2..c2dd3a0 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 731c7f1..3d31622 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 09d8bec..90c7b00 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 a19d4d9..70921e1 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 e709f9c..0a7a47c 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 b9a7754..917fca0 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 1521415..4357a50 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 7d8bb47..e83c975 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/cm5200.h b/include/configs/cm5200.h
index 4607d9f..8613a07 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -8,11 +8,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
-
/*
* High Level Configuration Options
*/
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 6885ae1..507e708 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 cf08414..2e79d64 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 2a8b730..16235d2 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 e3f0ab0..d42ab7e 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 ab8d293..ca46cfb 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 3cfae21..e0a29d5 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 3da9da4..03a5c64 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 739c2bf..9a448e5 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
#define CONFIG_SYS_TEXT_BASE 0x04000000
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 41e6fdc..2002819 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
#define CONFIG_SYS_TEXT_BASE 0x04000000
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index a7af351..1e40ce9 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -23,7 +23,6 @@
#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_DIGSY_MTC 1 /* ... on InterControl digsyMTC board */
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
/*
* Valid values for CONFIG_SYS_TEXT_BASE are:
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 b27b202..7a31471 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 b5e8e0e..e513841 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 c7b1e5c..c18771e 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 5d66901..7e781e7 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 967a05a..15def54 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 1d2d09a..282bf6d 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 86823e2..130d76f 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 ee52452..79d1323 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 1a5c93d..764990a 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 54e8121..b47e648 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 1d307ca..5e4969d 100644
--- a/include/configs/integrator-common.h
+++ b/include/configs/integrator-common.h
@@ -24,7 +24,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 e68b661..709a10b 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/km82xx.h b/include/configs/km82xx.h
index 12f9d42..19e89ce 100644
--- a/include/configs/km82xx.h
+++ b/include/configs/km82xx.h
@@ -29,7 +29,6 @@
#error ("Board unsupported")
#endif
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0xFE000000
diff --git a/include/configs/km8360.h b/include/configs/km8360.h
index 04cde46..c517e78 100644
--- a/include/configs/km8360.h
+++ b/include/configs/km8360.h
@@ -9,7 +9,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* KMBEC FPGA (PRIO) */
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 93c2976..a4944cb 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 5afee55..454308e 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 ddbf5ce..24c8d44 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 0fb117f..d34198f 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
#define CONFIG_SYS_TEXT_BASE 0x04000000
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 0a7b7cf..f045a16 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 7e709cd..06e18e2 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 436b022..4077906 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 38b1e93..01df2d6 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 61af61f..7de6c19 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 7ec9965..312fec4 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 2d1d53d..11acff2 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 6d0d020..47220cb 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/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index af3086d..29224db 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -10,7 +10,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#ifdef CONFIG_36BIT
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index f9a1d51..31b74bf 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 6c434f0..aff4bcd 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 c793865..06340e9 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 3a0992a..bae05b1 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 1012cdd..56a362d 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
#define CONFIG_SYS_DCACHE_OFF
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 235bba5..a4cd4b0 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -279,6 +279,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 ceac5e0..ab1a821 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -46,8 +46,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/smdk2410.h b/include/configs/smdk2410.h
index 7b4b3b0..abc6223 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 08a2e9f..e828dd5 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -216,6 +216,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 70ef939..21bcc08 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/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 f75c306..f8293e7 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 1ac3db6..f1a09f2 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 887f31a..60f9785 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 a2cbcf5..681ad89 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -169,7 +169,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 34f1228..570c767 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 c8ec79b..302d38c 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 d5b93eb..a7ba620 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 ffe167e..2c4684f 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -148,7 +148,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 6dc5ebd..dab39ef 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 23bf599..f39df30 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 4774de5..3118fcf 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 c36237f..fd44e5e 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 0c1da01..a5f6702 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
#define CONFIG_OF_LIBFDT 1
/* Size of malloc() pool */
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 52d392c..564aeaf 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 1d4c1a9..f35d0bf 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-ppc.h b/include/configs/xilinx-ppc.h
index 309d68d..74e93de 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -12,8 +12,6 @@
#ifndef __CONFIG_XLX_H
#define __CONFIG_XLX_H
-#define CONFIG_SYS_GENERIC_BOARD
-
/*
#define DEBUG
#define ET_DEBUG
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 68853b6..f0ed640 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 af7cc49..7bc98b1 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 98bebd0..7d7a041 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -377,6 +377,4 @@
#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_GENERIC_BOARD
-
#endif /* __CONFIG_ZYNQ_COMMON_H */
--
2.5.0.276.gf5e568e
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 2/2] arm: Drop old non-generic-board code
2015-08-13 21:19 [U-Boot] [PATCH 0/2] arm: Move all boards over to generic board Simon Glass
2015-08-13 21:19 ` [U-Boot] [PATCH 1/2] arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards Simon Glass
@ 2015-08-13 21:19 ` Simon Glass
2015-08-18 13:03 ` [U-Boot] [PATCH 0/2] arm: Move all boards over to generic board Pavel Machek
2 siblings, 0 replies; 10+ messages in thread
From: Simon Glass @ 2015-08-13 21:19 UTC (permalink / raw)
To: u-boot
This code is no-longer used. Drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/arm/include/asm/u-boot.h | 19 --
arch/arm/lib/Makefile | 3 -
arch/arm/lib/board.c | 687 ------------------------------------------
3 files changed, 709 deletions(-)
delete mode 100644 arch/arm/lib/board.c
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h
index 43cc494..ca3abd7 100644
--- a/arch/arm/include/asm/u-boot.h
+++ b/arch/arm/include/asm/u-boot.h
@@ -20,27 +20,8 @@
#ifndef _U_BOOT_H_
#define _U_BOOT_H_ 1
-#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 {
- ulong bi_arch_number; /* unique id for this board */
- ulong bi_boot_params; /* where this board expects params */
- unsigned long bi_arm_freq; /* arm frequency */
- unsigned long bi_dsp_freq; /* dsp core frequency */
- unsigned long bi_ddr_freq; /* ddr frequency */
- struct /* RAM configuration */
- {
- ulong start;
- ulong size;
- } bi_dram[CONFIG_NR_DRAM_BANKS];
-} bd_t;
-#endif
-
-#endif /* !CONFIG_SYS_GENERIC_BOARD */
/* For image.h:image_check_target_arch() */
#ifndef CONFIG_ARM64
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 31a5c8d..33d217b 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -22,9 +22,6 @@ obj-y += relocate_64.o
else
obj-y += relocate.o
endif
-ifndef CONFIG_SYS_GENERIC_BOARD
-obj-y += board.o
-endif
obj-$(CONFIG_CPU_V7M) += cmd_boot.o
obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
deleted file mode 100644
index 37ea6e9..0000000
--- a/arch/arm/lib/board.c
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
- * (C) Copyright 2002-2006
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-/*
- * To match the U-Boot user interface on ARM platforms to the U-Boot
- * standard (as on PPC platforms), some messages with debug character
- * are removed from the default U-Boot build.
- *
- * Define DEBUG here if you want additional info as shown below
- * printed upon startup:
- *
- * U-Boot code: 00F00000 -> 00F3C774 BSS: -> 00FC3274
- * IRQ Stack: 00ebff7c
- * FIQ Stack: 00ebef7c
- */
-
-#include <common.h>
-#include <command.h>
-#include <environment.h>
-#include <malloc.h>
-#include <stdio_dev.h>
-#include <version.h>
-#include <net.h>
-#include <serial.h>
-#include <nand.h>
-#include <onenand_uboot.h>
-#include <mmc.h>
-#include <scsi.h>
-#include <status_led.h>
-#include <libfdt.h>
-#include <fdtdec.h>
-#include <post.h>
-#include <logbuff.h>
-#include <asm/sections.h>
-
-#ifdef CONFIG_BITBANGMII
-#include <miiphy.h>
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-ulong monitor_flash_len;
-
-#ifdef CONFIG_HAS_DATAFLASH
-extern int AT91F_DataflashInit(void);
-extern void dataflash_print_info(void);
-#endif
-
-#if defined(CONFIG_HARD_I2C) || \
- defined(CONFIG_SYS_I2C)
-#include <i2c.h>
-#endif
-
-/************************************************************************
- * Coloured LED functionality
- ************************************************************************
- * May be supplied by boards if desired
- */
-__weak void coloured_LED_init(void) {}
-__weak void red_led_on(void) {}
-__weak void red_led_off(void) {}
-__weak void green_led_on(void) {}
-__weak void green_led_off(void) {}
-__weak void yellow_led_on(void) {}
-__weak void yellow_led_off(void) {}
-__weak void blue_led_on(void) {}
-__weak void blue_led_off(void) {}
-
-/*
- ************************************************************************
- * Init Utilities *
- ************************************************************************
- * Some of this code should be moved into the core functions,
- * or dropped completely,
- * but let's get it working (again) first...
- */
-
-#if defined(CONFIG_ARM_DCC) && !defined(CONFIG_BAUDRATE)
-#define CONFIG_BAUDRATE 115200
-#endif
-
-static int init_baudrate(void)
-{
- gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE);
- return 0;
-}
-
-static int display_banner(void)
-{
- printf("\n\n%s\n\n", version_string);
- debug("U-Boot code: %08lX -> %08lX BSS: -> %08lX\n",
- (ulong)&_start,
- (ulong)&__bss_start, (ulong)&__bss_end);
-#ifdef CONFIG_MODEM_SUPPORT
- debug("Modem Support enabled\n");
-#endif
-#ifdef CONFIG_USE_IRQ
- debug("IRQ Stack: %08lx\n", IRQ_STACK_START);
- debug("FIQ Stack: %08lx\n", FIQ_STACK_START);
-#endif
-
- return (0);
-}
-
-/*
- * WARNING: this code looks "cleaner" than the PowerPC version, but
- * has the disadvantage that you either get nothing, or everything.
- * On PowerPC, you might see "DRAM: " before the system hangs - which
- * gives a simple yet clear indication which part of the
- * initialization if failing.
- */
-static int display_dram_config(void)
-{
- int i;
-
-#ifdef DEBUG
- puts("RAM Configuration:\n");
-
- for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
- printf("Bank #%d: %08lx ", i, gd->bd->bi_dram[i].start);
- print_size(gd->bd->bi_dram[i].size, "\n");
- }
-#else
- ulong size = 0;
-
- for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
- size += gd->bd->bi_dram[i].size;
-
- puts("DRAM: ");
- print_size(size, "\n");
-#endif
-
- return (0);
-}
-
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C)
-static int init_func_i2c(void)
-{
- puts("I2C: ");
-#ifdef CONFIG_SYS_I2C
- i2c_init_all();
-#else
- i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-#endif
- puts("ready\n");
- return (0);
-}
-#endif
-
-#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI)
-#include <pci.h>
-static int arm_pci_init(void)
-{
- pci_init();
- return 0;
-}
-#endif /* CONFIG_CMD_PCI || CONFIG_PCI */
-
-/*
- * Breathe some life into the board...
- *
- * Initialize a serial port as console, and carry out some hardware
- * tests.
- *
- * The first part of initialization is running from Flash memory;
- * its main purpose is to initialize the RAM so that we
- * can relocate the monitor code to RAM.
- */
-
-/*
- * All attempts to come up with a "common" initialization sequence
- * that works for all boards and architectures failed: some of the
- * requirements are just _too_ different. To get rid of the resulting
- * mess of board dependent #ifdef'ed code we now make the whole
- * initialization sequence configurable to the user.
- *
- * The requirements for any new initalization function is simple: it
- * receives a pointer to the "global data" structure as it's only
- * argument, and returns an integer return code, where 0 means
- * "continue" and != 0 means "fatal error, hang the system".
- */
-typedef int (init_fnc_t) (void);
-
-__weak void dram_init_banksize(void)
-{
- gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
- gd->bd->bi_dram[0].size = gd->ram_size;
-}
-
-__weak int arch_cpu_init(void)
-{
- return 0;
-}
-
-__weak int power_init_board(void)
-{
- return 0;
-}
-
- /* Record the board_init_f() bootstage (after arch_cpu_init()) */
-static int mark_bootstage(void)
-{
- bootstage_mark_name(BOOTSTAGE_ID_START_UBOOT_F, "board_init_f");
-
- return 0;
-}
-
-init_fnc_t *init_sequence[] = {
- arch_cpu_init, /* basic arch cpu dependent setup */
- mark_bootstage,
-#ifdef CONFIG_OF_CONTROL
- fdtdec_check_fdt,
-#endif
-#if defined(CONFIG_BOARD_EARLY_INIT_F)
- board_early_init_f,
-#endif
- timer_init, /* initialize timer */
-#ifdef CONFIG_BOARD_POSTCLK_INIT
- board_postclk_init,
-#endif
-#ifdef CONFIG_FSL_ESDHC
- get_clocks,
-#endif
- env_init, /* initialize environment */
- init_baudrate, /* initialze baudrate settings */
- serial_init, /* serial communications setup */
- console_init_f, /* stage 1 init of console */
- display_banner, /* say that we are here */
- print_cpuinfo, /* display cpu info (and speed) */
-#if defined(CONFIG_DISPLAY_BOARDINFO)
- checkboard, /* display board info */
-#endif
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C)
- init_func_i2c,
-#endif
- dram_init, /* configure available RAM banks */
- NULL,
-};
-
-void board_init_f(ulong bootflag)
-{
- bd_t *bd;
- init_fnc_t **init_fnc_ptr;
- gd_t *id;
- ulong addr, addr_sp;
-#ifdef CONFIG_PRAM
- ulong reg;
-#endif
- void *new_fdt = NULL;
- size_t fdt_size = 0;
-
- memset((void *)gd, 0, sizeof(gd_t));
-
- gd->mon_len = (ulong)&__bss_end - (ulong)_start;
-#ifdef CONFIG_OF_EMBED
- /* Get a pointer to the FDT */
- gd->fdt_blob = __dtb_dt_begin;
-#elif defined CONFIG_OF_SEPARATE
- /* FDT is at end of image */
- gd->fdt_blob = &_end;
-#endif
- /* Allow the early environment to override the fdt address */
- gd->fdt_blob = (void *)getenv_ulong("fdtcontroladdr", 16,
- (uintptr_t)gd->fdt_blob);
-
- for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
- if ((*init_fnc_ptr)() != 0) {
- hang ();
- }
- }
-
-#ifdef CONFIG_OF_CONTROL
- /* For now, put this check after the console is ready */
- if (fdtdec_prepare_fdt()) {
- panic("** CONFIG_OF_CONTROL defined but no FDT - please see "
- "doc/README.fdt-control");
- }
-#endif
-
- debug("monitor len: %08lX\n", gd->mon_len);
- /*
- * Ram is setup, size stored in gd !!
- */
- debug("ramsize: %08lX\n", gd->ram_size);
-#if defined(CONFIG_SYS_MEM_TOP_HIDE)
- /*
- * Subtract specified amount of memory to hide so that it won't
- * get "touched" at all by U-Boot. By fixing up gd->ram_size
- * the Linux kernel should now get passed the now "corrected"
- * memory size and won't touch it either. This should work
- * for arch/ppc and arch/powerpc. Only Linux board ports in
- * arch/powerpc with bootwrapper support, that recalculate the
- * memory size from the SDRAM controller setup will have to
- * get fixed.
- */
- gd->ram_size -= CONFIG_SYS_MEM_TOP_HIDE;
-#endif
-
- addr = CONFIG_SYS_SDRAM_BASE + get_effective_memsize();
-
-#ifdef CONFIG_LOGBUFFER
-#ifndef CONFIG_ALT_LB_ADDR
- /* reserve kernel log buffer */
- addr -= (LOGBUFF_RESERVE);
- debug("Reserving %dk for kernel logbuffer at %08lx\n", LOGBUFF_LEN,
- addr);
-#endif
-#endif
-
-#ifdef CONFIG_PRAM
- /*
- * reserve protected RAM
- */
- reg = getenv_ulong("pram", 10, CONFIG_PRAM);
- addr -= (reg << 10); /* size is in kB */
- debug("Reserving %ldk for protected RAM@%08lx\n", reg, addr);
-#endif /* CONFIG_PRAM */
-
-#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
- /* reserve TLB table */
- gd->arch.tlb_size = PGTABLE_SIZE;
- addr -= gd->arch.tlb_size;
-
- /* round down to next 64 kB limit */
- addr &= ~(0x10000 - 1);
-
- gd->arch.tlb_addr = addr;
- debug("TLB table from %08lx to %08lx\n", addr, addr + gd->arch.tlb_size);
-#endif
-
- /* round down to next 4 kB limit */
- addr &= ~(4096 - 1);
- debug("Top of RAM usable for U-Boot at: %08lx\n", addr);
-
-#ifdef CONFIG_LCD
-#ifdef CONFIG_FB_ADDR
- gd->fb_base = CONFIG_FB_ADDR;
-#else
- /* reserve memory for LCD display (always full pages) */
- addr = lcd_setmem(addr);
- gd->fb_base = addr;
-#endif /* CONFIG_FB_ADDR */
-#endif /* CONFIG_LCD */
-
- /*
- * reserve memory for U-Boot code, data & bss
- * round down to next 4 kB limit
- */
- addr -= gd->mon_len;
- addr &= ~(4096 - 1);
-
- debug("Reserving %ldk for U-Boot at: %08lx\n", gd->mon_len >> 10, addr);
-
-#ifndef CONFIG_SPL_BUILD
- /*
- * reserve memory for malloc() arena
- */
- addr_sp = addr - TOTAL_MALLOC_LEN;
- debug("Reserving %dk for malloc() at: %08lx\n",
- TOTAL_MALLOC_LEN >> 10, addr_sp);
- /*
- * (permanently) allocate a Board Info struct
- * and a permanent copy of the "global" data
- */
- addr_sp -= sizeof (bd_t);
- bd = (bd_t *) addr_sp;
- gd->bd = bd;
- debug("Reserving %zu Bytes for Board Info at: %08lx\n",
- sizeof (bd_t), addr_sp);
-
-#ifdef CONFIG_MACH_TYPE
- gd->bd->bi_arch_number = CONFIG_MACH_TYPE; /* board id for Linux */
-#endif
-
- addr_sp -= sizeof (gd_t);
- id = (gd_t *) addr_sp;
- debug("Reserving %zu Bytes for Global Data at: %08lx\n",
- sizeof (gd_t), addr_sp);
-
-#if defined(CONFIG_OF_SEPARATE) && defined(CONFIG_OF_CONTROL)
- /*
- * If the device tree is sitting immediate above our image then we
- * must relocate it. If it is embedded in the data section, then it
- * will be relocated with other data.
- */
- if (gd->fdt_blob) {
- fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32);
-
- addr_sp -= fdt_size;
- new_fdt = (void *)addr_sp;
- debug("Reserving %zu Bytes for FDT at: %08lx\n",
- fdt_size, addr_sp);
- }
-#endif
-
-#ifndef CONFIG_ARM64
- /* setup stackpointer for exeptions */
- gd->irq_sp = addr_sp;
-#ifdef CONFIG_USE_IRQ
- addr_sp -= (CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ);
- debug("Reserving %zu Bytes for IRQ stack at: %08lx\n",
- CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ, addr_sp);
-#endif
- /* leave 3 words for abort-stack */
- addr_sp -= 12;
-
- /* 8-byte alignment for ABI compliance */
- addr_sp &= ~0x07;
-#else /* CONFIG_ARM64 */
- /* 16-byte alignment for ABI compliance */
- addr_sp &= ~0x0f;
-#endif /* CONFIG_ARM64 */
-#else
- addr_sp += 128; /* leave 32 words for abort-stack */
- gd->irq_sp = addr_sp;
-#endif
-
- debug("New Stack Pointer is: %08lx\n", addr_sp);
-
-#ifdef CONFIG_POST
- post_bootmode_init();
- post_run(NULL, POST_ROM | post_bootmode_get(0));
-#endif
-
- /* Ram ist board specific, so move it to board code ... */
- dram_init_banksize();
- display_dram_config(); /* and display it */
-
- gd->relocaddr = addr;
- gd->start_addr_sp = addr_sp;
- gd->reloc_off = addr - (ulong)&_start;
- debug("relocation Offset is: %08lx\n", gd->reloc_off);
- if (new_fdt) {
- memcpy(new_fdt, gd->fdt_blob, fdt_size);
- gd->fdt_blob = new_fdt;
- }
- memcpy(id, (void *)gd, sizeof(gd_t));
-}
-
-#if !defined(CONFIG_SYS_NO_FLASH)
-static char *failed = "*** failed ***\n";
-#endif
-
-/*
- * Tell if it's OK to load the environment early in boot.
- *
- * If CONFIG_OF_CONFIG is defined, we'll check with the FDT to see
- * if this is OK (defaulting to saying it's not OK).
- *
- * NOTE: Loading the environment early can be a bad idea if security is
- * important, since no verification is done on the environment.
- *
- * @return 0 if environment should not be loaded, !=0 if it is ok to load
- */
-static int should_load_env(void)
-{
-#ifdef CONFIG_OF_CONTROL
- return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 1);
-#elif defined CONFIG_DELAY_ENVIRONMENT
- return 0;
-#else
- return 1;
-#endif
-}
-
-#if defined(CONFIG_DISPLAY_BOARDINFO_LATE) && defined(CONFIG_OF_CONTROL)
-static void display_fdt_model(const void *blob)
-{
- const char *model;
-
- model = (char *)fdt_getprop(blob, 0, "model", NULL);
- printf("Model: %s\n", model ? model : "<unknown>");
-}
-#endif
-
-/************************************************************************
- *
- * This is the next part if the initialization sequence: we are now
- * running from RAM and have a "normal" C environment, i. e. global
- * data can be written, BSS has been cleared, the stack size in not
- * that critical any more, etc.
- *
- ************************************************************************
- */
-
-void board_init_r(gd_t *id, ulong dest_addr)
-{
- ulong malloc_start;
-#if !defined(CONFIG_SYS_NO_FLASH)
- ulong flash_size;
-#endif
-
- gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
- bootstage_mark_name(BOOTSTAGE_ID_START_UBOOT_R, "board_init_r");
-
- monitor_flash_len = (ulong)&__rel_dyn_end - (ulong)_start;
-
- /* Enable caches */
- enable_caches();
-
- debug("monitor flash len: %08lX\n", monitor_flash_len);
- board_init(); /* Setup chipselects */
- /*
- * TODO: printing of the clock inforamtion of the board is now
- * implemented as part of bdinfo command. Currently only support for
- * davinci SOC's is added. Remove this check once all the board
- * implement this.
- */
-#ifdef CONFIG_CLOCKS
- set_cpu_clk_info(); /* Setup clock information */
-#endif
- serial_initialize();
-
- debug("Now running in RAM - U-Boot at: %08lx\n", dest_addr);
-
-#ifdef CONFIG_LOGBUFFER
- logbuff_init_ptrs();
-#endif
-#ifdef CONFIG_POST
- post_output_backlog();
-#endif
-
- /* The Malloc area is immediately below the monitor copy in DRAM */
- malloc_start = dest_addr - TOTAL_MALLOC_LEN;
- mem_malloc_init (malloc_start, TOTAL_MALLOC_LEN);
-
-#ifdef CONFIG_ARCH_EARLY_INIT_R
- arch_early_init_r();
-#endif
- power_init_board();
-
-#if !defined(CONFIG_SYS_NO_FLASH)
- puts("Flash: ");
-
- flash_size = flash_init();
- if (flash_size > 0) {
-# ifdef CONFIG_SYS_FLASH_CHECKSUM
- print_size(flash_size, "");
- /*
- * Compute and print flash CRC if flashchecksum is set to 'y'
- *
- * NOTE: Maybe we should add some WATCHDOG_RESET()? XXX
- */
- if (getenv_yesno("flashchecksum") == 1) {
- printf(" CRC: %08X", crc32(0,
- (const unsigned char *) CONFIG_SYS_FLASH_BASE,
- flash_size));
- }
- putc('\n');
-# else /* !CONFIG_SYS_FLASH_CHECKSUM */
- print_size(flash_size, "\n");
-# endif /* CONFIG_SYS_FLASH_CHECKSUM */
- } else {
- puts(failed);
- hang();
- }
-#endif
-
-#if defined(CONFIG_CMD_NAND)
- puts("NAND: ");
- nand_init(); /* go init the NAND */
-#endif
-
-#if defined(CONFIG_CMD_ONENAND)
- onenand_init();
-#endif
-
-#ifdef CONFIG_GENERIC_MMC
- puts("MMC: ");
- mmc_initialize(gd->bd);
-#endif
-
-#ifdef CONFIG_CMD_SCSI
- puts("SCSI: ");
- scsi_init();
-#endif
-
-#ifdef CONFIG_HAS_DATAFLASH
- AT91F_DataflashInit();
- dataflash_print_info();
-#endif
-
- /* initialize environment */
- if (should_load_env())
- env_relocate();
- else
- set_default_env(NULL);
-
-#if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI)
- arm_pci_init();
-#endif
-
- stdio_init(); /* get the devices list going. */
-
- jumptable_init();
-
-#if defined(CONFIG_API)
- /* Initialize API */
- api_init();
-#endif
-
- console_init_r(); /* fully init console as a device */
-
-#ifdef CONFIG_DISPLAY_BOARDINFO_LATE
-# ifdef CONFIG_OF_CONTROL
- /* Put this here so it appears on the LCD, now it is ready */
- display_fdt_model(gd->fdt_blob);
-# else
- checkboard();
-# endif
-#endif
-
-#if defined(CONFIG_ARCH_MISC_INIT)
- /* miscellaneous arch dependent initialisations */
- arch_misc_init();
-#endif
-#if defined(CONFIG_MISC_INIT_R)
- /* miscellaneous platform dependent initialisations */
- misc_init_r();
-#endif
-
- /* set up exceptions */
- interrupt_init();
- /* enable exceptions */
- enable_interrupts();
-
- /* Initialize from environment */
- load_addr = getenv_ulong("loadaddr", 16, load_addr);
-
-#ifdef CONFIG_BOARD_LATE_INIT
- board_late_init();
-#endif
-
-#ifdef CONFIG_BITBANGMII
- bb_miiphy_init();
-#endif
-#if defined(CONFIG_CMD_NET)
- puts("Net: ");
- eth_initialize();
-#if defined(CONFIG_RESET_PHY_R)
- debug("Reset Ethernet PHY\n");
- reset_phy();
-#endif
-#endif
-
-#ifdef CONFIG_POST
- post_run(NULL, POST_RAM | post_bootmode_get(0));
-#endif
-
-#if defined(CONFIG_PRAM) || defined(CONFIG_LOGBUFFER)
- /*
- * Export available size of memory for Linux,
- * taking into account the protected RAM at top of memory
- */
- {
- ulong pram = 0;
- uchar memsz[32];
-
-#ifdef CONFIG_PRAM
- pram = getenv_ulong("pram", 10, CONFIG_PRAM);
-#endif
-#ifdef CONFIG_LOGBUFFER
-#ifndef CONFIG_ALT_LB_ADDR
- /* Also take the logbuffer into account (pram is in kB) */
- pram += (LOGBUFF_LEN + LOGBUFF_OVERHEAD) / 1024;
-#endif
-#endif
- sprintf((char *)memsz, "%ldk", (gd->ram_size / 1024) - pram);
- setenv("mem", (char *)memsz);
- }
-#endif
-
- /* main_loop() can return to retry autoboot, if so just run it again. */
- for (;;) {
- main_loop();
- }
-
- /* NOTREACHED - no way out of command loop except booting */
-}
--
2.5.0.276.gf5e568e
^ permalink raw reply related [flat|nested] 10+ messages in thread