From 70b26cd057f42c7126088b49d4285955c8a00eae Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Tue, 10 Jan 2017 17:22:07 -0500
Subject: [PATCH] arm: Remove unregister MACH_TYPE_xxx uses
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 -----
.../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 1f4fb92494..ad8245aaaa 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 28e61116a3..0227d703e3 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 b0d440d728..6493122280 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 3ce1992c1d..4a34c1a60c 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 66804d75bd..30e4c7d4de 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 32ba9c6225..8a4a392753 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 b5d5ba9bdf..d84ec5747b 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 7e3966f478..96d3a0d5cc 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 e7263964a8..e141dfb99d 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 633941b7dd..0ea6fcb82c 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -16,11 +16,6 @@
#define CONFIG_KW88F6281 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
-/*
- * Machine type
- */
-#define CONFIG_MACH_TYPE MACH_TYPE_ICONNECT
-
/*
* Compression configuration
*/
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 45d88247af..ce539a008c 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 df5fe2163f..fd35f71f91 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 5e9da85acf..a300f38857 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 a451acf1f4..261daef9aa 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 1150adfe7d..615acfe7e3 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
diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index 19b57fd223..30a48e83ca 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 7038e6b22c..e3e19dcbe1 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
*/
--
2.39.5