arm: Move all boards over to generic board
Subsystems (14)
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.
Simon Glass (2):
arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards
arm: Drop old non-generic-board code
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/cm5200.h | 3 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/cm_t54.h | 3 - include/configs/colibri_pxa270.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/corvus.h | 1 - include/configs/da850evm.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/dns325.h | 1 - include/configs/dockstar.h | 2 - include/configs/dreamplug.h | 1 - include/configs/edminiv2.h | 3 - include/configs/ethernut5.h | 2 - include/configs/exynos-common.h | 2 - include/configs/flea3.h | 1 - include/configs/goflexhome.h | 2 - include/configs/gplugd.h | 5 - include/configs/guruplug.h | 2 - include/configs/h2200.h | 1 - include/configs/highbank.h | 1 - include/configs/ib62x0.h | 2 - include/configs/iconnect.h | 2 - include/configs/imx31_phycore.h | 2 - include/configs/integrator-common.h | 1 - include/configs/ipam390.h | 1 - include/configs/km/km_arm.h | 2 - include/configs/km82xx.h | 1 - include/configs/km8360.h | 1 - include/configs/kzm9g.h | 1 - include/configs/ls1021aqds.h | 2 - include/configs/ls1021atwr.h | 2 - include/configs/ls2085a_common.h | 2 - include/configs/lsxl.h | 2 - include/configs/m53evk.h | 1 - include/configs/maxbcm.h | 1 - include/configs/mcx.h | 2 - include/configs/mx25pdk.h | 1 - include/configs/mx31ads.h | 2 - include/configs/mx31pdk.h | 2 - include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53ard.h | 2 - include/configs/mx53evk.h | 2 - include/configs/mx53loco.h | 2 - include/configs/mx53smd.h | 2 - include/configs/mx6_common.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mxs.h | 5 - include/configs/nas220.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/pm9261.h | 2 - include/configs/pm9263.h | 2 - include/configs/pm9g45.h | 2 - include/configs/pogo_e02.h | 2 - include/configs/rcar-gen2-common.h | 1 - include/configs/rpi-common.h | 1 - include/configs/s5p_goni.h | 2 - include/configs/sheevaplug.h | 2 - include/configs/siemens-am33x-common.h | 2 - include/configs/smdk2410.h | 2 - include/configs/smdkc100.h | 2 - include/configs/snapper9260.h | 1 - include/configs/socfpga_common.h | 2 - include/configs/spear-common.h | 2 - include/configs/stm32f429-discovery.h | 1 - include/configs/stv0991.h | 1 - include/configs/sunxi-common.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/taurus.h | 1 - include/configs/tegra-common.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/tricorder.h | 2 - include/configs/uniphier.h | 2 - include/configs/usb_a9263.h | 1 - include/configs/usbarmory.h | 1 - include/configs/vexpress_aemv8a.h | 3 - include/configs/vexpress_common.h | 1 - include/configs/vf610twr.h | 1 - include/configs/woodburn_common.h | 1 - include/configs/work_92105.h | 1 - include/configs/x600.h | 1 - include/configs/xilinx-ppc.h | 2 - include/configs/xilinx_zynqmp.h | 2 - include/configs/zmx25.h | 2 - include/configs/zynq-common.h | 2 - 116 files changed, 1 insertion(+), 889 deletions(-) delete mode 100644 arch/arm/lib/board.c
Signature · 1 line
2.5.0.276.gf5e568e
PATCH 1/2 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.
---
arch/Kconfig | 1 + arch/arm/include/asm/arch-lpc32xx/config.h | 2 -- include/configs/VCMA9.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/apf27.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/aspenite.h | 5 ----- include/configs/at91-sama5_common.h | 2 -- include/configs/at91rm9200ek.h | 2 -- include/configs/at91sam9260ek.h | 2 -- include/configs/at91sam9261ek.h | 2 -- include/configs/at91sam9263ek.h | 2 -- include/configs/at91sam9m10g45ek.h | 2 -- include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9rlek.h | 2 -- include/configs/at91sam9x5ek.h | 2 -- include/configs/bcm28155_ap.h | 1 - include/configs/bcm_ep_board.h | 2 -- include/configs/bur_am335x_common.h | 2 -- include/configs/calimain.h | 1 - include/configs/cm5200.h | 3 --- include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/cm_t54.h | 3 --- include/configs/colibri_pxa270.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/corvus.h | 1 - include/configs/da850evm.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/dns325.h | 1 - include/configs/dockstar.h | 2 -- include/configs/dreamplug.h | 1 - include/configs/edminiv2.h | 3 --- include/configs/ethernut5.h | 2 -- include/configs/exynos-common.h | 2 -- include/configs/flea3.h | 1 - include/configs/goflexhome.h | 2 -- include/configs/gplugd.h | 5 ----- include/configs/guruplug.h | 2 -- include/configs/h2200.h | 1 - include/configs/highbank.h | 1 - include/configs/ib62x0.h | 2 -- include/configs/iconnect.h | 2 -- include/configs/imx31_phycore.h | 2 -- include/configs/integrator-common.h | 1 - include/configs/ipam390.h | 1 - include/configs/km/km_arm.h | 2 -- include/configs/km82xx.h | 1 - include/configs/km8360.h | 1 - include/configs/kzm9g.h | 1 - include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atwr.h | 2 -- include/configs/ls2085a_common.h | 2 -- include/configs/lsxl.h | 2 -- include/configs/m53evk.h | 1 - include/configs/maxbcm.h | 1 - include/configs/mcx.h | 2 -- include/configs/mx25pdk.h | 1 - include/configs/mx31ads.h | 2 -- include/configs/mx31pdk.h | 2 -- include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53ard.h | 2 -- include/configs/mx53evk.h | 2 -- include/configs/mx53loco.h | 2 -- include/configs/mx53smd.h | 2 -- include/configs/mx6_common.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mxs.h | 5 ----- include/configs/nas220.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/pm9261.h | 2 -- include/configs/pm9263.h | 2 -- include/configs/pm9g45.h | 2 -- include/configs/pogo_e02.h | 2 -- include/configs/rcar-gen2-common.h | 1 - include/configs/rpi-common.h | 1 - include/configs/s5p_goni.h | 2 -- include/configs/sheevaplug.h | 2 -- include/configs/siemens-am33x-common.h | 2 -- include/configs/smdk2410.h | 2 -- include/configs/smdkc100.h | 2 -- include/configs/snapper9260.h | 1 - include/configs/socfpga_common.h | 2 -- include/configs/spear-common.h | 2 -- include/configs/stm32f429-discovery.h | 1 - include/configs/stv0991.h | 1 - include/configs/sunxi-common.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/taurus.h | 1 - include/configs/tegra-common.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/tricorder.h | 2 -- include/configs/uniphier.h | 2 -- include/configs/usb_a9263.h | 1 - include/configs/usbarmory.h | 1 - include/configs/vexpress_aemv8a.h | 3 --- include/configs/vexpress_common.h | 1 - include/configs/vf610twr.h | 1 - include/configs/woodburn_common.h | 1 - include/configs/work_92105.h | 1 - include/configs/x600.h | 1 - include/configs/xilinx-ppc.h | 2 -- include/configs/xilinx_zynqmp.h | 2 -- include/configs/zmx25.h | 2 -- include/configs/zynq-common.h | 2 -- 113 files changed, 1 insertion(+), 180 deletions(-)
arch/Kconfig +1 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/cm5200.h +0 -3
@@ -8,11 +8,8 @@#ifndef __CONFIG_H#define __CONFIG_H - -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO -/* * High Level Configuration Options */
include/configs/cm_t35.h +0 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -17,7 +17,6 @@#define CONFIG_SYS_L2_PL310 #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_SYS_TEXT_BASE 0x04000000
include/configs/db-mv784mp-gp.h +0 -1
@@ -14,7 +14,6 @@#define CONFIG_DB_784MP_GP /* Board target name for DDR training */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_SYS_TEXT_BASE 0x04000000
include/configs/digsy_mtc.h +0 -1
@@ -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:
include/configs/dns325.h +0 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,7 +24,6 @@#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_OF_LIBFDT /* enable passing a Device Tree */ #define CONFIG_MISC_INIT_R /* call misc_init_r during start up */ -#define CONFIG_SYS_GENERIC_BOARD /* * There are various dependencies on the core module (CM) fitted
include/configs/ipam390.h +0 -1
@@ -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
@@ -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/km82xx.h +0 -1
@@ -29,7 +29,6 @@#error ("Board unsupported")#endif -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_SYS_TEXT_BASE 0xFE000000
include/configs/km8360.h +0 -1
@@ -9,7 +9,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO /* KMBEC FPGA (PRIO) */
include/configs/kzm9g.h +0 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,7 +12,6 @@*/ #define CONFIG_ARMADA_XP /* SOC Family Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_SYS_TEXT_BASE 0x04000000
include/configs/mcx.h +0 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/p1_p2_rdb_pc.h +0 -1
@@ -10,7 +10,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO #ifdef CONFIG_36BIT
include/configs/pm9261.h +0 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,7 +11,6 @@#include <asm/arch/timer.h> /* Architecture, CPU, etc.*/ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_BCM2835 #define CONFIG_ARCH_CPU_INIT #define CONFIG_SYS_DCACHE_OFF
include/configs/s5p_goni.h +0 -2
@@ -279,6 +279,4 @@#define CONFIG_OF_LIBFDT -#define CONFIG_SYS_GENERIC_BOARD -#endif /* __CONFIG_H */
include/configs/sheevaplug.h +0 -2
@@ -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
@@ -46,8 +46,6 @@#define CONFIG_CMD_CACHE #define CONFIG_CMD_TIME -#define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_ENV_VARS_UBOOT_CONFIG #ifndef CONFIG_SPL_BUILD #define CONFIG_ROOTPATH "/opt/eldk"
include/configs/smdk2410.h +0 -2
@@ -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
@@ -216,6 +216,4 @@#define CONFIG_OF_LIBFDT -#define CONFIG_SYS_GENERIC_BOARD -#endif /* __CONFIG_H */
include/configs/snapper9260.h +0 -1
@@ -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/socfpga_common.h +0 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -169,7 +169,6 @@#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE 1024/* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16/* max number of command args */ -#define CONFIG_SYS_GENERIC_BOARD /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
include/configs/tam3517-common.h +0 -1
@@ -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
@@ -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
@@ -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
@@ -148,7 +148,6 @@#define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT
include/configs/ti_armv7_common.h +0 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -122,7 +122,6 @@#define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_SYS_L2CACHE_OFF 1#define CONFIG_INITRD_TAG 1 -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_OF_LIBFDT 1/* Size of malloc() pool */
include/configs/vf610twr.h +0 -1
@@ -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
@@ -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
@@ -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
@@ -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-ppc.h +0 -2
@@ -12,8 +12,6 @@#ifndef __CONFIG_XLX_H#define __CONFIG_XLX_H -#define CONFIG_SYS_GENERIC_BOARD -/* #define DEBUG #define ET_DEBUG
include/configs/xilinx_zynqmp.h +0 -2
@@ -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
@@ -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
@@ -377,6 +377,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
PATCH 1/2 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards
Hi Simon,
2015-08-14 6:19 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]>
Did you check this commit is only touching ARM boards?
include/configs/xilinx-ppc.h line 17
Quoted 13 lines
include/configs/xilinx-ppc.h +0
-2@@ -12,8 +12,6 @@#ifndef __CONFIG_XLX_H#define __CONFIG_XLX_H -#define CONFIG_SYS_GENERIC_BOARD -/* #define DEBUG #define ET_DEBUG
This is PowerPC board.
You are disabling Generic Board for this board.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 1/2 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards
Hi Masahiro,
Quoted 4 lines · Masahiro Yamada
Hi Simon,
Quoted 9 lines
2015-08-14 6:19 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]>Did you check this commit is only touching ARM boards?
I started with this:
for s in $(for f in $(grep CONFIG_ARM configs/* | sed 's#configs/\([A-Za-z0-9]*\).*#\1#' |sort |uniq); do grep "$f" /tmp/files ; done |sed 's#^#include/configs/#'); do sed -i '/CONFIG_SYS_GENERIC_BOARD/d' $s; done
Quoted 20 lines
Quoted 7 lines
include/configs/xilinx-ppc.h +0
-0include/configs/xilinx-ppc.h line 17
Quoted 8 lines
include/configs/xilinx-ppc.h +0
-2@@ -12,8 +12,6 @@#ifndef __CONFIG_XLX_H#define __CONFIG_XLX_H -#define CONFIG_SYS_GENERIC_BOARD -/* #define DEBUG #define ET_DEBUG This is PowerPC board.
Quoted 2 lines
You are disabling Generic Board for this board.
But then I found some common files when I was fixing up build failures. It looks like I went too far. Will take another look.
Regards,
Simon
PATCH 1/2 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards
In reply to Simon GlassHi Simon,
On Thu, 13 Aug 2015 15:19:17 -0600
Simon Glass <[email protected]> wrote:
...
include/configs/digsy_mtc.h line 26
Quoted 9 lines
include/configs/digsy_mtc.h +0
-1@@ -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
digsy_mtc is a powerpc board.
Thanks,
Anatolij
PATCH 1/2 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards
In reply to Simon GlassHi Simon,
Quoted 112 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]>---
arch/Kconfig | 1 + arch/arm/include/asm/arch-lpc32xx/config.h | 2 -- include/configs/VCMA9.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/apf27.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/aspenite.h | 5 ----- include/configs/at91-sama5_common.h | 2 -- include/configs/at91rm9200ek.h | 2 -- include/configs/at91sam9260ek.h | 2 -- include/configs/at91sam9261ek.h | 2 -- include/configs/at91sam9263ek.h | 2 -- include/configs/at91sam9m10g45ek.h | 2 -- include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9rlek.h | 2 -- include/configs/at91sam9x5ek.h | 2 -- include/configs/bcm28155_ap.h | 1 - include/configs/bcm_ep_board.h | 2 -- include/configs/bur_am335x_common.h | 2 -- include/configs/calimain.h | 1 - include/configs/cm5200.h | 3 --- include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/cm_t54.h | 3 --- include/configs/colibri_pxa270.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/corvus.h | 1 - include/configs/da850evm.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/dns325.h | 1 - include/configs/dockstar.h | 2 -- include/configs/dreamplug.h | 1 - include/configs/edminiv2.h | 3 --- include/configs/ethernut5.h | 2 -- include/configs/exynos-common.h | 2 -- include/configs/flea3.h | 1 - include/configs/goflexhome.h | 2 -- include/configs/gplugd.h | 5 ----- include/configs/guruplug.h | 2 -- include/configs/h2200.h | 1 - include/configs/highbank.h | 1 - include/configs/ib62x0.h | 2 -- include/configs/iconnect.h | 2 -- include/configs/imx31_phycore.h | 2 -- include/configs/integrator-common.h | 1 - include/configs/ipam390.h | 1 - include/configs/km/km_arm.h | 2 -- include/configs/km82xx.h | 1 - include/configs/km8360.h | 1 - include/configs/kzm9g.h | 1 - include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atwr.h | 2 -- include/configs/ls2085a_common.h | 2 -- include/configs/lsxl.h | 2 -- include/configs/m53evk.h | 1 - include/configs/maxbcm.h | 1 - include/configs/mcx.h | 2 -- include/configs/mx25pdk.h | 1 - include/configs/mx31ads.h | 2 -- include/configs/mx31pdk.h | 2 -- include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53ard.h | 2 -- include/configs/mx53evk.h | 2 -- include/configs/mx53loco.h | 2 -- include/configs/mx53smd.h | 2 -- include/configs/mx6_common.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mxs.h | 5 ----- include/configs/nas220.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/pm9261.h | 2 -- include/configs/pm9263.h | 2 -- include/configs/pm9g45.h | 2 -- include/configs/pogo_e02.h | 2 -- include/configs/rcar-gen2-common.h | 1 - include/configs/rpi-common.h | 1 - include/configs/s5p_goni.h | 2 -- include/configs/sheevaplug.h | 2 -- include/configs/siemens-am33x-common.h | 2 -- include/configs/smdk2410.h | 2 -- include/configs/smdkc100.h | 2 -- include/configs/snapper9260.h | 1 - include/configs/socfpga_common.h | 2 -- include/configs/spear-common.h | 2 -- include/configs/stm32f429-discovery.h | 1 - include/configs/stv0991.h | 1 - include/configs/sunxi-common.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/taurus.h | 1 - include/configs/tegra-common.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/tricorder.h | 2 -- include/configs/uniphier.h | 2 -- include/configs/usb_a9263.h | 1 - include/configs/usbarmory.h | 1 - include/configs/vexpress_aemv8a.h | 3 --- include/configs/vexpress_common.h | 1 - include/configs/vf610twr.h | 1 -
Quoted 8 lines
include/configs/woodburn_common.h | 1 - include/configs/work_92105.h | 1 - include/configs/x600.h | 1 - include/configs/xilinx-ppc.h | 2 -- include/configs/xilinx_zynqmp.h | 2 -- include/configs/zmx25.h | 2 -- include/configs/zynq-common.h | 2 -- 113 files changed, 1 insertion(+), 180 deletions(-)
Nice statistic. :)
Thanks,
Stefan
PATCH 1/2 arm: Enable CONFIG_SYS_GENERIC_BOARD for all boards
In reply to Simon GlassQuoted 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 GplugD and Aspenite.
Regards,
Ajay Bhargav
************************************************************************************************************************************************************* eInfochips Business Disclaimer: This e-mail message and all attachments transmitted with it are intended solely for the use of the addressee and may contain legally privileged and confidential information. If the reader of this message is not the intended recipient, or an employee or agent responsible for delivering this message to the intended recipient, you are hereby notified that any dissemination, distribution, copying, or other use of this message or its attachments is strictly prohibited. If you have received this message in error, please notify the sender immediately by replying to this message and please delete it from your computer. Any views expressed in this message are those of the individual sender unless otherwise stated. Company has taken enough precautions to prevent the spread of viruses. However the company accepts no liability for any damage caused by any virus transmitted by this email. *************************************************************************************************************************************************************
PATCH 2/2 arm: Drop old non-generic-board code
In reply to Simon GlassThis code is no-longer used. Drop it.
---
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
@@ -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
@@ -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
cover arm: Move all boards over to generic board
In reply to Simon GlassQuoted 6 lines · Simon Glass
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.
Hmm. Unfortunately, the way your patches are structured, it is not easy to tell which boards may be broken.
Quoted 1 line
include/configs/socfpga_common.h | 2 -
For example this one was already converted to generic board.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
cover arm: Move all boards over to generic board
Hi Pavel,
Quoted 8 lines · Pavel Machek
Quoted 6 lines · Simon Glass
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.
Quoted 7 lines
Hmm. Unfortunately, the way your patches are structured, it is not easy to tell which boards may be broken.
Quoted 1 line
include/configs/socfpga_common.h | 2 -For example this one was already converted to generic board.
I sent a new version (with a list of affected boards), although Masahiro has suggested that perhaps we should not be force-converting boards and should just remove them instead.
The reason you see a change in socfpga_common.h is that I am removing the CONFIG_SYS_GENERIC_BOARD defines in each board header. This can now be set up as the default in Kconfig for all ARM boards.
Regards,
Simon