arm: Move all boards over to generic board

PATCH In review Simon Glass 10 participants 18 messages Aug 19, 2015 – Aug 27, 2015

Subsystems (14)

Arm (32-bit) Arm i.MX and Layerscape Arm Samsung Exynos Tegra architecture support +10 more subsystems

lore

Share & tools

lore

Simon Glass

author

2015-08-19 04:35 UTC #0 lore raw

v2 cover arm: Move all boards over to generic board

All arm boards should have been converted to generic board by now. It is time to either remove the non-generic boards, or force-convert them to generic board.

This series takes the latter approach, which may break a few boards, but most should be OK.

Generic board is enabled for the following ARM boards:

balloon3 cpu9260 cpu9260_128M cpu9260_nand cpu9260_nand_128M cpu9G20 cpu9G20_128M cpu9G20_nand cpu9G20_nand_128M cpuat91 cpuat91_ram d2net_v2 da830evm davinci_dm355evm davinci_dm355leopard davinci_dm365evm davinci_dm6467Tevm davinci_dm6467evm davinci_dvevm davinci_schmoogie davinci_sffsdr davinci_sonata dig297 ea20 eb_cpux9k2 eb_cpux9k2_ram edb9315a enbw_cmc ima3-mx53 imx27lite imx31_litekit inetspace_v2 jornada lp8x4x magnesium meesc meesc_dataflash mv88f6281gtw_ge mx51_efikamx mx51_efikasb net2big_v2 netspace_lite_v2 netspace_max_v2 netspace_mini_v2 netspace_v2 nhk8815 nhk8815_onenand omap3_logic omap3_mvblx omap3_sdp3430 openrd_base openrd_client openrd_ultimate otc570 otc570_dataflash palmld palmtc polaris portuxg20 pxa255_idp qong rd6281a scb9328 snowball stamp9g20 tk71 trizepsiv tt01 u8500_href versatileab versatilepb versatileqemu vision2 vl_ma2sc vl_ma2sc_ram vpac270_nor_128 vpac270_nor_256 wireless_space xaeniax zipitz2

cam_enc_4xx omap3_evm omap3_evm_quick_mmc omap3_evm_quick_nand palmtreo680 ti814x_evm ti816x_evm tx25 vpac270_ond_256

buildman -sK was used to confirm that no other boards (e.g. PowerPC) were changed.

Series-changes: 2
- Add a list of boards affected
- Drop changes to PowerPC boards which should not have been touched
- Improve buildman's config change summary feature

Changes in v2:
- Drop changes to digsy_mtc and xilinx-ppc
- Add changes to smartweb and sniper
- Add patch to improve the buildman config comparison feature

Simon Glass (3):
arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards
arm: Drop old non-generic-board code
buildman: Improve the config comparison feature

 arch/Kconfig                               |   1 +
 arch/arm/include/asm/arch-lpc32xx/config.h |   2 -
 arch/arm/include/asm/u-boot.h              |  19 -
 arch/arm/lib/Makefile                      |   3 -
 arch/arm/lib/board.c                       | 687 -----------------------------
 include/configs/VCMA9.h                    |   1 -
 include/configs/am3517_crane.h             |   1 -
 include/configs/am3517_evm.h               |   1 -
 include/configs/apf27.h                    |   1 -
 include/configs/armadillo-800eva.h         |   1 -
 include/configs/aspenite.h                 |   5 -
 include/configs/at91-sama5_common.h        |   2 -
 include/configs/at91rm9200ek.h             |   2 -
 include/configs/at91sam9260ek.h            |   2 -
 include/configs/at91sam9261ek.h            |   2 -
 include/configs/at91sam9263ek.h            |   2 -
 include/configs/at91sam9m10g45ek.h         |   2 -
 include/configs/at91sam9n12ek.h            |   1 -
 include/configs/at91sam9rlek.h             |   2 -
 include/configs/at91sam9x5ek.h             |   2 -
 include/configs/bcm28155_ap.h              |   1 -
 include/configs/bcm_ep_board.h             |   2 -
 include/configs/bur_am335x_common.h        |   2 -
 include/configs/calimain.h                 |   1 -
 include/configs/cm_t35.h                   |   1 -
 include/configs/cm_t3517.h                 |   1 -
 include/configs/cm_t54.h                   |   3 -
 include/configs/colibri_pxa270.h           |   1 -
 include/configs/colibri_vf.h               |   1 -
 include/configs/corvus.h                   |   1 -
 include/configs/da850evm.h                 |   1 -
 include/configs/db-88f6820-gp.h            |   1 -
 include/configs/db-mv784mp-gp.h            |   1 -
 include/configs/dns325.h                   |   1 -
 include/configs/dockstar.h                 |   2 -
 include/configs/dreamplug.h                |   1 -
 include/configs/edminiv2.h                 |   3 -
 include/configs/ethernut5.h                |   2 -
 include/configs/exynos-common.h            |   2 -
 include/configs/flea3.h                    |   1 -
 include/configs/goflexhome.h               |   2 -
 include/configs/gplugd.h                   |   5 -
 include/configs/guruplug.h                 |   2 -
 include/configs/h2200.h                    |   1 -
 include/configs/highbank.h                 |   1 -
 include/configs/ib62x0.h                   |   2 -
 include/configs/iconnect.h                 |   2 -
 include/configs/imx31_phycore.h            |   2 -
 include/configs/integrator-common.h        |   1 -
 include/configs/ipam390.h                  |   1 -
 include/configs/km/km_arm.h                |   2 -
 include/configs/kzm9g.h                    |   1 -
 include/configs/ls1021aqds.h               |   2 -
 include/configs/ls1021atwr.h               |   2 -
 include/configs/ls2085a_common.h           |   2 -
 include/configs/lsxl.h                     |   2 -
 include/configs/m53evk.h                   |   1 -
 include/configs/maxbcm.h                   |   1 -
 include/configs/mcx.h                      |   2 -
 include/configs/mx25pdk.h                  |   1 -
 include/configs/mx31ads.h                  |   2 -
 include/configs/mx31pdk.h                  |   2 -
 include/configs/mx35pdk.h                  |   1 -
 include/configs/mx51evk.h                  |   1 -
 include/configs/mx53ard.h                  |   2 -
 include/configs/mx53evk.h                  |   2 -
 include/configs/mx53loco.h                 |   2 -
 include/configs/mx53smd.h                  |   2 -
 include/configs/mx6_common.h               |   1 -
 include/configs/mx6ul_14x14_evk.h          |   1 -
 include/configs/mxs.h                      |   5 -
 include/configs/nas220.h                   |   1 -
 include/configs/nokia_rx51.h               |   1 -
 include/configs/omap3_zoom1.h              |   1 -
 include/configs/omapl138_lcdk.h            |   1 -
 include/configs/pm9261.h                   |   2 -
 include/configs/pm9263.h                   |   2 -
 include/configs/pm9g45.h                   |   2 -
 include/configs/pogo_e02.h                 |   2 -
 include/configs/rcar-gen2-common.h         |   1 -
 include/configs/rpi-common.h               |   1 -
 include/configs/s5p_goni.h                 |   2 -
 include/configs/sheevaplug.h               |   2 -
 include/configs/siemens-am33x-common.h     |   2 -
 include/configs/smartweb.h                 |   1 -
 include/configs/smdk2410.h                 |   2 -
 include/configs/smdkc100.h                 |   2 -
 include/configs/snapper9260.h              |   1 -
 include/configs/sniper.h                   |   1 -
 include/configs/socfpga_common.h           |   2 -
 include/configs/spear-common.h             |   2 -
 include/configs/stm32f429-discovery.h      |   1 -
 include/configs/stv0991.h                  |   1 -
 include/configs/sunxi-common.h             |   1 -
 include/configs/tam3517-common.h           |   1 -
 include/configs/tao3530.h                  |   1 -
 include/configs/taurus.h                   |   1 -
 include/configs/tegra-common.h             |   1 -
 include/configs/ti_armv7_common.h          |   1 -
 include/configs/tricorder.h                |   2 -
 include/configs/uniphier.h                 |   2 -
 include/configs/usb_a9263.h                |   1 -
 include/configs/usbarmory.h                |   1 -
 include/configs/vexpress_aemv8a.h          |   3 -
 include/configs/vexpress_common.h          |   1 -
 include/configs/vf610twr.h                 |   1 -
 include/configs/woodburn_common.h          |   1 -
 include/configs/work_92105.h               |   1 -
 include/configs/x600.h                     |   1 -
 include/configs/xilinx_zynqmp.h            |   2 -
 include/configs/zmx25.h                    |   2 -
 include/configs/zynq-common.h              |   2 -
 tools/buildman/builder.py                  | 199 +++++++--
 113 files changed, 156 insertions(+), 926 deletions(-)
 delete mode 100644 arch/arm/lib/board.c

Signature · 1 line

2.5.0.276.gf5e568e

Simon Glass

author

2015-08-19 04:35 UTC #1 lore raw

PATCH v2 1/3 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Drop changes to digsy_mtc and xilinx-ppc
- Add changes to smartweb and sniper

 arch/Kconfig                               | 1 +
 arch/arm/include/asm/arch-lpc32xx/config.h | 2 --
 include/configs/VCMA9.h                    | 1 -
 include/configs/am3517_crane.h             | 1 -
 include/configs/am3517_evm.h               | 1 -
 include/configs/apf27.h                    | 1 -
 include/configs/armadillo-800eva.h         | 1 -
 include/configs/aspenite.h                 | 5 -----
 include/configs/at91-sama5_common.h        | 2 --
 include/configs/at91rm9200ek.h             | 2 --
 include/configs/at91sam9260ek.h            | 2 --
 include/configs/at91sam9261ek.h            | 2 --
 include/configs/at91sam9263ek.h            | 2 --
 include/configs/at91sam9m10g45ek.h         | 2 --
 include/configs/at91sam9n12ek.h            | 1 -
 include/configs/at91sam9rlek.h             | 2 --
 include/configs/at91sam9x5ek.h             | 2 --
 include/configs/bcm28155_ap.h              | 1 -
 include/configs/bcm_ep_board.h             | 2 --
 include/configs/bur_am335x_common.h        | 2 --
 include/configs/calimain.h                 | 1 -
 include/configs/cm_t35.h                   | 1 -
 include/configs/cm_t3517.h                 | 1 -
 include/configs/cm_t54.h                   | 3 ---
 include/configs/colibri_pxa270.h           | 1 -
 include/configs/colibri_vf.h               | 1 -
 include/configs/corvus.h                   | 1 -
 include/configs/da850evm.h                 | 1 -
 include/configs/db-88f6820-gp.h            | 1 -
 include/configs/db-mv784mp-gp.h            | 1 -
 include/configs/dns325.h                   | 1 -
 include/configs/dockstar.h                 | 2 --
 include/configs/dreamplug.h                | 1 -
 include/configs/edminiv2.h                 | 3 ---
 include/configs/ethernut5.h                | 2 --
 include/configs/exynos-common.h            | 2 --
 include/configs/flea3.h                    | 1 -
 include/configs/goflexhome.h               | 2 --
 include/configs/gplugd.h                   | 5 -----
 include/configs/guruplug.h                 | 2 --
 include/configs/h2200.h                    | 1 -
 include/configs/highbank.h                 | 1 -
 include/configs/ib62x0.h                   | 2 --
 include/configs/iconnect.h                 | 2 --
 include/configs/imx31_phycore.h            | 2 --
 include/configs/integrator-common.h        | 1 -
 include/configs/ipam390.h                  | 1 -
 include/configs/km/km_arm.h                | 2 --
 include/configs/kzm9g.h                    | 1 -
 include/configs/ls1021aqds.h               | 2 --
 include/configs/ls1021atwr.h               | 2 --
 include/configs/ls2085a_common.h           | 2 --
 include/configs/lsxl.h                     | 2 --
 include/configs/m53evk.h                   | 1 -
 include/configs/maxbcm.h                   | 1 -
 include/configs/mcx.h                      | 2 --
 include/configs/mx25pdk.h                  | 1 -
 include/configs/mx31ads.h                  | 2 --
 include/configs/mx31pdk.h                  | 2 --
 include/configs/mx35pdk.h                  | 1 -
 include/configs/mx51evk.h                  | 1 -
 include/configs/mx53ard.h                  | 2 --
 include/configs/mx53evk.h                  | 2 --
 include/configs/mx53loco.h                 | 2 --
 include/configs/mx53smd.h                  | 2 --
 include/configs/mx6_common.h               | 1 -
 include/configs/mx6ul_14x14_evk.h          | 1 -
 include/configs/mxs.h                      | 5 -----
 include/configs/nas220.h                   | 1 -
 include/configs/nokia_rx51.h               | 1 -
 include/configs/omap3_zoom1.h              | 1 -
 include/configs/omapl138_lcdk.h            | 1 -
 include/configs/pm9261.h                   | 2 --
 include/configs/pm9263.h                   | 2 --
 include/configs/pm9g45.h                   | 2 --
 include/configs/pogo_e02.h                 | 2 --
 include/configs/rcar-gen2-common.h         | 1 -
 include/configs/rpi-common.h               | 1 -
 include/configs/s5p_goni.h                 | 2 --
 include/configs/sheevaplug.h               | 2 --
 include/configs/siemens-am33x-common.h     | 2 --
 include/configs/smartweb.h                 | 1 -
 include/configs/smdk2410.h                 | 2 --
 include/configs/smdkc100.h                 | 2 --
 include/configs/snapper9260.h              | 1 -
 include/configs/sniper.h                   | 1 -
 include/configs/socfpga_common.h           | 2 --
 include/configs/spear-common.h             | 2 --
 include/configs/stm32f429-discovery.h      | 1 -
 include/configs/stv0991.h                  | 1 -
 include/configs/sunxi-common.h             | 1 -
 include/configs/tam3517-common.h           | 1 -
 include/configs/tao3530.h                  | 1 -
 include/configs/taurus.h                   | 1 -
 include/configs/tegra-common.h             | 1 -
 include/configs/ti_armv7_common.h          | 1 -
 include/configs/tricorder.h                | 2 --
 include/configs/uniphier.h                 | 2 --
 include/configs/usb_a9263.h                | 1 -
 include/configs/usbarmory.h                | 1 -
 include/configs/vexpress_aemv8a.h          | 3 ---
 include/configs/vexpress_common.h          | 1 -
 include/configs/vf610twr.h                 | 1 -
 include/configs/woodburn_common.h          | 1 -
 include/configs/work_92105.h               | 1 -
 include/configs/x600.h                     | 1 -
 include/configs/xilinx_zynqmp.h            | 2 --
 include/configs/zmx25.h                    | 2 --
 include/configs/zynq-common.h              | 2 --
 109 files changed, 1 insertion(+), 173 deletions(-)

arch/Kconfig +1 -0

index e952bb1..f4732c8 100644
@@ -24,6 +24,7 @@ config ARM
 	select CREATE_ARCH_SYMLINK
 	select HAVE_PRIVATE_LIBGCC if !ARM64
 	select HAVE_GENERIC_BOARD
+	select SYS_GENERIC_BOARD
 	select SUPPORT_OF_CONTROL
 
 config AVR32

arch/arm/include/asm/arch-lpc32xx/config.h +0 -2

index d57bc48..ad2fbeb 100644
@@ -9,8 +9,6 @@
 #ifndef _LPC32XX_CONFIG_H
 #define _LPC32XX_CONFIG_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Basic CPU architecture */
 #define CONFIG_ARCH_CPU_INIT

include/configs/VCMA9.h +0 -1

index 5b2e092..6ce88f6 100644
@@ -27,7 +27,6 @@
 
 #define CONFIG_SYS_TEXT_BASE	0x0
 
-#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH

include/configs/am3517_crane.h +0 -1

index 654b778..0bf0af7 100644
@@ -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

include/configs/am3517_evm.h +0 -1

index 7049091..9aa14f4 100644
@@ -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

include/configs/apf27.h +0 -1

index 43fbdd3..a91b7c2 100644
@@ -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.

include/configs/armadillo-800eva.h +0 -1

index 7f5cbcc..dfbd60d 100644
@@ -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

include/configs/aspenite.h +0 -5

index 62c5374..fcb5f81 100644
@@ -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"

include/configs/at91-sama5_common.h +0 -2

index 2bded45..6155671 100644
@@ -30,8 +30,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_OF_LIBFDT		/* Device Tree support */
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* general purpose I/O */
 #define CONFIG_AT91_GPIO

include/configs/at91rm9200ek.h +0 -2

index 7e026ef..259b0ea 100644
@@ -61,8 +61,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Memory Configuration
  */

include/configs/at91sam9260ek.h +0 -2

index 459b8f9..808246b 100644
@@ -48,8 +48,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */
 #define CONFIG_AT91_GPIO

include/configs/at91sam9261ek.h +0 -2

index 9c595f2..492f6d2 100644
@@ -33,8 +33,6 @@
 
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_ATMEL_LEGACY
 #define CONFIG_SYS_TEXT_BASE		0x21f00000

include/configs/at91sam9263ek.h +0 -2

index 3eb0154..233e7aa 100644
@@ -48,8 +48,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Hardware drivers
  */

include/configs/at91sam9m10g45ek.h +0 -2

index 4d90209..774eb96 100644
@@ -33,8 +33,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */
 #define CONFIG_AT91_GPIO

include/configs/at91sam9n12ek.h +0 -1

index ea0a94b..510035b 100644
@@ -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

include/configs/at91sam9rlek.h +0 -2

index f7a174e..1c3b7ba 100644
@@ -34,8 +34,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_ATMEL_LEGACY
 #define CONFIG_AT91_GPIO		1
 #define CONFIG_AT91_GPIO_PULLUP		1

include/configs/at91sam9x5ek.h +0 -2

index 9f76786..53d8e40 100644
@@ -29,8 +29,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */
 #define CONFIG_AT91_GPIO

include/configs/bcm28155_ap.h +0 -1

index b7c5716..bbe1ec6 100644
@@ -13,7 +13,6 @@
 /* CPU, chip, mach, etc */
 #define CONFIG_KONA
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_GENERIC_BOARD
 
 /*
  * Memory configuration

include/configs/bcm_ep_board.h +0 -2

index ba26964..d40b411 100644
@@ -11,8 +11,6 @@
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Memory configuration
  * (these must be defined elsewhere)

include/configs/bur_am335x_common.h +0 -2

index 838ef1f..0473cda 100644
@@ -28,8 +28,6 @@
 
 #define CONFIG_CMD_TIME
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_AM33XX
 #define CONFIG_OMAP
 #define CONFIG_OMAP_COMMON

include/configs/calimain.h +0 -1

index c8b15fb..a5b2f9e 100644
@@ -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

include/configs/cm_t35.h +0 -1

index 281d614..1d5b44e 100644
@@ -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

include/configs/cm_t3517.h +0 -1

index 33b22a7..731fcc1 100644
@@ -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

include/configs/cm_t54.h +0 -3

index 95a5a60..6d57cd6 100644
@@ -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

include/configs/colibri_pxa270.h +0 -1

index a1b64c6..8e2a25e 100644
@@ -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

include/configs/colibri_vf.h +0 -1

index 2583155..c2c324c 100644
@@ -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

include/configs/corvus.h +0 -1

index 2d2f3c1..c59cbe8 100644
@@ -16,7 +16,6 @@
 
 #include <asm/hardware.h>
 
-#define CONFIG_SYS_GENERIC_BOARD
 /*
  * Warning: changing CONFIG_SYS_TEXT_BASE requires
  * adapting the initial boot program.

include/configs/da850evm.h +0 -1

index 1cd11c0..5aa643a 100644
@@ -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 */

include/configs/db-88f6820-gp.h +0 -1

index 1dd4182..61446e6 100644
@@ -17,7 +17,6 @@
 #define CONFIG_SYS_L2_PL310
 
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
 /*

include/configs/db-mv784mp-gp.h +0 -1

index eec2ba9..7802dd3 100644
@@ -14,7 +14,6 @@
 #define CONFIG_DB_784MP_GP		/* Board target name for DDR training */
 
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
 /*

include/configs/dns325.h +0 -1

index 54be415..c59a324 100644
@@ -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

include/configs/dockstar.h +0 -2

index a62f4e3..82035bc 100644
@@ -12,8 +12,6 @@
 #ifndef _CONFIG_DOCKSTAR_H
 #define _CONFIG_DOCKSTAR_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Version number information
  */

include/configs/dreamplug.h +0 -1

index 133c7f4..2815ad8 100644
@@ -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"

include/configs/edminiv2.h +0 -3

index 8b38d7e..7fb1894 100644
@@ -12,9 +12,6 @@
 #ifndef _CONFIG_EDMINIV2_H
 #define _CONFIG_EDMINIV2_H
 
-/* general settings */
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * SPL
  */

include/configs/ethernut5.h +0 -2

index b49b903..7126d56 100644
@@ -12,8 +12,6 @@
 
 #include <asm/hardware.h>
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* The first stage boot loader expects u-boot running at this address. */
 #define CONFIG_SYS_TEXT_BASE	0x27000000	/* 16MB available */

include/configs/exynos-common.h +0 -2

index d7bf80b..0a2d610 100644
@@ -16,8 +16,6 @@
 #include <asm/arch/cpu.h>		/* get chip and board defs */
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

include/configs/flea3.h +0 -1

index 5b4b011..f613d20 100644
@@ -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

include/configs/goflexhome.h +0 -2

index 2a42e7c..910552b 100644
@@ -15,8 +15,6 @@
 #ifndef _CONFIG_GOFLEXHOME_H
 #define _CONFIG_GOFLEXHOME_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Version number information
  */

include/configs/gplugd.h +0 -5

index 0de6ae8..f2fd2ae 100644
@@ -26,11 +26,6 @@
 #endif
 
 /*
- * Generic board support
- */
-#define CONFIG_SYS_GENERIC_BOARD
-
-/*
  * Version number information
  */
 #define CONFIG_IDENT_STRING	"\nMarvell-gplugD"

include/configs/guruplug.h +0 -2

index 5f09567..7d72240 100644
@@ -10,8 +10,6 @@
 #ifndef _CONFIG_GURUPLUG_H
 #define _CONFIG_GURUPLUG_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Version number information
  */

include/configs/h2200.h +0 -1

index e8dfa74..6fbbe6e 100644
@@ -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

include/configs/highbank.h +0 -1

index 7f331a6..f02575a 100644
@@ -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

include/configs/ib62x0.h +0 -2

index 6afe340..41136d6 100644
@@ -9,8 +9,6 @@
 #ifndef _CONFIG_IB62x0_H
 #define _CONFIG_IB62x0_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Version number information
  */

include/configs/iconnect.h +0 -2

index bce97dc..6a47523 100644
@@ -9,8 +9,6 @@
 #ifndef _CONFIG_ICONNECT_H
 #define _CONFIG_ICONNECT_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Version number information
  */

include/configs/imx31_phycore.h +0 -2

index 86f327c..0fc4106 100644
@@ -18,8 +18,6 @@
 #define CONFIG_MX31			/* This is a mx31 */
 #define CONFIG_MX31_CLK32	32000
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

include/configs/integrator-common.h +0 -1

index a22efd6..639a30a 100644
@@ -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

include/configs/ipam390.h +0 -1

index b1cd7df..583f7b3 100644
@@ -18,7 +18,6 @@
 /*
  * Board
  */
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DRIVER_TI_EMAC
 #define CONFIG_BARIX_IPAM390

include/configs/km/km_arm.h +0 -2

index 15fca1a..44f58e3 100644
@@ -20,8 +20,6 @@
 #ifndef _CONFIG_KM_ARM_H
 #define _CONFIG_KM_ARM_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* We got removed from Linux mach-types.h */
 #define MACH_TYPE_KM_KIRKWOOD          2255

include/configs/kzm9g.h +0 -1

index 8a451ec..94b0f03 100644
@@ -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>

include/configs/ls1021aqds.h +0 -2

index 0871a71..09f0524 100644
@@ -11,8 +11,6 @@
 
 #define CONFIG_ARMV7_PSCI
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

include/configs/ls1021atwr.h +0 -2

index df7af3c..79139e6 100644
@@ -11,8 +11,6 @@
 
 #define CONFIG_ARMV7_PSCI
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

include/configs/ls2085a_common.h +0 -2

index 39fb464..c7be13a 100644
@@ -7,8 +7,6 @@
 #ifndef __LS2_COMMON_H
 #define __LS2_COMMON_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_REMAKE_ELF
 #define CONFIG_FSL_LSCH3
 #define CONFIG_LS2085A

include/configs/lsxl.h +0 -2

index 1837258..cd81302 100644
@@ -8,8 +8,6 @@
 #ifndef _CONFIG_LSXL_H
 #define _CONFIG_LSXL_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Version number information
  */

include/configs/m53evk.h +0 -1

index 35058e2..787cfdb 100644
@@ -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>

include/configs/maxbcm.h +0 -1

index 3530a26..bc4fc71 100644
@@ -12,7 +12,6 @@
  */
 #define CONFIG_ARMADA_XP		/* SOC Family Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
 /*

include/configs/mcx.h +0 -2

index 0f70c47..a1d68ea 100644
@@ -25,8 +25,6 @@
 #define CONFIG_MACH_TYPE	MACH_TYPE_MCX
 #define CONFIG_BOARD_LATE_INIT
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_SYS_CACHELINE_SIZE	64
 
 #define CONFIG_EMIF4	/* The chip has EMIF4 controller */

include/configs/mx25pdk.h +0 -1

index bd7216e..ca928ab 100644
@@ -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	\

include/configs/mx31ads.h +0 -2

index c4513d2..3499adb 100644
@@ -14,8 +14,6 @@
  /* High Level Configuration Options */
 #define CONFIG_MX31		1		/* This is a mx31 */
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

include/configs/mx31pdk.h +0 -2

index 72d28c9..a06a737 100644
@@ -19,8 +19,6 @@
 /* High Level Configuration Options */
 #define CONFIG_MX31			/* This is a mx31 */
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

include/configs/mx35pdk.h +0 -1

index c9983f3..ab45e00 100644
@@ -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

include/configs/mx51evk.h +0 -1

index 2203c15..3cbc53e 100644
@@ -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

include/configs/mx53ard.h +0 -2

index 0479195..b13015a 100644
@@ -23,8 +23,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)

include/configs/mx53evk.h +0 -2

index 82c8af8..f489847 100644
@@ -23,8 +23,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_OF_LIBFDT
 
 /* Size of malloc() pool */

include/configs/mx53loco.h +0 -2

index ad2629d..10a03c3 100644
@@ -22,8 +22,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(10 * 1024 * 1024)

include/configs/mx53smd.h +0 -2

index bcdb054..2600af9 100644
@@ -23,8 +23,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)

include/configs/mx6_common.h +0 -1

index ef4cb68..4ae1673 100644
@@ -45,7 +45,6 @@
 
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_SYS_GENERIC_BOARD
 
 /* ATAGs */
 #define CONFIG_CMDLINE_TAG

include/configs/mx6ul_14x14_evk.h +0 -1

index 6ae736f..42fd8c6 100644
@@ -22,7 +22,6 @@
 
 #define CONFIG_MX6
 #define CONFIG_ROM_UNIFIED_SECTIONS
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

include/configs/mxs.h +0 -5

index 9d823de..60893c8 100644
@@ -37,11 +37,6 @@
 #include <asm/arch/iomux-mx28.h>
 #endif
 
-/*
- * CPU specifics
- */
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* MXS uses FDT */
 #define CONFIG_OF_LIBFDT

include/configs/nas220.h +0 -1

index ebf6750..e5ff7e1 100644
@@ -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 */

include/configs/nokia_rx51.h +0 -1

index 915df52..52369be 100644
@@ -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

include/configs/omap3_zoom1.h +0 -1

index cef2243..a59fd42 100644
@@ -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 */

include/configs/omapl138_lcdk.h +0 -1

index d9a3aa4..80d57f4 100644
@@ -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 */

include/configs/pm9261.h +0 -2

index f4f96a7..a8e4b50 100644
@@ -20,8 +20,6 @@
 #include <asm/hardware.h>
 /* ARM asynchronous clock */
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_DISPLAY_BOARDINFO
 
 #define MASTER_PLL_DIV		15

include/configs/pm9263.h +0 -2

index bd43577..10aa4a9 100644
@@ -18,8 +18,6 @@
  */
 #include <asm/hardware.h>
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* ARM asynchronous clock */
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

include/configs/pm9g45.h +0 -2

index 09f0744..d4cd90e 100644
@@ -22,8 +22,6 @@
  */
 #include <asm/hardware.h>
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_PM9G45		1	/* It's an Ronetix PM9G45 */
 #define CONFIG_SYS_AT91_CPU_NAME	"AT91SAM9G45"

include/configs/pogo_e02.h +0 -2

index 8cf3ad8..ef13af9 100644
@@ -13,8 +13,6 @@
 #ifndef _CONFIG_POGO_E02_H
 #define _CONFIG_POGO_E02_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Machine type definition and ID
  */

include/configs/rcar-gen2-common.h +0 -1

index 7dd9260..f0a3a18 100644
@@ -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

include/configs/rpi-common.h +0 -1

index 8830a10..4070726 100644
@@ -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

include/configs/s5p_goni.h +0 -2

index aff264b..0805e1a 100644
@@ -278,6 +278,4 @@
 
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #endif	/* __CONFIG_H */

include/configs/sheevaplug.h +0 -2

index 272e3ca..961e822 100644
@@ -10,8 +10,6 @@
 #ifndef _CONFIG_SHEEVAPLUG_H
 #define _CONFIG_SHEEVAPLUG_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Version number information
  */

include/configs/siemens-am33x-common.h +0 -2

index bcc8dcb..96761f4 100644
@@ -45,8 +45,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_TIME
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_ROOTPATH		"/opt/eldk"

include/configs/smartweb.h +0 -1

index d696d4b..a702523 100644
@@ -50,7 +50,6 @@
 
 /* setting board specific options */
 # define CONFIG_MACH_TYPE		MACH_TYPE_SMARTWEB
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE

include/configs/smdk2410.h +0 -2

index a6bfa76..0df2b65 100644
@@ -23,8 +23,6 @@
 
 #define CONFIG_SYS_TEXT_BASE	0x0
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
 
 /* input clock of PLL (the SMDK2410 has 12MHz input clock) */

include/configs/smdkc100.h +0 -2

index 4ec9c65..f3a5390 100644
@@ -215,6 +215,4 @@
 
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #endif	/* __CONFIG_H */

include/configs/snapper9260.h +0 -1

index 7758b0f..afcd16a 100644
@@ -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

include/configs/sniper.h +0 -1

index a0ee5bd..f168e8f 100644
@@ -34,7 +34,6 @@
  * Board
  */
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_MISC_INIT_R
 
 /*

include/configs/socfpga_common.h +0 -2

index 5ca45a9..427bb0a 100644
@@ -6,8 +6,6 @@
 #ifndef __CONFIG_SOCFPGA_CYCLONE5_COMMON_H__
 #define __CONFIG_SOCFPGA_CYCLONE5_COMMON_H__
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Virtual target or real hardware */
 #undef CONFIG_SOCFPGA_VIRTUAL_TARGET

include/configs/spear-common.h +0 -2

index fb1bf66..d70d62b 100644
@@ -11,8 +11,6 @@
  * Common configurations used for both spear3xx as well as spear6xx
  */
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* U-boot Load Address */
 #define CONFIG_SYS_TEXT_BASE			0x00700000

include/configs/stm32f429-discovery.h +0 -1

index 19d9cf9..1796995 100644
@@ -10,7 +10,6 @@
 
 #define CONFIG_STM32F4
 #define CONFIG_STM32F4DISCOVERY
-#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_OF_LIBFDT

include/configs/stv0991.h +0 -1

index b1b6919..1526d13 100644
@@ -13,7 +13,6 @@
 
 #define CONFIG_SYS_CORTEX_R4
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_SYS_NO_FLASH
 
 /* ram memory-related information */

include/configs/sunxi-common.h +0 -1

index 1abf73c..a91cfb9 100644
@@ -167,7 +167,6 @@
 #define CONFIG_SYS_CBSIZE	1024	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE	1024	/* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16	/* max number of command args */
-#define CONFIG_SYS_GENERIC_BOARD
 
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE

include/configs/tam3517-common.h +0 -1

index 801220a..f993433 100644
@@ -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

include/configs/tao3530.h +0 -1

index 408895f..4de00f6 100644
@@ -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

include/configs/taurus.h +0 -1

index 2c9f5da..025307a 100644
@@ -21,7 +21,6 @@
  */
 #include <asm/hardware.h>
 
-#define CONFIG_SYS_GENERIC_BOARD
 
 #if defined(CONFIG_SPL_BUILD)
 #define CONFIG_SYS_THUMB_BUILD

include/configs/tegra-common.h +0 -1

index 6fe5f2c..7f4b8ef 100644
@@ -144,7 +144,6 @@
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT

include/configs/ti_armv7_common.h +0 -1

index 18fca02..cc74d2e 100644
@@ -18,7 +18,6 @@
 #define __CONFIG_TI_ARMV7_COMMON_H__
 
 /* Common define for many platforms. */
-#define CONFIG_SYS_GENERIC_BOARD
 
 /*
  * We typically do not contain NOR flash.  In the cases where we do, we

include/configs/tricorder.h +0 -2

index f04b572..87fcd61 100644
@@ -38,8 +38,6 @@
 #include <asm/arch/cpu.h>		/* get chip and board defs */
 #include <asm/arch/omap.h>
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Display CPU and Board information */
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

include/configs/uniphier.h +0 -2

index 908be26..770244a 100644
@@ -145,8 +145,6 @@
 /* serial console configuration */
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #if !defined(CONFIG_SPL_BUILD)
 #define CONFIG_USE_ARCH_MEMSET
 #define CONFIG_USE_ARCH_MEMCPY

include/configs/usb_a9263.h +0 -1

index 10a1664..54daede 100644
@@ -34,7 +34,6 @@
 #define CONFIG_DISPLAY_CPUINFO
 
 #define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_SYS_TEXT_BASE		0x23f00000
 
 /*

include/configs/usbarmory.h +0 -1

index 4a7702c..219f0da 100644
@@ -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>

include/configs/vexpress_aemv8a.h +0 -3

index 6107c64..704f591 100644
@@ -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

include/configs/vexpress_common.h +0 -1

index 98f6ae9..cec510c 100644
@@ -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)

include/configs/vf610twr.h +0 -1

index c5131af..f32e4e3 100644
@@ -13,7 +13,6 @@
 
 #define CONFIG_VF610
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

include/configs/woodburn_common.h +0 -1

index 5d9f529..d44c954 100644
@@ -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

include/configs/work_92105.h +0 -1

index 15ee284..f77d065 100644
@@ -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		\

include/configs/x600.h +0 -1

index edb16b1..08fc710 100644
@@ -16,7 +16,6 @@
  */
 #define CONFIG_SPEAR600				/* SPEAr600 SoC */
 #define CONFIG_X600				/* on X600 board */
-#define CONFIG_SYS_GENERIC_BOARD
 
 #include <asm/arch/hardware.h>

include/configs/xilinx_zynqmp.h +0 -2

index 01b7993..5c569e5 100644
@@ -17,8 +17,6 @@
 
 #define CONFIG_SYS_NO_FLASH
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Generic Interrupt Controller Definitions */
 #define CONFIG_GICV2
 #define GICD_BASE	0xF9010000

include/configs/zmx25.h +0 -2

index 81b9ce4..3d8566c 100644
@@ -15,8 +15,6 @@
 #define CONFIG_MX25
 #define CONFIG_SYS_TEXT_BASE		0xA0000000
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_SYS_TIMER_RATE		32768
 #define CONFIG_SYS_TIMER_COUNTER	\
 	(&((struct gpt_regs *)IMX_GPT1_BASE)->counter)

include/configs/zynq-common.h +0 -2

index cc72c86..615898d 100644
@@ -376,6 +376,4 @@
 
 #define CONFIG_SYS_UBOOT_START	CONFIG_SYS_TEXT_BASE
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #endif /* __CONFIG_ZYNQ_COMMON_H */

Signature · 1 line

2.5.0.276.gf5e568e

Masahiro Yamada

2015-08-20 01:36 UTC #2 lore raw

PATCH v2 1/3 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

2015-08-19 13:35 GMT+09:00 Simon Glass <[email protected]>:

Quoted 4 lines

All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.
Signed-off-by Simon Glass <[email protected]>

With this, we will lose reason to drop old unmaintained boards that might be an obstacle for our further cleanup. (for example, per-board config.mk, per-board linker script)

The next chance to drop unmaintained boards is the end of 2016, where non-DM boards will be dropped.
At that point, I guess most of maintainers would choose removal rather than conversion as the DM conversion requires much work.

BTW, we will never notice run-time breakages because such unmaintaned boards are never run.

I am not opposed to this patch, but bofore it is applied, I'd like to drop one more board.

http://patchwork.ozlabs.org/patch/508887/
This is now applicable because Heiko, the maintainer of this board, gave acked-by.

Signature · 2 lines

Best Regards
Masahiro Yamada

Simon Glass

author

2015-08-21 17:53 UTC #3 lore raw

PATCH v2 1/3 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

Hi Masahiro,

Quoted 19 lines · Masahiro Yamada

2015-08-19 13:35 GMT+09:00 Simon Glass <[email protected]>:
Quoted 4 lines
All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.
Signed-off-by Simon Glass <[email protected]>
With this, we will lose reason to drop old unmaintained boards that might be an obstacle for our further cleanup. (for example, per-board config.mk, per-board linker script)
The next chance to drop unmaintained boards is the end of 2016, where non-DM boards will be dropped.
At that point, I guess most of maintainers would choose removal rather than conversion as the DM conversion requires much work.
BTW, we will never notice run-time breakages because such unmaintaned boards are never run.

Quoted 6 lines

I am not opposed to this patch, but bofore it is applied, I'd like to drop one more board.
http://patchwork.ozlabs.org/patch/508887/
This is now applicable because Heiko, the maintainer of this board, gave acked-by.

Yes I agree, this is a drawback. My objective is to get rid of arch/arm/lib/board.c. Are there any other pending patches for ARM board removal, or are you planning to send some?

Also, I believe that PowerPC will be fully converted once your latest series is applied (although I see a lot of boards converted at the last moment). So can we remove arch/powerpc/lib/board.c, etc.? We should try to get that done during this release too I think. I'm happy to do a patch.

Regards,
Simon

Masahiro Yamada

2015-08-21 20:44 UTC #4 lore raw

PATCH v2 1/3 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

Hi Simon,

2015-08-22 2:53 GMT+09:00 Simon Glass <[email protected]>:

Quoted 26 lines

Hi Masahiro,
Quoted 22 lines · Masahiro Yamada
2015-08-19 13:35 GMT+09:00 Simon Glass <[email protected]>:
Quoted 4 lines
All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.
Signed-off-by Simon Glass <[email protected]>
With this, we will lose reason to drop old unmaintained boards that might be an obstacle for our further cleanup. (for example, per-board config.mk, per-board linker script)
The next chance to drop unmaintained boards is the end of 2016, where non-DM boards will be dropped.
At that point, I guess most of maintainers would choose removal rather than conversion as the DM conversion requires much work.
BTW, we will never notice run-time breakages because such unmaintaned boards are never run.
I am not opposed to this patch, but bofore it is applied, I'd like to drop one more board.

Quoted 7 lines

Quoted 3 lines
http://patchwork.ozlabs.org/patch/508887/
This is now applicable because Heiko, the maintainer of this board, gave acked-by.
Yes I agree, this is a drawback. My objective is to get rid of arch/arm/lib/board.c. Are there any other pending patches for ARM board removal, or are you planning to send some?

No, cam_enc_4xx is the last one I wanted to remove (and Tom picked up the removal patch).

So, I am satisfied.

Quoted 5 lines

Also, I believe that PowerPC will be fully converted once your latest series is applied (although I see a lot of boards converted at the last moment). So can we remove arch/powerpc/lib/board.c, etc.? We should try to get that done during this release too I think. I'm happy to do a patch.

Yes, I think arch/powerpc/lib/board.c should be deleted after my series is applied.

Signature · 2 lines

Best Regards
Masahiro Yamada

Masahiro Yamada

2015-08-25 06:46 UTC #5 lore raw

PATCH v2 1/3 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

2015-08-22 5:44 GMT+09:00 Masahiro Yamada <[email protected]>:

Quoted 13 lines

Hi Simon,
2015-08-22 2:53 GMT+09:00 Simon Glass <[email protected]>:
Quoted 9 lines
Hi Masahiro,
Quoted 5 lines · Masahiro Yamada
2015-08-19 13:35 GMT+09:00 Simon Glass <[email protected]>:
Quoted 4 lines
All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.
Signed-off-by Simon Glass <[email protected]>

Can you record which boards have been forcibly converted in the git-log?

If we find a board difficult to keep in the future and it matches the list of forcibly converted boards, we can excuse for removing it.

Signature · 2 lines

Best Regards
Masahiro Yamada

Christian Riesch

2015-08-25 07:44 UTC #6 lore raw

PATCH v2 1/3 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

In reply to Simon Glass

Hi Simon,

Quoted 2 lines · Simon Glass

All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.

Why not just remove these apparently unmaintained boards, as announced in [1]?

Regards, Christian

[1] http://lists.denx.de/pipermail/u-boot/2015-January/201032.html

Simon Glass

author

2015-08-26 02:26 UTC #7 lore raw

PATCH v2 1/3 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

Hi,

Quoted 7 lines · Christian Riesch

Hi Simon,
Quoted 2 lines · Simon Glass
All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.
Why not just remove these apparently unmaintained boards, as announced in [1]?

Yes having thought about it more that is my preference.

Masahiro what do you think? I would like to drop this patch and go with your plan.

Quoted 4 lines

Regards, Christian
[1] http://lists.denx.de/pipermail/u-boot/2015-January/201032.html

Regards,
Simon

Igor Grinberg

2015-08-26 07:40 UTC #8 lore raw

PATCH v2 1/3 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

In reply to Simon Glass

Quoted 4 lines · Simon Glass

All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.
Signed-off-by Simon Glass <[email protected]>

For the compulab part:

Acked-by Igor Grinberg <[email protected]>

Signature · 2 lines

Regards,
Igor.

Paul Kocialkowski

2015-08-26 10:05 UTC #9 lore raw

PATCH v2 1/3 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

Le mercredi 26 ao?t 2015 ? 10:40 +0300, Igor Grinberg a ?crit :

Quoted 9 lines · Simon Glass

Quoted 4 lines
All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.
Signed-off-by Simon Glass <[email protected]>
For the compulab part:
Acked-by Igor Grinberg <[email protected]>

Looks like this is missing the sniper board, that was added recently. When you update this patch to also include sniper, this is:

Acked-by Paul Kocialkowski <[email protected]>

Signature · 16 lines

Paul Kocialkowski, Replicant developer

Replicant is a fully free Android distribution running on several
devices, a free software mobile operating system putting the emphasis on
freedom and privacy/security.

Website: http://www.replicant.us/
Blog: http://blog.replicant.us/
Wiki/tracker/forums: http://redmine.replicant.us/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150826/de5e1f57/attachment.sig>

Evgeni Dobrev

2015-08-26 10:18 UTC #10 lore raw

PATCH v2 1/3 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

In reply to Igor Grinberg

Quoted 5 lines · Simon Glass

All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.
Signed-off-by Simon Glass <[email protected]>

For the nas220 board:

Acked-by Evgeni Dobrev <[email protected]>

Thanks,

evgeni

Stefano Babic

2015-08-26 08:02 UTC #11 lore raw

PATCH v2 1/3 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

In reply to Simon Glass

Quoted 6 lines · Simon Glass

All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.
Signed-off-by Simon Glass <[email protected]>
---

For boards I am maintainer (flea3, mx51evk, mcx, woodburn):

Acked-by Stefano Babic <[email protected]>

Thanks for that !

Regards,
Stefano

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Hannes Schmelzer

Acked-by Tested-by on v2 1/3

2015-08-27 08:25 UTC #12 lore raw

[U-Boot] Antwort: [PATCH v2 1/3] arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards

In reply to Simon Glass

Hi Simon,

okay for B&R boards.

best regards,
Hannes

Acked-by Hannes Schmelzer <[email protected]>

Tested-by Hannes Schmelzer <[email protected]>

Quoted 11 lines

All boards should be converted to generic board by now. Change the rest over. If this causes run-time breakages then we can remove those boards.
Signed-off-by Simon Glass <[email protected]>
---
Changes in v2:
- Drop changes to digsy_mtc and xilinx-ppc
- Add changes to smartweb and sniper
 arch/Kconfig                               | 1 +

....

Quoted 1 line

 include/configs/bur_am335x_common.h        | 2 --

....

Quoted 1 line

 109 files changed, 1 insertion(+), 173 deletions(-)

Simon Glass

author

2015-08-19 04:35 UTC #13 lore raw

PATCH v2 2/3 arm: Drop old non-generic-board code

In reply to Simon Glass

This code is no-longer used. Drop it.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2: None

 arch/arm/include/asm/u-boot.h |  19 --
 arch/arm/lib/Makefile         |   3 -
 arch/arm/lib/board.c          | 687 ------------------------------------------
 3 files changed, 709 deletions(-)
 delete mode 100644 arch/arm/lib/board.c

arch/arm/include/asm/u-boot.h +0 ~~-19~~

index 43cc494..ca3abd7 100644
@@ -20,27 +20,8 @@
 #ifndef _U_BOOT_H_
 #define _U_BOOT_H_	1
 
-#ifdef CONFIG_SYS_GENERIC_BOARD
 /* Use the generic board which requires a unified bd_info */
 #include <asm-generic/u-boot.h>
-#else
-
-#ifndef __ASSEMBLY__
-typedef struct bd_info {
-    ulong	        bi_arch_number;	/* unique id for this board */
-    ulong	        bi_boot_params;	/* where this board expects params */
-	unsigned long	bi_arm_freq; /* arm frequency */
-	unsigned long	bi_dsp_freq; /* dsp core frequency */
-	unsigned long	bi_ddr_freq; /* ddr frequency */
-    struct				/* RAM configuration */
-    {
-	ulong start;
-	ulong size;
-    }			bi_dram[CONFIG_NR_DRAM_BANKS];
-} bd_t;
-#endif
-
-#endif /* !CONFIG_SYS_GENERIC_BOARD */
 
 /* For image.h:image_check_target_arch() */
 #ifndef CONFIG_ARM64

arch/arm/lib/Makefile +0 -3

index 31a5c8d..33d217b 100644
@@ -22,9 +22,6 @@ obj-y	+= relocate_64.o
 else
 obj-y	+= relocate.o
 endif
-ifndef CONFIG_SYS_GENERIC_BOARD
-obj-y	+= board.o
-endif
 
 obj-$(CONFIG_CPU_V7M) += cmd_boot.o
 obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o

arch/arm/lib/board.c deleted +0 ~~-687~~

687 lines not on this page · raw message

Signature · 1 line

2.5.0.276.gf5e568e

Andreas Bießmann

2015-08-19 07:27 UTC #14 lore raw

PATCH v2 2/3 arm: Drop old non-generic-board code

Quoted 3 lines · Simon Glass

This code is no-longer used. Drop it.
Signed-off-by Simon Glass <[email protected]>

Acked-by Andreas Bie?mann <[email protected]>

Quoted 9 lines

---

Changes in v2: None

 arch/arm/include/asm/u-boot.h |  19 --
 arch/arm/lib/Makefile         |   3 -
 arch/arm/lib/board.c          | 687 ------------------------------------------
 3 files changed, 709 deletions(-)
 delete mode 100644 arch/arm/lib/board.c

Simon Glass

author

2015-08-19 04:35 UTC #15 lore raw

PATCH v2 3/3 buildman: Improve the config comparison feature

In reply to Simon Glass

At present buildman can compare configurations between commits but the feature is less useful than it could be. There is no summary by architecture and changes are not reported on a per-board basis.

Correct these deficiencies so that it is possible to see exactly what is changing for any number of boards.

Note that 'buildman -b <branch> -C' is recommended for any build where you will be comparing configuration. Without -C the correct configuration will not be reported since changes will often not be picked up.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Add patch to improve the buildman config comparison feature

 tools/buildman/builder.py | 199 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 155 insertions(+), 44 deletions(-)

tools/buildman/builder.py +155 ~~-44~~

index c7d3c86..6ea218e 100644
@@ -103,6 +103,24 @@ CONFIG_FILENAMES = [
     'u-boot.cfg', 'u-boot-spl.cfg', 'u-boot-tpl.cfg'
 ]
 
+class Config:
+    """Holds information about configuration settings for a board."""
+    def __init__(self, target):
+        self.target = target
+        self.config = {}
+        for fname in CONFIG_FILENAMES:
+            self.config[fname] = {}
+
+    def Add(self, fname, key, value):
+        self.config[fname][key] = value
+
+    def __hash__(self):
+        val = 0
+        for fname in self.config:
+            for key, value in self.config[fname].iteritems():
+                print key, value
+                val = val ^ hash(key) & hash(value)
+        return val
 
 class Builder:
     """Class for building U-Boot for a particular commit.

@@ -659,7 +677,8 @@ class Builder:
                 List containing a summary of warning lines
                 Dict keyed by error line, containing a list of the Board
                     objects with that warning
-                Dictionary keyed by filename - e.g. '.config'. Each
+                Dictionary keyed by board.target. Each value is a dictionary:
+                    key: filename - e.g. '.config'
                     value is itself a dictionary:
                         key: config name
                         value: config value

@@ -678,8 +697,6 @@ class Builder:
         warn_lines_summary = []
         warn_lines_boards = {}
         config = {}
-        for fname in CONFIG_FILENAMES:
-            config[fname] = {}
 
         for board in boards_selected.itervalues():
             outcome = self.GetBuildOutcome(commit_upto, board.target,

@@ -709,11 +726,12 @@ class Builder:
                                     line, board)
                         last_was_warning = is_warning
                         last_func = None
+            tconfig = Config(board.target)
             for fname in CONFIG_FILENAMES:
-                config[fname] = {}
                 if outcome.config:
                     for key, value in outcome.config[fname].iteritems():
-                        config[fname][key] = value
+                        tconfig.Add(fname, key, value)
+            config[board.target] = tconfig
 
         return (board_dict, err_lines_summary, err_lines_boards,
                 warn_lines_summary, warn_lines_boards, config)

@@ -774,9 +792,12 @@ class Builder:
         self._base_warn_lines = []
         self._base_err_line_boards = {}
         self._base_warn_line_boards = {}
-        self._base_config = {}
-        for fname in CONFIG_FILENAMES:
-            self._base_config[fname] = {}
+        self._base_config = None
+        #self._base_config = {}
+        #for board in board_selected:
+            #self._base_config[board] = Config(board)
+        #for fname in CONFIG_FILENAMES:
+            #self._base_config[fname] = {}
 
     def PrintFuncSizeDetail(self, fname, old, new):
         grow, shrink, add, remove, up, down = 0, 0, 0, 0, 0, 0

@@ -1051,12 +1072,14 @@ class Builder:
             out = ''
             for key in sorted(config.keys()):
                 out += '%s=%s ' % (key, config[key])
-            return '%5s %s: %s' % (delta, name, out)
+            return '%s %s: %s' % (delta, name, out)
 
-        def _ShowConfig(name, config_plus, config_minus, config_change):
-            """Show changes in configuration
+        def _AddConfig(lines, name, config_plus, config_minus, config_change):
+            """Add changes in configuration to a list
 
             Args:
+                lines: list to add to
+                name: config file name
                 config_plus: configurations added, dictionary
                     key: config name
                     value: config value

@@ -1068,14 +1091,24 @@ class Builder:
                     value: config value
             """
             if config_plus:
-                Print(_CalcConfig('+', name, config_plus),
-                      colour=self.col.GREEN)
+                lines.append(_CalcConfig('+', name, config_plus))
             if config_minus:
-                Print(_CalcConfig('-', name, config_minus),
-                      colour=self.col.RED)
+                lines.append(_CalcConfig('-', name, config_minus))
             if config_change:
-                Print(_CalcConfig('+/-', name, config_change),
-                      colour=self.col.YELLOW)
+                lines.append(_CalcConfig('c', name, config_change))
+
+        def _OutputConfigInfo(lines):
+            for line in lines:
+                if not line:
+                    continue
+                if line[0] == '+':
+                    col = self.col.GREEN
+                elif line[0] == '-':
+                    col = self.col.RED
+                elif line[0] == 'c':
+                    col = self.col.YELLOW
+                Print('   ' + line, newline=True, colour=col)
+
 
         better = []     # List of boards fixed since last commit
         worse = []      # List of new broken boards since last commit

@@ -1137,34 +1170,112 @@ class Builder:
             self.PrintSizeSummary(board_selected, board_dict, show_detail,
                                   show_bloat)
 
-        if show_config:
-            all_config_plus = {}
-            all_config_minus = {}
-            all_config_change = {}
-            for name in CONFIG_FILENAMES:
-                if not config[name]:
+        if show_config and self._base_config:
+            summary = {}
+            arch_config_plus = {}
+            arch_config_minus = {}
+            arch_config_change = {}
+            arch_list = []
+
+            for target in board_dict:
+                if target not in board_selected:
+                    continue
+                arch = board_selected[target].arch
+                if arch not in arch_list:
+                    arch_list.append(arch)
+
+            for arch in arch_list:
+                arch_config_plus[arch] = {}
+                arch_config_minus[arch] = {}
+                arch_config_change[arch] = {}
+                for name in CONFIG_FILENAMES:
+                    arch_config_plus[arch][name] = {}
+                    arch_config_minus[arch][name] = {}
+                    arch_config_change[arch][name] = {}
+
+            for target in board_dict:
+                if target not in board_selected:
                     continue
-                config_plus = {}
-                config_minus = {}
-                config_change = {}
-                base = self._base_config[name]
-                for key, value in config[name].iteritems():
-                    if key not in base:
-                        config_plus[key] = value
-                        all_config_plus[key] = value
-                for key, value in base.iteritems():
-                    if key not in config[name]:
-                        config_minus[key] = value
-                        all_config_minus[key] = value
-                for key, value in base.iteritems():
-                    new_value = base[key]
-                    if key in config[name] and value != new_value:
-                        desc = '%s -> %s' % (value, new_value)
-                        config_change[key] = desc
-                        all_config_change[key] = desc
-                _ShowConfig(name, config_plus, config_minus, config_change)
-            _ShowConfig('all', all_config_plus, all_config_minus,
-                        all_config_change)
+
+                arch = board_selected[target].arch
+
+                all_config_plus = {}
+                all_config_minus = {}
+                all_config_change = {}
+                tbase = self._base_config[target]
+                tconfig = config[target]
+                lines = []
+                for name in CONFIG_FILENAMES:
+                    if not tconfig.config[name]:
+                        continue
+                    config_plus = {}
+                    config_minus = {}
+                    config_change = {}
+                    base = tbase.config[name]
+                    for key, value in tconfig.config[name].iteritems():
+                        if key not in base:
+                            config_plus[key] = value
+                            all_config_plus[key] = value
+                    for key, value in base.iteritems():
+                        if key not in tconfig.config[name]:
+                            config_minus[key] = value
+                            all_config_minus[key] = value
+                    for key, value in base.iteritems():
+                        new_value = tconfig.config.get(key)
+                        if new_value and value != new_value:
+                            desc = '%s -> %s' % (value, new_value)
+                            config_change[key] = desc
+                            all_config_change[key] = desc
+
+                    arch_config_plus[arch][name].update(config_plus)
+                    arch_config_minus[arch][name].update(config_minus)
+                    arch_config_change[arch][name].update(config_change)
+
+                    _AddConfig(lines, name, config_plus, config_minus,
+                               config_change)
+                _AddConfig(lines, 'all', all_config_plus, all_config_minus,
+                           all_config_change)
+                summary[target] = '\n'.join(lines)
+
+            lines_by_target = {}
+            for target, lines in summary.iteritems():
+                if lines in lines_by_target:
+                    lines_by_target[lines].append(target)
+                else:
+                    lines_by_target[lines] = [target]
+
+            for arch in arch_list:
+                lines = []
+                all_plus = {}
+                all_minus = {}
+                all_change = {}
+                for name in CONFIG_FILENAMES:
+                    all_plus.update(arch_config_plus[arch][name])
+                    all_minus.update(arch_config_minus[arch][name])
+                    all_change.update(arch_config_change[arch][name])
+                    _AddConfig(lines, name, arch_config_plus[arch][name],
+                               arch_config_minus[arch][name],
+                               arch_config_change[arch][name])
+                _AddConfig(lines, 'all', all_plus, all_minus, all_change)
+                #arch_summary[target] = '\n'.join(lines)
+                if lines:
+                    Print('%s:' % arch)
+                    _OutputConfigInfo(lines)
+
+            #lines_by_arch = []
+            #for arch, lines in arch_summary.iteritems():
+                #if lines in lines_by_arch:
+                    #lines_by_arch[lines].append(arch)
+                #else:
+                    #lines_by_arch[lines] = [arch]
+            #print arch, lines
+
+            for lines, targets in lines_by_target.iteritems():
+                if not lines:
+                    continue
+                Print('%s :' % ' '.join(sorted(targets)))
+                _OutputConfigInfo(lines.split('\n'))
+
 
         # Save our updated information for the next call to this function
         self._base_board_dict = board_dict

Signature · 1 line

2.5.0.276.gf5e568e

Joe Hershberger

2015-08-21 21:14 UTC #16 lore raw

PATCH v2 3/3 buildman: Improve the config comparison feature

Hi Simon,

Quoted 4 lines · Simon Glass

At present buildman can compare configurations between commits but the feature is less useful than it could be. There is no summary by architecture and changes are not reported on a per-board basis.

Quoted 8 lines

Correct these deficiencies so that it is possible to see exactly what is changing for any number of boards.
Note that 'buildman -b <branch> -C' is recommended for any build where you will be comparing configuration. Without -C the correct configuration will not be reported since changes will often not be picked up.
Signed-off-by Simon Glass <[email protected]>

This is awesome! Thanks for doing this!

I'm a bit surprised there is commented-out code at the bottom of this patch, but it's just a tool, so...

Reviewed-by Joe Hershberger <[email protected]>

Thanks,
-Joe

Simon Glass

author

2015-08-23 21:21 UTC #17 lore raw

PATCH v2 3/3 buildman: Improve the config comparison feature

Hi Joe,

Quoted 14 lines · Joe Hershberger

Hi Simon,
Quoted 11 lines · Simon Glass
At present buildman can compare configurations between commits but the feature is less useful than it could be. There is no summary by architecture and changes are not reported on a per-board basis.
Correct these deficiencies so that it is possible to see exactly what is changing for any number of boards.
Note that 'buildman -b <branch> -C' is recommended for any build where you will be comparing configuration. Without -C the correct configuration will not be reported since changes will often not be picked up.

Quoted 6 lines

Quoted 1 line
Signed-off-by Simon Glass <[email protected]>
This is awesome! Thanks for doing this!
I'm a bit surprised there is commented-out code at the bottom of this patch, but it's just a tool, so...

Er, yes I should fix that. I doubt anyone other than me will want to debug this.

Quoted 5 lines

Reviewed-by Joe Hershberger <[email protected]>
Thanks,
-Joe

Regards,
Simon