Before we can sync with the latest mach-types.h file from the Linux Kernel we need to remove some instances of MACH_TYPE_xxx from our sources. As these values have been removed from the canonical upstream source we should not be using them either, so drop.
Cc: Tom Warren twarren@nvidia.com Cc: Lucas Stach dev@lynxeye.de Cc: Luka Perkov luka@openwrt.org Cc: Stephen Warren swarren@wwwdotorg.org Cc: Heiko Schocher hs@denx.de Cc: Thomas Weber weber@corscience.de Cc: Lucile Quirion lucile.quirion@savoirfairelinux.com Cc: Matthias Weisser weisserm@arcor.de Cc: Suriyan Ramasami suriyan.r@gmail.com Cc: Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com Cc: Bo Shen voice.shen@atmel.com Cc: Nick Thompson nick.thompson@gefanuc.com Cc: Stefano Babic sbabic@denx.de Cc: Erik van Luijk evanluijk@interact.nl Cc: Lokesh Vutla lokeshvutla@ti.com Signed-off-by: Tom Rini trini@konsulko.com --- board/Seagate/goflexhome/goflexhome.c | 5 ----- board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 2 -- board/atmel/at91sam9x5ek/at91sam9x5ek.c | 3 --- board/davinci/da8xxevm/omapl138_lcdk.c | 3 --- board/davinci/ea20/ea20.c | 3 --- board/mini-box/picosam9g45/picosam9g45.c | 2 -- board/ti/omap5_uevm/evm.c | 1 - include/configs/cardhu.h | 2 -- include/configs/colibri_t20.h | 2 -- include/configs/iconnect.h | 5 ----- include/configs/rpi.h | 15 --------------- include/configs/smartweb.h | 1 - include/configs/tricorder.h | 1 - include/configs/ts4800.h | 2 -- include/configs/ventana.h | 2 -- include/configs/whistler.h | 2 -- include/configs/zmx25.h | 1 - 17 files changed, 52 deletions(-)
diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c index 1f4fb924942a..ad8245aaaa55 100644 --- a/board/Seagate/goflexhome/goflexhome.c +++ b/board/Seagate/goflexhome/goflexhome.c @@ -92,11 +92,6 @@ int board_early_init_f(void)
int board_init(void) { - /* - * arch number of board - */ - gd->bd->bi_arch_number = MACH_TYPE_GOFLEXHOME; - /* address of boot parameters */ gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c index 28e61116a39d..0227d703e3ad 100644 --- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c +++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c @@ -271,8 +271,6 @@ int board_early_init_f(void) DECLARE_GLOBAL_DATA_PTR; int board_init(void) { - /* board id for linux */ - gd->bd->bi_arch_number = MACH_TYPE_ARMADILLO_800EVA; /* adress of boot parameters */ gd->bd->bi_boot_params = ARMADILLO_800EVA_SDRAM_BASE + 0x100;
diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c index b0d440d728a6..649312228016 100644 --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c @@ -256,9 +256,6 @@ int board_early_init_f(void)
int board_init(void) { - /* arch number of AT91SAM9X5EK-Board */ - gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9X5EK; - /* adress of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 9c1a48331236..1b7afb32f68f 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -175,9 +175,6 @@ int board_init(void) irq_init(); #endif
- /* arch number of the board */ - gd->bd->bi_arch_number = MACH_TYPE_OMAPL138_LCDK; - /* address of boot parameters */ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR;
diff --git a/board/davinci/ea20/ea20.c b/board/davinci/ea20/ea20.c index 66804d75bd04..30e4c7d4de45 100644 --- a/board/davinci/ea20/ea20.c +++ b/board/davinci/ea20/ea20.c @@ -277,9 +277,6 @@ int overwrite_console(void)
int board_init(void) { - /* arch number of the board */ - gd->bd->bi_arch_number = MACH_TYPE_EA20; - /* address of boot parameters */ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR;
diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c index 32ba9c622590..8a4a39275386 100644 --- a/board/mini-box/picosam9g45/picosam9g45.c +++ b/board/mini-box/picosam9g45/picosam9g45.c @@ -252,8 +252,6 @@ int board_early_init_f(void)
int board_init(void) { - gd->bd->bi_arch_number = MACH_TYPE_PICOSAM9G45; - /* adress of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index b5d5ba9bdf9b..d84ec5747bed 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -138,7 +138,6 @@ int usb_gadget_handle_interrupts(int index) int board_init(void) { gpmc_init(); - gd->bd->bi_arch_number = MACH_TYPE_OMAP5_SEVM; gd->bd->bi_boot_params = (0x80000000 + 0x100); /* boot param addr */
tca642x_set_inital_state(CONFIG_SYS_I2C_TCA642X_ADDR, tca642x_init); diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index b7df2bce4c82..e426a4c71849 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -25,8 +25,6 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-#define CONFIG_MACH_TYPE MACH_TYPE_CARDHU - /* I2C */ #define CONFIG_SYS_I2C_TEGRA
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index e9db97f1adc8..7aa12629b4cc 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -21,8 +21,6 @@ #define CONFIG_TEGRA_UARTA_SDIO1 #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_T20 - /* I2C */ #define CONFIG_SYS_I2C_TEGRA
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 633941b7dd56..0ea6fcb82c09 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -17,11 +17,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
/* - * Machine type - */ -#define CONFIG_MACH_TYPE MACH_TYPE_ICONNECT - -/* * Compression configuration */ #define CONFIG_BZIP2 diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 45d88247afa0..ce539a008cce 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -24,21 +24,6 @@ (&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo) #endif
-/* - * 2835 is a SKU in a series for which the 2708 is the first or primary SoC, - * so 2708 has historically been used rather than a dedicated 2835 ID. - * - * We don't define a machine type for bcm2709/bcm2836 since the RPi Foundation - * chose to use someone else's previously registered machine ID (3139, MX51_GGC) - * rather than obtaining a valid ID:-/ - * - * For the bcm2837, hopefully a machine type is not needed, since everything - * is DT. - */ -#ifdef CONFIG_BCM2835 -#define CONFIG_MACH_TYPE MACH_TYPE_BCM2708 -#endif - /* Memory layout */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x00000000 diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index df5fe2163f05..fd35f71f913c 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_MAXARGS 32
/* setting board specific options */ -#define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB #define CONFIG_AUTO_COMPLETE #define CONFIG_ENV_OVERWRITE 1 /* Overwrite ethaddr / serial# */ #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 1c36d0751c4c..b003b1414842 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -24,7 +24,6 @@ #define CONFIG_ARM_ERRATA_430973 #define CONFIG_ARM_ERRATA_621766
-#define CONFIG_MACH_TYPE MACH_TYPE_TRICORDER /* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM * 64 bytes before this address should be set aside for u-boot.img's diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index a451acf1f4bf..261daef9aa3f 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -21,8 +21,6 @@
#define CONFIG_HW_WATCHDOG
-#define CONFIG_MACH_TYPE MACH_TYPE_TS48XX - /* text base address used when linking */ #define CONFIG_SYS_TEXT_BASE 0x90008000
diff --git a/include/configs/ventana.h b/include/configs/ventana.h index f5459a894906..b04e28ce9785 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -18,8 +18,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
-#define CONFIG_MACH_TYPE MACH_TYPE_VENTANA - /* SD/MMC */ #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC diff --git a/include/configs/whistler.h b/include/configs/whistler.h index ffd9a2c24219..c4d6e32ccc90 100644 --- a/include/configs/whistler.h +++ b/include/configs/whistler.h @@ -19,8 +19,6 @@ #define CONFIG_TEGRA_UARTA_UAA_UAB #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-#define CONFIG_MACH_TYPE MACH_TYPE_WHISTLER - /* I2C */ #define CONFIG_SYS_I2C_TEGRA
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 7038e6b22c5c..e3e19dcbe193 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_TIMER_COUNTER \ (&((struct gpt_regs *)IMX_GPT1_BASE)->counter)
-#define CONFIG_MACH_TYPE MACH_TYPE_ZMX25 /* * Environment settings */