summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-10-20 21:09:06 +0900
committerTom Rini <trini@konsulko.com>2015-10-24 13:50:38 -0400
commit09f3ca3dd53b671b009ddc4e1dad669c280094f0 (patch)
treec96f40c38613a610b7c0e838a9205c6aed6b2c81 /include
parent5553f000fc7820c0b0fea0dabf9b4dc1cf7099d4 (diff)
arm, powerpc: select SYS_GENERIC_BOARD
We have finished Generic Board conversion for ARM and PowerPC, i.e. all the boards have been converted except OpenRISC, SuperH, SPARC, which have not supported Generic Board framework yet. Select SYS_GENERIC_BOARD in arch/Kconfig and delete all the macro defines in include/configs/*.h. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/B4860QDS.h1
-rw-r--r--include/configs/BSC9131RDB.h1
-rw-r--r--include/configs/BSC9132QDS.h1
-rw-r--r--include/configs/C29XPCIE.h1
-rw-r--r--include/configs/CPCI2DP.h1
-rw-r--r--include/configs/CPCI4052.h1
-rw-r--r--include/configs/MIP405.h1
-rw-r--r--include/configs/MPC8308RDB.h1
-rw-r--r--include/configs/MPC8313ERDB.h1
-rw-r--r--include/configs/MPC8315ERDB.h1
-rw-r--r--include/configs/MPC8323ERDB.h1
-rw-r--r--include/configs/MPC832XEMDS.h1
-rw-r--r--include/configs/MPC8349EMDS.h1
-rw-r--r--include/configs/MPC8349ITX.h1
-rw-r--r--include/configs/MPC837XEMDS.h1
-rw-r--r--include/configs/MPC837XERDB.h1
-rw-r--r--include/configs/MPC8536DS.h1
-rw-r--r--include/configs/MPC8540ADS.h1
-rw-r--r--include/configs/MPC8541CDS.h1
-rw-r--r--include/configs/MPC8544DS.h1
-rw-r--r--include/configs/MPC8548CDS.h1
-rw-r--r--include/configs/MPC8555CDS.h1
-rw-r--r--include/configs/MPC8560ADS.h1
-rw-r--r--include/configs/MPC8568MDS.h1
-rw-r--r--include/configs/MPC8569MDS.h1
-rw-r--r--include/configs/MPC8572DS.h1
-rw-r--r--include/configs/MPC8610HPCD.h1
-rw-r--r--include/configs/MPC8641HPCN.h1
-rw-r--r--include/configs/P1010RDB.h1
-rw-r--r--include/configs/P1022DS.h1
-rw-r--r--include/configs/P1023RDB.h1
-rw-r--r--include/configs/P2041RDB.h1
-rw-r--r--include/configs/PATI.h1
-rw-r--r--include/configs/PIP405.h1
-rw-r--r--include/configs/PLU405.h1
-rw-r--r--include/configs/PMC405DE.h1
-rw-r--r--include/configs/PMC440.h1
-rw-r--r--include/configs/T102xQDS.h1
-rw-r--r--include/configs/T102xRDB.h1
-rw-r--r--include/configs/T1040QDS.h1
-rw-r--r--include/configs/T104xRDB.h1
-rw-r--r--include/configs/T208xQDS.h1
-rw-r--r--include/configs/T208xRDB.h1
-rw-r--r--include/configs/T4240RDB.h1
-rw-r--r--include/configs/TQM5200.h1
-rw-r--r--include/configs/TQM823L.h1
-rw-r--r--include/configs/TQM823M.h1
-rw-r--r--include/configs/TQM834x.h1
-rw-r--r--include/configs/TQM850L.h1
-rw-r--r--include/configs/TQM850M.h1
-rw-r--r--include/configs/TQM855L.h1
-rw-r--r--include/configs/TQM855M.h1
-rw-r--r--include/configs/TQM860L.h1
-rw-r--r--include/configs/TQM860M.h1
-rw-r--r--include/configs/TQM862L.h1
-rw-r--r--include/configs/TQM862M.h1
-rw-r--r--include/configs/TQM866M.h1
-rw-r--r--include/configs/TQM885D.h1
-rw-r--r--include/configs/UCP1020.h1
-rw-r--r--include/configs/VCMA9.h1
-rw-r--r--include/configs/VOM405.h1
-rw-r--r--include/configs/a3m071.h1
-rw-r--r--include/configs/a4m072.h1
-rw-r--r--include/configs/ac14xx.h1
-rw-r--r--include/configs/am3517_crane.h1
-rw-r--r--include/configs/am3517_evm.h1
-rw-r--r--include/configs/amcc-common.h1
-rw-r--r--include/configs/apf27.h1
-rw-r--r--include/configs/aria.h1
-rw-r--r--include/configs/armadillo-800eva.h1
-rw-r--r--include/configs/aspenite.h5
-rw-r--r--include/configs/at91-sama5_common.h1
-rw-r--r--include/configs/at91rm9200ek.h1
-rw-r--r--include/configs/at91sam9260ek.h1
-rw-r--r--include/configs/at91sam9261ek.h1
-rw-r--r--include/configs/at91sam9263ek.h1
-rw-r--r--include/configs/at91sam9m10g45ek.h1
-rw-r--r--include/configs/at91sam9n12ek.h1
-rw-r--r--include/configs/at91sam9rlek.h1
-rw-r--r--include/configs/at91sam9x5ek.h1
-rw-r--r--include/configs/bcm28155_ap.h1
-rw-r--r--include/configs/bcm_ep_board.h1
-rw-r--r--include/configs/bur_am335x_common.h1
-rw-r--r--include/configs/calimain.h1
-rw-r--r--include/configs/canmb.h1
-rw-r--r--include/configs/cm5200.h1
-rw-r--r--include/configs/cm_t35.h1
-rw-r--r--include/configs/cm_t3517.h1
-rw-r--r--include/configs/cm_t54.h3
-rw-r--r--include/configs/colibri_pxa270.h1
-rw-r--r--include/configs/colibri_vf.h1
-rw-r--r--include/configs/controlcenterd.h1
-rw-r--r--include/configs/corenet_ds.h1
-rw-r--r--include/configs/corvus.h1
-rw-r--r--include/configs/da850evm.h1
-rw-r--r--include/configs/db-88f6820-gp.h1
-rw-r--r--include/configs/db-mv784mp-gp.h1
-rw-r--r--include/configs/digsy_mtc.h1
-rw-r--r--include/configs/dlvision-10g.h1
-rw-r--r--include/configs/dlvision.h1
-rw-r--r--include/configs/dns325.h1
-rw-r--r--include/configs/dockstar.h1
-rw-r--r--include/configs/dreamplug.h1
-rw-r--r--include/configs/ea20.h1
-rw-r--r--include/configs/edb93xx.h1
-rw-r--r--include/configs/edminiv2.h3
-rw-r--r--include/configs/ethernut5.h1
-rw-r--r--include/configs/exynos-common.h1
-rw-r--r--include/configs/flea3.h1
-rw-r--r--include/configs/gdppc440etx.h1
-rw-r--r--include/configs/goflexhome.h1
-rw-r--r--include/configs/gplugd.h5
-rw-r--r--include/configs/guruplug.h1
-rw-r--r--include/configs/h2200.h1
-rw-r--r--include/configs/highbank.h1
-rw-r--r--include/configs/hikey.h2
-rw-r--r--include/configs/hrcon.h1
-rw-r--r--include/configs/ib62x0.h1
-rw-r--r--include/configs/iconnect.h1
-rw-r--r--include/configs/ids8313.h1
-rw-r--r--include/configs/imx31_phycore.h1
-rw-r--r--include/configs/inka4x0.h1
-rw-r--r--include/configs/integrator-common.h1
-rw-r--r--include/configs/intip.h1
-rw-r--r--include/configs/io.h1
-rw-r--r--include/configs/io64.h1
-rw-r--r--include/configs/iocon.h1
-rw-r--r--include/configs/ipam390.h1
-rw-r--r--include/configs/ipek01.h1
-rw-r--r--include/configs/jupiter.h1
-rw-r--r--include/configs/km/km8309-common.h1
-rw-r--r--include/configs/km/km8321-common.h1
-rw-r--r--include/configs/km/km83xx-common.h1
-rw-r--r--include/configs/km/km_arm.h1
-rw-r--r--include/configs/km/kmp204x-common.h1
-rw-r--r--include/configs/km82xx.h1
-rw-r--r--include/configs/km8360.h1
-rw-r--r--include/configs/kzm9g.h1
-rw-r--r--include/configs/lacie_kw.h5
-rw-r--r--include/configs/ls1021aqds.h1
-rw-r--r--include/configs/ls1021atwr.h1
-rw-r--r--include/configs/ls2085a_common.h1
-rw-r--r--include/configs/lsxl.h1
-rw-r--r--include/configs/lwmon5.h1
-rw-r--r--include/configs/m53evk.h1
-rw-r--r--include/configs/maxbcm.h1
-rw-r--r--include/configs/mcx.h1
-rw-r--r--include/configs/mecp5123.h1
-rw-r--r--include/configs/meesc.h1
-rw-r--r--include/configs/motionpro.h1
-rw-r--r--include/configs/mpc5121ads.h1
-rw-r--r--include/configs/mpc8308_p1m.h1
-rw-r--r--include/configs/munices.h1
-rw-r--r--include/configs/mx25pdk.h1
-rw-r--r--include/configs/mx31ads.h1
-rw-r--r--include/configs/mx31pdk.h1
-rw-r--r--include/configs/mx35pdk.h1
-rw-r--r--include/configs/mx51evk.h1
-rw-r--r--include/configs/mx53ard.h1
-rw-r--r--include/configs/mx53evk.h1
-rw-r--r--include/configs/mx53loco.h1
-rw-r--r--include/configs/mx53smd.h1
-rw-r--r--include/configs/mx6_common.h1
-rw-r--r--include/configs/mx7_common.h1
-rw-r--r--include/configs/mxs.h1
-rw-r--r--include/configs/nas220.h1
-rw-r--r--include/configs/neo.h1
-rw-r--r--include/configs/nokia_rx51.h1
-rw-r--r--include/configs/o2dnt-common.h1
-rw-r--r--include/configs/omap3_evm_common.h1
-rw-r--r--include/configs/omap3_zoom1.h1
-rw-r--r--include/configs/omapl138_lcdk.h1
-rw-r--r--include/configs/p1_p2_rdb_pc.h1
-rw-r--r--include/configs/p1_twr.h1
-rw-r--r--include/configs/pcm030.h1
-rw-r--r--include/configs/pcm052.h1
-rw-r--r--include/configs/pdm360ng.h1
-rw-r--r--include/configs/picosam9g45.h1
-rw-r--r--include/configs/pm9261.h1
-rw-r--r--include/configs/pm9263.h1
-rw-r--r--include/configs/pm9g45.h1
-rw-r--r--include/configs/pogo_e02.h1
-rw-r--r--include/configs/qemu-ppce500.h1
-rw-r--r--include/configs/rcar-gen2-common.h1
-rw-r--r--include/configs/rk3288_common.h1
-rw-r--r--include/configs/rpi-common.h1
-rw-r--r--include/configs/s5p_goni.h1
-rw-r--r--include/configs/sbc8349.h1
-rw-r--r--include/configs/sbc8548.h1
-rw-r--r--include/configs/sbc8641d.h1
-rw-r--r--include/configs/sheevaplug.h1
-rw-r--r--include/configs/siemens-am33x-common.h1
-rw-r--r--include/configs/smartweb.h1
-rw-r--r--include/configs/smdk2410.h1
-rw-r--r--include/configs/smdkc100.h1
-rw-r--r--include/configs/snapper9260.h1
-rw-r--r--include/configs/sniper.h1
-rw-r--r--include/configs/socfpga_common.h1
-rw-r--r--include/configs/socrates.h1
-rw-r--r--include/configs/spear-common.h1
-rw-r--r--include/configs/stm32f429-discovery.h1
-rw-r--r--include/configs/stv0991.h1
-rw-r--r--include/configs/sunxi-common.h1
-rw-r--r--include/configs/t4qds.h1
-rw-r--r--include/configs/tam3517-common.h1
-rw-r--r--include/configs/tao3530.h1
-rw-r--r--include/configs/taurus.h1
-rw-r--r--include/configs/tegra-common.h1
-rw-r--r--include/configs/ti814x_evm.h1
-rw-r--r--include/configs/ti816x_evm.h1
-rw-r--r--include/configs/ti_armv7_common.h3
-rw-r--r--include/configs/tricorder.h1
-rw-r--r--include/configs/ts4800.h3
-rw-r--r--include/configs/uniphier.h1
-rw-r--r--include/configs/usb_a9263.h1
-rw-r--r--include/configs/usbarmory.h1
-rw-r--r--include/configs/v38b.h1
-rw-r--r--include/configs/ve8313.h1
-rw-r--r--include/configs/vexpress_aemv8a.h3
-rw-r--r--include/configs/vexpress_common.h1
-rw-r--r--include/configs/vf610twr.h1
-rw-r--r--include/configs/vme8349.h1
-rw-r--r--include/configs/woodburn_common.h1
-rw-r--r--include/configs/work_92105.h1
-rw-r--r--include/configs/x600.h1
-rw-r--r--include/configs/xilinx-ppc.h1
-rw-r--r--include/configs/xilinx_zynqmp.h1
-rw-r--r--include/configs/xpedite1000.h1
-rw-r--r--include/configs/xpedite517x.h1
-rw-r--r--include/configs/xpedite520x.h1
-rw-r--r--include/configs/xpedite537x.h1
-rw-r--r--include/configs/xpedite550x.h1
-rw-r--r--include/configs/zmx25.h1
-rw-r--r--include/configs/zynq-common.h1
234 files changed, 0 insertions, 257 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 858e25dbc3c..c83e5cea4b7 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -7,7 +7,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 226a170c4d0..2754016b05c 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -11,7 +11,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#ifdef CONFIG_BSC9131RDB
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index e54544789a0..54dcf3b9548 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -11,7 +11,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#ifdef CONFIG_BSC9132QDS
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index f574994219a..94f991b4f76 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -12,7 +12,6 @@
#define __CONFIG_H
#define CONFIG_PHYS_64BIT
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#ifdef CONFIG_C29XPCIE
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index ce7bc35dd93..e00ab043e65 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -20,7 +20,6 @@
#define CONFIG_405GP 1 /* This is a PPC405 CPU */
#define CONFIG_SYS_TEXT_BASE 0xFFFC0000
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index 2827a04814a..332a1df37d4 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -23,7 +23,6 @@
#undef CONFIG_CPCI405_6U /* enable this for 6U boards */
#define CONFIG_SYS_TEXT_BASE 0xFFFC0000
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 0757e67b57f..ec62c8a0657 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -21,7 +21,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFF80000
-#define CONFIG_SYS_GENERIC_BOARD
/***********************************************************
* Note that it may also be a MIP405T board which is a subset of the
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 4150d5aad05..551b72d1530 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -9,7 +9,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index d558db7e50c..7db67c2c614 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -10,7 +10,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index cbe10af19f1..eb50be609e0 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -9,7 +9,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 7547c129967..59d5e564aef 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -9,7 +9,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 9805df75b99..5ab7d5f0e8c 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -7,7 +7,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 57547a48bf3..988a90091d4 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -13,7 +13,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 834786d9406..091ca1783e9 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -40,7 +40,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#if (CONFIG_SYS_TEXT_BASE == 0xFE000000)
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index cebd175ff59..7d1262d510c 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -8,7 +8,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 5c6ad193c0b..ab68e63881b 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -16,7 +16,6 @@
#define CONFIG_MPC837x 1 /* MPC837x CPU specific */
#define CONFIG_MPC837XERDB 1
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_TEXT_BASE 0xFE000000
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 7c51eef9d3f..29c27fa9a75 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -11,7 +11,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#include "../board/freescale/common/ics307_clk.h"
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index dc6e3954bc5..157ca696629 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -18,7 +18,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* High Level Configuration Options */
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index bf036038377..68ea5d87912 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -13,7 +13,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* High Level Configuration Options */
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index bef28b3d3ad..166fcda2973 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -11,7 +11,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* High Level Configuration Options */
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 2bea6048043..517b4492ee0 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -13,7 +13,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#ifdef CONFIG_36BIT
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 80b14cbf4f3..184f5146159 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -13,7 +13,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* High Level Configuration Options */
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index e1bc8ccd325..69ce13cf45a 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -18,7 +18,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* High Level Configuration Options */
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 064bd850903..f6e43ce1f26 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -10,7 +10,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* High Level Configuration Options */
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 0af670b2041..6f614b0cbe3 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -10,7 +10,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* High Level Configuration Options */
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 4b5467b4a84..19da4775a21 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -11,7 +11,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#include "../board/freescale/common/ics307_clk.h"
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 9a487e0a23e..4ce04a84aa5 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -13,7 +13,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* High Level Configuration Options */
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index f20ee79e872..6f1535ec1ec 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -16,7 +16,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* High Level Configuration Options */
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index b85e19570a1..81b085572dc 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -14,7 +14,6 @@
#ifdef CONFIG_36BIT
#define CONFIG_PHYS_64BIT
#endif
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_P1010
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 95c81ab4fbd..a9d825baf5d 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -11,7 +11,6 @@
#include "../board/freescale/common/ics307_clk.h"
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#ifdef CONFIG_36BIT
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index e61db18d0c6..4d87198e437 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -10,7 +10,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#ifndef CONFIG_SYS_TEXT_BASE
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index de205e82caf..2c4c8b5a026 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -13,7 +13,6 @@
#define CONFIG_P2041RDB
#define CONFIG_PHYS_64BIT
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_PPC_P2041
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 5d0e4220412..81d535f9d18 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -21,7 +21,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFF00000
-#define CONFIG_SYS_GENERIC_BOARD
/* Serial Console Configuration */
#define CONFIG_5xx_CONS_SCI1
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 4601bc8accc..45eecc42b05 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -21,7 +21,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFF80000
-#define CONFIG_SYS_GENERIC_BOARD
/***********************************************************
* Clock
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index d5d30926e36..d668a153793 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -21,7 +21,6 @@
#define CONFIG_PLU405 1 /* ...on a PLU405 board */
#define CONFIG_SYS_TEXT_BASE 0xFFF80000
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index 2f35ca9417c..0fdd7e24b1c 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -12,7 +12,6 @@
#define CONFIG_PMC405DE 1 /* ...on a PMC405DE board */
#define CONFIG_SYS_TEXT_BASE 0xFFFC0000
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index fad57443988..022764932d7 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -29,7 +29,6 @@
#define CONFIG_SYS_TEXT_BASE 0xFFF90000
#endif
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_CLK_FREQ 33333400
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index c9e5ea9c73e..52942edbd41 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -12,7 +12,6 @@
#define __T1024QDS_H
/* High Level Configuration Options */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 0601d73d234..39fa5e2b189 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -12,7 +12,6 @@
#define __T1024RDB_H
/* High Level Configuration Options */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOOKE
#define CONFIG_E500 /* BOOKE e500 family */
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 4b735b54940..d8b86e6c5e6 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -28,7 +28,6 @@
*/
#define CONFIG_T1040QDS
#define CONFIG_PHYS_64BIT
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#ifdef CONFIG_RAMBOOT_PBL
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 7f8d110c14d..da2ccb83183 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -12,7 +12,6 @@
*/
#define CONFIG_T104xRDB
#define CONFIG_PHYS_64BIT
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_E500 /* BOOKE e500 family */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index a804cbe9aa2..a81f1e66f3f 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -11,7 +11,6 @@
#ifndef __T208xQDS_H
#define __T208xQDS_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */
#define CONFIG_MMC
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 307a0ea02a5..8b762346ac2 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -11,7 +11,6 @@
#ifndef __T2080RDB_H
#define __T2080RDB_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_T2080RDB
#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 754d182c3a4..2e875d2fc12 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -12,7 +12,6 @@
#define CONFIG_T4240RDB
#define CONFIG_PHYS_64BIT
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_SATA_V2
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 5a59b80d50d..342fdfe24a6 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -19,7 +19,6 @@
#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_TQM5200 1 /* ... on TQM5200 module */
#undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index cea314915f6..013e40e3b9c 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -19,7 +19,6 @@
#define CONFIG_MPC823 1 /* This is a MPC823 CPU */
#define CONFIG_TQM823L 1 /* ...on a TQM8xxL module */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0x40000000
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index 85215b132c1..fbb2f849593 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -19,7 +19,6 @@
#define CONFIG_MPC823 1 /* This is a MPC823 CPU */
#define CONFIG_TQM823M 1 /* ...on a TQM8xxM module */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0x40000000
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 4164303e94f..0b046d13fbb 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -12,7 +12,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 97a9fa7ebea..00771051f04 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -19,7 +19,6 @@
#define CONFIG_MPC850 1 /* This is a MPC850 CPU */
#define CONFIG_TQM850L 1 /* ...on a TQM8xxL module */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0x40000000
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 636ffc830bc..4a443eda23a 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -19,7 +19,6 @@
#define CONFIG_MPC850 1 /* This is a MPC850 CPU */
#define CONFIG_TQM850M 1 /* ...on a TQM8xxM module */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0x40000000
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 3c82c73e3ea..3fbc1ad1287 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -19,7 +19,6 @@
#define CONFIG_MPC855 1 /* This is a MPC855 CPU */
#define CONFIG_TQM855L 1 /* ...on a TQM8xxL module */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0x40000000
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 66f9a88f9c1..d2729d6d72f 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -19,7 +19,6 @@
#define CONFIG_MPC855 1 /* This is a MPC855 CPU */
#define CONFIG_TQM855M 1 /* ...on a TQM8xxM module */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0x40000000
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index 3e20c7161d1..764568df667 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -19,7 +19,6 @@
#define CONFIG_MPC860 1 /* This is a MPC860 CPU */
#define CONFIG_TQM860L 1 /* ...on a TQM8xxL module */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0x40000000
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index be1cd3adc5a..0894f59832a 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -19,7 +19,6 @@
#define CONFIG_MPC860 1 /* This is a MPC860 CPU */
#define CONFIG_TQM860M 1 /* ...on a TQM8xxM module */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0x40000000
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index f07b903314e..9650b8d0b85 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -20,7 +20,6 @@
#define CONFIG_MPC860 1
#define CONFIG_MPC860T 1
#define CONFIG_MPC862 1
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_TQM862L 1 /* ...on a TQM8xxL module */
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index c887a397009..8b8db89e0ee 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -20,7 +20,6 @@
#define CONFIG_MPC860 1
#define CONFIG_MPC860T 1
#define CONFIG_MPC862 1
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_TQM862M 1 /* ...on a TQM8xxM module */
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index a037b4fce5c..a011d2e76c3 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -19,7 +19,6 @@
#define CONFIG_MPC866 1 /* This is a MPC866 CPU */
#define CONFIG_TQM866M 1 /* ...on a TQM8xxM module */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0x40000000
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 76ddef54e64..023736ef2b3 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -22,7 +22,6 @@
#define CONFIG_MPC885 1 /* This is a MPC885 CPU */
#define CONFIG_TQM885D 1 /* ...on a TQM88D module */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0x40000000
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 08011172415..86114737730 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -14,7 +14,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_ELBC
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index bfcfb405fad..42af34fdc60 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/VOM405.h b/include/configs/VOM405.h
index 99ee78b885b..60f266c3458 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -19,7 +19,6 @@
#define CONFIG_VOM405 1 /* ...on a VOM405 board */
#define CONFIG_SYS_TEXT_BASE 0xFFFC8000
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index fc4595b27cf..4839ede8d44 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -15,7 +15,6 @@
#define CONFIG_MPC5200
#define CONFIG_A3M071 /* A3M071 board */
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_TEXT_BASE 0x01000000 /* boot low for 32 MiB boards */
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index 1be78fdf330..0ff5164ce68 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -20,7 +20,6 @@
#define CONFIG_A4M072 1 /* ... on A4M072 board */
#define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_TEXT_BASE 0xFE000000
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index f05d9ecd149..320be8fd1b2 100644
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -14,7 +14,6 @@
#define CONFIG_AC14XX 1
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
/*
* Memory map for the ifm AC14xx board:
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 654b7780d19..0bf0af7f3d0 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 70490910d73..9aa14f43fb2 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/amcc-common.h b/include/configs/amcc-common.h
index c5ef6509507..e87c0cb5d9c 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -10,7 +10,6 @@
#ifndef __AMCC_COMMON_H
#define __AMCC_COMMON_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_SDRAM_BASE 0x00000000 /* _must_ be 0 */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Start of U-Boot */
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 49fbcac7760..5b286d24fec 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/aria.h b/include/configs/aria.h
index 2265f3e7744..c38bf3cfb02 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -14,7 +14,6 @@
#define CONFIG_ARIA 1
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
/*
* Memory map for the ARIA board:
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 7f5cbccb177..dfbd60d19c5 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 62c537448b9..fcb5f81a10a 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 a5990cec030..f9385349ae0 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -31,7 +31,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 7e026ef4542..9274024fb0b 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -61,7 +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 619f5dab177..cc3e69cdf7f 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -48,7 +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 */
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 4d260e9fa89..64fb38bad6e 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -33,7 +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 2f251db1aeb..89ee9fe3e2b 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -48,7 +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 70eaf1d6024..cc42c909d41 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -33,7 +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 */
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 44f821be05b..8fa5ff5fc00 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 cba927acb40..a7a0502dfdd 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -34,7 +34,6 @@
#define CONFIG_CMD_BOOTZ
#define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_ATMEL_LEGACY
#define CONFIG_AT91_GPIO 1
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 2068e0de04a..20a5581cf2b 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -29,7 +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 */
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index 7b48875d638..6ea6fb07f98 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 ba26964feaa..c3ebb4d1163 100644
--- a/include/configs/bcm_ep_board.h
+++ b/include/configs/bcm_ep_board.h
@@ -11,7 +11,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_GENERIC_BOARD
/*
* Memory configuration
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index c6960920b2b..1d96a2dde74 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -26,7 +26,6 @@
#define CONFIG_PREBOOT "run brdefaultip"
#define CONFIG_CMD_TIME
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_AM33XX
#define CONFIG_OMAP
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index c8b15fb5342..a5b2f9e6417 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/canmb.h b/include/configs/canmb.h
index 36cd50b71e1..2a6c09f2204 100644
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -15,7 +15,6 @@
#define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
#define CONFIG_CANMB 1 /* ... on canmb board - we need this for FEC.C */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 4607d9f6bc8..69b26746c86 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -9,7 +9,6 @@
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index e5fb474afce..e951b2d5d16 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 f3d1f4352e4..8a10e9c6f0b 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 95a5a606e33..6d57cd6eb58 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 4efc9c5f3e6..0fc24a04ce8 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 258315576cd..c2c324cf5e5 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/controlcenterd.h b/include/configs/controlcenterd.h
index c8790488532..600bb835cef 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -45,7 +45,6 @@
#define CONFIG_CONTROLCENTERD
#define CONFIG_MP /* support multiple processors */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENABLE_36BIT_PHYS
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 878fda2f807..921021634df 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -10,7 +10,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#include "../board/freescale/common/ics307_clk.h"
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 68056125e9a..97797e2b96d 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -17,7 +17,6 @@
#include <asm/hardware.h>
#include <linux/sizes.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 1cd11c0ded2..5aa643ac6aa 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 74e5b4759f9..9a0596c5118 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -19,7 +19,6 @@
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#endif
-#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 672518b83fa..b3b2de942f3 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -16,7 +16,6 @@
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#endif
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO_LATE
/*
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 02b8f91d339..f802c8dd7eb 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/dlvision-10g.h b/include/configs/dlvision-10g.h
index e39f8ba7afb..0b804ebdd7f 100644
--- a/include/configs/dlvision-10g.h
+++ b/include/configs/dlvision-10g.h
@@ -24,7 +24,6 @@
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_MISC_INIT_R
#define CONFIG_LAST_STAGE_INIT
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h
index 3c0553489e3..90e839ab1bb 100644
--- a/include/configs/dlvision.h
+++ b/include/configs/dlvision.h
@@ -22,7 +22,6 @@
#define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f */
#define CONFIG_MISC_INIT_R /* call misc_init_r */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 54be415712b..c59a3242d61 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 6ebd703d32d..efe58071a50 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -12,7 +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 133c7f4a35e..2815ad86230 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/ea20.h b/include/configs/ea20.h
index 2d1f1b3db91..b230d9cecbf 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -24,7 +24,6 @@
#define CONFIG_VIDEO
#define CONFIG_PREBOOT
-#define CONFIG_SYS_GENERIC_BOARD
/*
* SoC Configuration
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index e3e32aa0814..9fce1cda6b3 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -25,7 +25,6 @@
#error "no board defined"
#endif
-#define CONFIG_SYS_GENERIC_BOARD
/* Initial environment and monitor configuration options. */
#define CONFIG_BOOTDELAY 2
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 8b38d7e75f1..7fb1894c58e 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 b49b9031c69..d6e04568889 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -12,7 +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 d7bf80b69bd..852829c344c 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -16,7 +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
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index f646feefa9e..15905b98406 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/gdppc440etx.h b/include/configs/gdppc440etx.h
index bfaba42643e..b514278fc39 100644
--- a/include/configs/gdppc440etx.h
+++ b/include/configs/gdppc440etx.h
@@ -32,7 +32,6 @@
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f*/
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
-#define CONFIG_SYS_GENERIC_BOARD
#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 2a42e7c62ed..188d2e21517 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -15,7 +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 0de6ae80885..f2fd2ae9a36 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 5f095677f18..675ec52bcf9 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -10,7 +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 e8dfa748efa..6fbbe6e0b86 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 7f331a6a73c..f02575ac04c 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/hikey.h b/include/configs/hikey.h
index 3af02132f87..1a4381bfe2f 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -14,8 +14,6 @@
#include <linux/sizes.h>
-/* We use generic board for hikey */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_POWER
#define CONFIG_POWER_HI6553
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 558edfce8ee..3cb279a9127 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -22,7 +22,6 @@
#define CONFIG_IDENT_STRING " hrcon 0.01"
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 6afe3409298..594fceb457c 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -9,7 +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 bce97dc069d..adf3703592c 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -9,7 +9,6 @@
#ifndef _CONFIG_ICONNECT_H
#define _CONFIG_ICONNECT_H
-#define CONFIG_SYS_GENERIC_BOARD
/*
* Version number information
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index e60e753e405..ecb7f10ab78 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -19,7 +19,6 @@
#define CONFIG_MPC8313
#define CONFIG_IDS8313
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_FSL_ELBC
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 3bea71b969e..235fdd1883b 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -18,7 +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/inka4x0.h b/include/configs/inka4x0.h
index d3034cf10f1..24da83cc006 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -18,7 +18,6 @@
#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_INKA4X0 1 /* INKA4x0 board */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index a22efd699c1..639a30a310e 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/intip.h b/include/configs/intip.h
index 18d314006fb..a676a20ebb4 100644
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -45,7 +45,6 @@
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_BOARD_EARLY_INIT_R 1 /* Call board_early_init_r */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_FIT
#define CFG_ALT_MEMTEST
diff --git a/include/configs/io.h b/include/configs/io.h
index 7d863fafde0..2c457d47752 100644
--- a/include/configs/io.h
+++ b/include/configs/io.h
@@ -24,7 +24,6 @@
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_MISC_INIT_R
#define CONFIG_LAST_STAGE_INIT
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
diff --git a/include/configs/io64.h b/include/configs/io64.h
index 94ccb6bab70..25bd01474a1 100644
--- a/include/configs/io64.h
+++ b/include/configs/io64.h
@@ -43,7 +43,6 @@
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_MISC_INIT_R
#define CONFIG_LAST_STAGE_INIT
-#define CONFIG_SYS_GENERIC_BOARD
#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */
diff --git a/include/configs/iocon.h b/include/configs/iocon.h
index a4d05e559b2..385a6444d64 100644
--- a/include/configs/iocon.h
+++ b/include/configs/iocon.h
@@ -23,7 +23,6 @@
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_LAST_STAGE_INIT
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index b1cd7dfdc28..583f7b3a5a0 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/ipek01.h b/include/configs/ipek01.h
index 3f6f8dd0afb..637bbb321dc 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -19,7 +19,6 @@
#define CONFIG_MPX5200 1 /* MPX5200 board */
#define CONFIG_MPC5200_DDR 1 /* use DDR RAM */
#define CONFIG_IPEK01 /* Motherboard is ipek01 */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0xfc000000
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 5601cb4797d..ba96d97abf3 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -15,7 +15,6 @@
#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_JUPITER 1 /* ... on Jupiter board */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/km/km8309-common.h b/include/configs/km/km8309-common.h
index ec133f9e927..5cbb348045a 100644
--- a/include/configs/km/km8309-common.h
+++ b/include/configs/km/km8309-common.h
@@ -10,7 +10,6 @@
#ifndef __CONFIG_KM8309_COMMON_H
#define __CONFIG_KM8309_COMMON_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/km/km8321-common.h b/include/configs/km/km8321-common.h
index 058b0ab42bc..cd563804929 100644
--- a/include/configs/km/km8321-common.h
+++ b/include/configs/km/km8321-common.h
@@ -23,7 +23,6 @@
#ifndef __CONFIG_KM8321_COMMON_H
#define __CONFIG_KM8321_COMMON_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h
index 940000ea712..cebe21060e5 100644
--- a/include/configs/km/km83xx-common.h
+++ b/include/configs/km/km83xx-common.h
@@ -8,7 +8,6 @@
#ifndef __CONFIG_KM83XX_H
#define __CONFIG_KM83XX_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* include common defines/options for all Keymile boards */
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 5e0f483e475..b89af535abb 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -20,7 +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/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 7536cbdb3c7..8a3c74e1dbc 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -21,7 +21,6 @@
#define CONFIG_NAND_ECC_BCH
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/* common KM defines */
diff --git a/include/configs/km82xx.h b/include/configs/km82xx.h
index 12f9d424cb1..19e89cec765 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 04cde46cc56..c517e78df2e 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 8a451ecd024..94b0f038f27 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/lacie_kw.h b/include/configs/lacie_kw.h
index 7f878b713af..f8cae4013c1 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -8,11 +8,6 @@
#define _CONFIG_LACIE_KW_H
/*
- * Generic board support
- */
-#define CONFIG_SYS_GENERIC_BOARD
-
-/*
* Machine number definition
*/
#if defined(CONFIG_INETSPACE_V2)
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index f73900fe30c..4f5053881ee 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -11,7 +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 02cc09c82b7..88e936b4079 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -11,7 +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 55b909ceaca..9c8a8642e50 100644
--- a/include/configs/ls2085a_common.h
+++ b/include/configs/ls2085a_common.h
@@ -7,7 +7,6 @@
#ifndef __LS2_COMMON_H
#define __LS2_COMMON_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_REMAKE_ELF
#define CONFIG_FSL_LSCH3
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index a57e328dfda..4194a0ff8bb 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -8,7 +8,6 @@
#ifndef _CONFIG_LSXL_H
#define _CONFIG_LSXL_H
-#define CONFIG_SYS_GENERIC_BOARD
/*
* Version number information
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 2d93d44a3a7..66d9710d336 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -23,7 +23,6 @@
#define CONFIG_440EPX 1 /* Specific PPC440EPx */
#define CONFIG_440 1 /* ... PPC440 family */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_TEXT_BASE 0xFFF80000
#define CONFIG_HOSTNAME lwmon5
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 8853d8fcc06..444056347ce 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 3bed9c7ca40..3c4beeba7c0 100644
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -14,7 +14,6 @@
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#endif
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO_LATE
/*
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 0f70c47649a..62406666eb6 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -25,7 +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
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index 84f1a400849..0f399641916 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -16,7 +16,6 @@
#define CONFIG_MECP5123 1
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
/*
* Memory map for the MECP5123 board:
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index ab6c910dee6..9c53fb4ad88 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -56,7 +56,6 @@
#define CONFIG_DISPLAY_CPUINFO /* display cpu info and speed */
#define CONFIG_PREBOOT /* enable preboot variable */
-#define CONFIG_SYS_GENERIC_BOARD
/*
* Hardware drivers
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 6eb6e518f0c..97c614b5d6f 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -17,7 +17,6 @@
/* CPU and board */
#define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
#define CONFIG_MOTIONPRO 1 /* ... on Promess Motion-PRO board */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_HIGH_BATS 1 /* High BATs supported */
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 782b29dc971..5f4e15772d0 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -13,7 +13,6 @@
#define CONFIG_MPC5121ADS 1
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
/*
* Memory map for the MPC5121ADS board:
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 1b09e7076e8..1a627fc5205 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -9,7 +9,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/munices.h b/include/configs/munices.h
index 072bd958a0d..c34cba3d5c6 100644
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -14,7 +14,6 @@
#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200_DDR 1 /* (with DDR-SDRAM) */
#define CONFIG_MUNICES 1 /* ... on MUNICes board */
-#define CONFIG_SYS_GENERIC_BOARD
#ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xFFF00000
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 04140865f48..93f1cd1837c 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 c4513d2df7d..ae9f091ef95 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -14,7 +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 72d28c9bd95..863b032042c 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -19,7 +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 6bfdaa6432f..6c157ab0fca 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 2203c15417d..3cbc53e3117 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 b889c254ccb..52ba176fb9a 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -23,7 +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 4f304ed89f9..a7282f3bf4c 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -23,7 +23,6 @@
#define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_OF_LIBFDT
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 3a65861e5e9..9e1c706a3d3 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -22,7 +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 e46f2eeecbb..e294bff95f6 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -23,7 +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 ef4cb68e8d7..4ae1673f8de 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/mx7_common.h b/include/configs/mx7_common.h
index ea2be496e05..04468b94eef 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -33,7 +33,6 @@
#define CONFIG_BOARD_LATE_INIT
#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 9d823def674..63fdf9e4e75 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -40,7 +40,6 @@
/*
* 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 ebf67501f0b..e5ff7e1f6c8 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/neo.h b/include/configs/neo.h
index f1783662a47..a60b3f7cf1b 100644
--- a/include/configs/neo.h
+++ b/include/configs/neo.h
@@ -25,7 +25,6 @@
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_MISC_INIT_R
#define CONFIG_LAST_STAGE_INIT
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 915df52ccfe..52369be39e5 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/o2dnt-common.h b/include/configs/o2dnt-common.h
index 435f1a27a1e..8b0dbdc7477 100644
--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@@ -18,7 +18,6 @@
*/
#define CONFIG_MPC5200
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* running at 33.000000MHz */
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 0ebe5c118bc..7e7f6f2e9f4 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -15,7 +15,6 @@
#define CONFIG_OMAP /* This is 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/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index cef2243bfeb..a59fd426c50 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 d9a3aa42176..80d57f46d4d 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 362cf308176..433c4093361 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/p1_twr.h b/include/configs/p1_twr.h
index 588a6c5ebf8..d83daa02556 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -10,7 +10,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#if defined(CONFIG_TWR_P1025)
#define CONFIG_BOARDNAME "TWR-P1025"
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 4ea617a9d4c..29feb7bba13 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -15,7 +15,6 @@
#define __CONFIG_H
#define CONFIG_BOARDINFO "phyCORE-MPC5200B-tiny"
-#define CONFIG_SYS_GENERIC_BOARD
/*-----------------------------------------------------------------------------
High Level Configuration Options
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 18f45af1fa7..046ddb8516d 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -13,7 +13,6 @@
#define CONFIG_VF610
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_THUMB_BUILD
diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index e7413c9fa28..a6e7e9c152c 100644
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -14,7 +14,6 @@
#define CONFIG_PDM360NG 1
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
/*
* Memory map for the PDM360NG board:
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 9e9b1d0c1d7..47613ded3ba 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -36,7 +36,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 */
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index f4f96a71a05..407b83d0201 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -20,7 +20,6 @@
#include <asm/hardware.h>
/* ARM asynchronous clock */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index bd4357722c0..f6886a6eb2b 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -18,7 +18,6 @@
*/
#include <asm/hardware.h>
-#define CONFIG_SYS_GENERIC_BOARD
/* ARM asynchronous clock */
#define CONFIG_DISPLAY_CPUINFO
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 09f0744b410..ede0ee1f122 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -22,7 +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 8cf3ad84790..b1a3dc7716a 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -13,7 +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/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 5cd090614dd..f45789fd5ea 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -19,7 +19,6 @@
#undef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xf01000 /* 15 MB */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_MPC85XX_NO_RESETVEC
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 7dd92605358..f0a3a187d7b 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/rk3288_common.h b/include/configs/rk3288_common.h
index e8aec286243..36408b99e2c 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -13,7 +13,6 @@
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_MALLOC_LEN (32 << 20)
diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index 58fe1f7a435..0b8c6814731 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 aff264bbd29..2877e19ad4b 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -278,6 +278,5 @@
#define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD
#endif /* __CONFIG_H */
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 9d89b2a3423..c8b14e9b831 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -15,7 +15,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 87e562e171b..1c309a42b34 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -13,7 +13,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
/*
* Top level Makefile configuration choices
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index eed0f497516..0b22ce0e02e 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -20,7 +20,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
/* High Level Configuration Options */
#define CONFIG_MPC8641 1 /* MPC8641 specific */
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 272e3ca9b31..76cdbe0c6dc 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -10,7 +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 bcc8dcbfb25..6c374eb0828 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -45,7 +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
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index e11c016aedb..44d1d5a171c 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -51,7 +51,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 fb3850259cc..9947dc05f14 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -23,7 +23,6 @@
#define CONFIG_SYS_TEXT_BASE 0x0
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 1d9ce92746b..c36e444a6cc 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -214,6 +214,5 @@
#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 7758b0f51d0..afcd16afbe3 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 a0ee5bd5a04..f168e8f97ac 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 cece0950e29..33746839115 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -6,7 +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/socrates.h b/include/configs/socrates.h
index 50911ae2591..019cf309e39 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -27,7 +27,6 @@
#define CONFIG_E500 1 /* BOOKE e500 family */
#define CONFIG_MPC8544 1
#define CONFIG_SOCRATES 1
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0xfff80000
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index edae831f22f..1d69477e613 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -11,7 +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 19d9cf9abf3..17969952d12 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 b1b69197d4f..1526d13ac15 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 ddcfe94e89e..f5db4d3e3ec 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -158,7 +158,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/t4qds.h b/include/configs/t4qds.h
index 26028df21a9..5754369cf31 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -10,7 +10,6 @@
#ifndef __T4QDS_H
#define __T4QDS_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_CMD_REGINFO
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 801220a1ce4..f993433285a 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 bd1c07c3ebb..97fe79607d5 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 12994c80659..a5e7090cb72 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -22,7 +22,6 @@
#include <asm/hardware.h>
#include <linux/sizes.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 1c469d092e8..a005e6a2acc 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -130,7 +130,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/ti814x_evm.h b/include/configs/ti814x_evm.h
index ceeb7fe46bd..7fa35a15425 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -21,7 +21,6 @@
#define CONFIG_SYS_NO_FLASH
#define CONFIG_OMAP
#define CONFIG_OMAP_COMMON
-#define CONFIG_SYS_GENERIC_BOARD
#include <asm/arch/omap.h>
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 4c192896ad6..01d82337415 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -15,7 +15,6 @@
#define CONFIG_SYS_NO_FLASH
#define CONFIG_OMAP
#define CONFIG_OMAP_COMMON
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_ARCH_CPU_INIT
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 586bd2b50ff..32bb805f781 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -17,9 +17,6 @@
#ifndef __CONFIG_TI_ARMV7_COMMON_H__
#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
* undefine this later.
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index f04b572985e..02b0e6351f4 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -38,7 +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
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 21f1555eb79..fbca8a68ef2 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -37,9 +37,6 @@
#define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG
-/* use common/board_f.c instead of arch/<arch>/lib/<board>.c */
-#define CONFIG_SYS_GENERIC_BOARD
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 9109b7f8d9d..1e71703ef09 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -82,7 +82,6 @@
/* serial console configuration */
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_GENERIC_BOARD
#if !defined(CONFIG_SPL_BUILD)
#define CONFIG_USE_ARCH_MEMSET
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 10a1664f020..54daede83be 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 714e3e2ca21..4af9f3698bc 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/v38b.h b/include/configs/v38b.h
index 3e51b9fc2c9..f15420817b7 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -14,7 +14,6 @@
*/
#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_V38B 1 /* ...on V38B board */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0xFF000000
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index a88216c6ec5..f5df4fb9da8 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -13,7 +13,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 0f2f1a30baf..a99d712a47d 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 98f6ae94e68..cec510c1f12 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 7f4260a3ac7..df570d9b2d5 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/vme8349.h b/include/configs/vme8349.h
index a6f5d6a4ea3..7f5f089b12b 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -18,7 +18,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
/*
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index fc4656567da..c25b710a585 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 15ee28414d3..f77d065a722 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 73ba67c3e91..85347665881 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
#define CONFIG_SYS_THUMB_BUILD
#include <asm/arch/hardware.h>
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index 6bd6be86e1a..1abd0eff0f5 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -12,7 +12,6 @@
#ifndef __CONFIG_XLX_H
#define __CONFIG_XLX_H
-#define CONFIG_SYS_GENERIC_BOARD
/*
#define DEBUG
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index ed09b7f67e7..32ee0fc149f 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -17,7 +17,6 @@
#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_GENERIC_BOARD
/* Generic Interrupt Controller Definitions */
#define CONFIG_GICV2
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index 37a31c4797f..005f1495fe0 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -22,7 +22,6 @@
#define CONFIG_440GX 1 /* 440 GX */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */
#define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0xFFF80000
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 51781daa7f0..3e09635689c 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -23,7 +23,6 @@
#define CONFIG_BAT_RW 1 /* Use common BAT rw code */
#define CONFIG_HIGH_BATS 1 /* High BATs supported and enabled */
#define CONFIG_ALTIVEC 1
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_TEXT_BASE 0xfff00000
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index e48960b8019..39bdb88a979 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -21,7 +21,6 @@
#define CONFIG_SYS_BOARD_NAME "XPedite5200"
#define CONFIG_SYS_FORM_PMC_XMC 1
#define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#ifndef CONFIG_SYS_TEXT_BASE
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 3645cb28d43..c687555b8ee 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -21,7 +21,6 @@
#define CONFIG_SYS_BOARD_NAME "XPedite5370"
#define CONFIG_SYS_FORM_3U_VPX 1
#define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#ifndef CONFIG_SYS_TEXT_BASE
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 7bf0ccac7fa..f971f8b403b 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -22,7 +22,6 @@
#define CONFIG_SYS_FORM_PMC_XMC 1
#define CONFIG_PRPMC_PCI_ALIAS "pci0" /* Processor PMC interface on pci0 */
#define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */
-#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_DISPLAY_BOARDINFO
#ifndef CONFIG_SYS_TEXT_BASE
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index b7134ebc20d..bd8fdfb8bd5 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -15,7 +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 \
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 873c42d3a1c..66b1e699c80 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -375,6 +375,5 @@
#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_GENERIC_BOARD
#endif /* __CONFIG_ZYNQ_COMMON_H */