[U-Boot] [PATCH 3/5] arm: Clean up MACH_TYPE_xxx usage after re-sync of mach-types
Tom Rini
trini at konsulko.com
Thu Jan 26 02:42:36 CET 2017
With the latest mach-types values we have many instances where we no
longer need to define a value and a few cases where the name (but not
value) have changed slightly.
Signed-off-by: Tom Rini <trini at konsulko.com>
---
board/Marvell/gplugd/gplugd.c | 2 +-
board/Seagate/nas220/nas220.c | 2 +-
board/gumstix/duovero/duovero.c | 2 +-
include/configs/am335x_evm.h | 3 +--
include/configs/am335x_igep0033.h | 1 -
include/configs/apx4devkit.h | 1 -
include/configs/baltos.h | 3 +--
include/configs/bav335x.h | 3 +--
include/configs/beaver.h | 1 -
include/configs/calimain.h | 1 -
include/configs/cm_t335.h | 1 -
include/configs/dalmore.h | 2 --
include/configs/devkit3250.h | 4 ----
include/configs/dns325.h | 1 -
include/configs/draco.h | 1 -
include/configs/dreamplug.h | 13 -------------
include/configs/duovero.h | 3 +--
include/configs/eco5pk.h | 1 -
include/configs/ethernut5.h | 1 -
include/configs/exynos5250-common.h | 2 --
include/configs/flea3.h | 5 -----
include/configs/gplugd.h | 12 +-----------
include/configs/h2200.h | 1 -
include/configs/km/km_arm.h | 4 ----
include/configs/lacie_kw.h | 2 --
include/configs/m28evk.h | 1 -
include/configs/mcx.h | 1 -
include/configs/meesc.h | 8 --------
include/configs/mt_ventoux.h | 1 -
include/configs/mx6slevk.h | 3 +--
include/configs/nas220.h | 5 ++---
include/configs/pcm051.h | 1 -
include/configs/pepper.h | 1 -
include/configs/pm9261.h | 1 -
include/configs/pm9263.h | 1 -
include/configs/pm9g45.h | 1 -
include/configs/pogo_e02.h | 1 -
include/configs/pxm2.h | 1 -
include/configs/rut.h | 1 -
include/configs/sc_sps_1.h | 1 -
include/configs/tao3530.h | 2 --
include/configs/trats.h | 4 ----
include/configs/twister.h | 1 -
include/configs/wandboard.h | 3 +--
include/configs/woodburn_common.h | 5 -----
45 files changed, 12 insertions(+), 103 deletions(-)
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index c8c4ad2a9822..16040e19d79f 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -76,7 +76,7 @@ int board_init(void)
(struct armd1apb2_registers *)ARMD1_APBC2_BASE;
/* arch number of Board */
- gd->bd->bi_arch_number = MACH_TYPE_SHEEVAD;
+ gd->bd->bi_arch_number = MACH_TYPE_GPLUGD;
/* adress of boot parameters */
gd->bd->bi_boot_params = armd1_sdram_base(0) + 0x100;
/* Assert PHY_RST# */
diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c
index d9a06273a319..c5349b900e8c 100644
--- a/board/Seagate/nas220/nas220.c
+++ b/board/Seagate/nas220/nas220.c
@@ -75,7 +75,7 @@ int board_init(void)
/*
* arch number of board
*/
- gd->bd->bi_arch_number = MACH_TYPE_NAS220;
+ gd->bd->bi_arch_number = MACH_TYPE_RD88F6192_NAS;
/* adress of boot parameters */
gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
diff --git a/board/gumstix/duovero/duovero.c b/board/gumstix/duovero/duovero.c
index 3786842d365d..c9cd62e3344e 100644
--- a/board/gumstix/duovero/duovero.c
+++ b/board/gumstix/duovero/duovero.c
@@ -47,7 +47,7 @@ int board_init(void)
{
gpmc_init();
- gd->bd->bi_arch_number = MACH_TYPE_OMAP4_DUOVERO;
+ gd->bd->bi_arch_number = MACH_TYPE_DUOVERO;
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
return 0;
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 88349921a028..5a5b0ca48fd1 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -26,8 +26,7 @@
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
-#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */
-#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM
+#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM
/* Clock Defines */
#define V_OSCK 24000000 /* Clock output from T2 */
diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h
index 16fb1ae8aa6a..7bf1f3bf5984 100644
--- a/include/configs/am335x_igep0033.h
+++ b/include/configs/am335x_igep0033.h
@@ -18,7 +18,6 @@
#include <configs/ti_am335x_common.h>
/* Mach type */
-#define MACH_TYPE_IGEP0033 4521 /* Until the next sync */
#define CONFIG_MACH_TYPE MACH_TYPE_IGEP0033
/* Clock defines */
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index babaf2671e36..48015445e3ea 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -16,7 +16,6 @@
/* System configurations */
#define CONFIG_MX28 /* i.MX28 SoC */
-#define MACH_TYPE_APX4DEVKIT 3712
#define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT
/* U-Boot Commands */
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 4e07e52a1b2a..04b57a61fc70 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -19,8 +19,7 @@
#include <linux/sizes.h>
#include <configs/ti_am335x_common.h>
-#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */
-#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM
+#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM
/* Clock Defines */
#define V_OSCK 24000000 /* Clock output from T2 */
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index f293a343e4bf..a74652d59afe 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -29,8 +29,7 @@
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
-#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */
-#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM
+#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM
/* Clock Defines */
#define V_OSCK 24000000 /* Clock output from T2 */
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 528ed6f6bbd0..0fe47ec4abf3 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -21,7 +21,6 @@
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
-#define MACH_TYPE_BEAVER 4597 /* not yet in mach-types.h */
#define CONFIG_MACH_TYPE MACH_TYPE_BEAVER
/* I2C */
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index dab4ec2aacf4..e990dedc9f6f 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -16,7 +16,6 @@
* Board
*/
#define CONFIG_DRIVER_TI_EMAC
-#define MACH_TYPE_CALIMAIN 3528
#define CONFIG_MACH_TYPE MACH_TYPE_CALIMAIN
/*
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 8d5f26a139c3..2898f47e83fb 100644
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -24,7 +24,6 @@
#undef CONFIG_MAX_RAM_BANK_SIZE
#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 512MB */
-#define MACH_TYPE_CM_T335 4586 /* Until the next sync */
#define CONFIG_MACH_TYPE MACH_TYPE_CM_T335
/* Clock Defines */
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index a0f04f9ce33c..1fa445a94c85 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -32,8 +32,6 @@
#define CONFIG_SYS_MMC_ENV_PART 2
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
-#define MACH_TYPE_DALMORE 4304 /* not yet in mach-types.h */
-
/* SPI */
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
#define CONFIG_SF_DEFAULT_SPEED 24000000
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index a71f67c352bb..05b604d36a15 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -13,10 +13,6 @@
#include <linux/sizes.h>
#include <asm/arch/cpu.h>
-/*
- * Define DevKit3250 machine type by hand until it lands in mach-types
- */
-#define MACH_TYPE_DEVKIT3250 3697
#define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250
#define CONFIG_SYS_ICACHE_OFF
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 1b61afd324a7..1f06e5832fe5 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -16,7 +16,6 @@
/*
* Machine number definition
*/
-#define MACH_TYPE_DNS325 3800
#define CONFIG_MACH_TYPE MACH_TYPE_DNS325
/*
diff --git a/include/configs/draco.h b/include/configs/draco.h
index b4ca982e1843..838fdb549124 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -14,7 +14,6 @@
#define __CONFIG_DRACO_H
#define CONFIG_SIEMENS_DRACO
-#define MACH_TYPE_DRACO 4314
#define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_DRACO
#include "siemens-am33x-common.h"
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 252e5f5d1e00..003cf0e1f322 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -13,19 +13,6 @@
#define _CONFIG_DREAMPLUG_H
/*
- * FIXME: This belongs in mach-types.h. However, we only pull mach-types
- * from Linus' kernel.org tree. This hasn't been updated primarily due to
- * the recent arch/arm reshuffling. So, in the meantime, we'll place it
- * here.
- */
-#include <asm/mach-types.h>
-#ifdef MACH_TYPE_DREAMPLUG
-#error "MACH_TYPE_DREAMPLUG has been defined properly, please remove this."
-#else
-#define MACH_TYPE_DREAMPLUG 3550
-#endif
-
-/*
* High Level Configuration Options (easy to change)
*/
#define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */
diff --git a/include/configs/duovero.h b/include/configs/duovero.h
index b5bd3ba651fd..6736628cef1a 100644
--- a/include/configs/duovero.h
+++ b/include/configs/duovero.h
@@ -16,8 +16,7 @@
* High Level Configuration Options
*/
#define CONFIG_DUOVERO
-#define MACH_TYPE_OMAP4_DUOVERO 4097 /* Until the next sync */
-#define CONFIG_MACH_TYPE MACH_TYPE_OMAP4_DUOVERO
+#define CONFIG_MACH_TYPE MACH_TYPE_DUOVERO
#include <configs/ti_omap4_common.h>
diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h
index c7b0a389c912..03cc74c59662 100644
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -28,7 +28,6 @@
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
#define CONFIG_SERIAL3
-#define MACH_TYPE_ECO5_PK 4017
#define CONFIG_MACH_TYPE MACH_TYPE_ECO5_PK
#define CONFIG_BOOTFILE "uImage"
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index c78eebfdeff1..7822c724333f 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -19,7 +19,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT
/* Set our official architecture number. */
-#define MACH_TYPE_ETHERNUT5 1971
#define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5
/* CPU information */
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index 846739a6c500..aee9fea9da0e 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -15,8 +15,6 @@
#define CONFIG_SYS_SDRAM_BASE 0x40000000
#define CONFIG_SYS_TEXT_BASE 0x43E00000
-/* MACH_TYPE_SMDK5250 macro will be removed once added to mach-types */
-#define MACH_TYPE_SMDK5250 3774
#define CONFIG_MACH_TYPE MACH_TYPE_SMDK5250
#define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 0f7b3c82dbe4..618d97e490d1 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -20,11 +20,6 @@
#define CONFIG_SYS_DCACHE_OFF
-/* Only in case the value is not present in mach-types.h */
-#ifndef MACH_TYPE_FLEA3
-#define MACH_TYPE_FLEA3 3668
-#endif
-
#define CONFIG_MACH_TYPE MACH_TYPE_FLEA3
/* Set TEXT at the beginning of the NOR flash */
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 37b0a8c50d84..9cc2e5738e83 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -16,22 +16,12 @@
#define __CONFIG_GPLUGD_H
/*
- * FIXME: fix for error caused due to recent update to mach-types.h
- */
-#include <asm/mach-types.h>
-#ifdef MACH_TYPE_SHEEVAD
-#error "MACH_TYPE_SHEEVAD has been defined properly, please remove this."
-#else
-#define MACH_TYPE_SHEEVAD 2625
-#endif
-
-/*
* High Level Configuration Options
*/
#define CONFIG_SHEEVA_88SV331xV5 1 /* CPU Core subversion */
#define CONFIG_ARMADA100 1 /* SOC Family Name */
#define CONFIG_ARMADA168 1 /* SOC Used on this Board */
-#define CONFIG_MACH_TYPE MACH_TYPE_SHEEVAD /* Machine type */
+#define CONFIG_MACH_TYPE MACH_TYPE_GPLUGD /* Machine type */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#define CONFIG_SYS_TEXT_BASE 0x00f00000
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 18b5488392de..e22cf09c44ec 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -9,7 +9,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define MACH_TYPE_H2200 341
#define CONFIG_MACH_TYPE MACH_TYPE_H2200
#define CONFIG_CPU_PXA25X 1
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index bcde7681ab33..1676feb6ccbe 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -20,10 +20,6 @@
#ifndef _CONFIG_KM_ARM_H
#define _CONFIG_KM_ARM_H
-
-/* We got removed from Linux mach-types.h */
-#define MACH_TYPE_KM_KIRKWOOD 2255
-
/*
* High Level Configuration Options (easy to change)
*/
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 4804fe0ad06d..cf191d089c24 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -15,10 +15,8 @@
#elif defined(CONFIG_NETSPACE_V2)
#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_V2
#elif defined(CONFIG_NETSPACE_LITE_V2)
-#define MACH_TYPE_NETSPACE_LITE_V2 2983 /* missing in mach-types.h */
#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_LITE_V2
#elif defined(CONFIG_NETSPACE_MINI_V2)
-#define MACH_TYPE_NETSPACE_MINI_V2 2831 /* missing in mach-types.h */
#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MINI_V2
#elif defined(CONFIG_NETSPACE_MAX_V2)
#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 25884b41466d..7d2c88cfe614 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -9,7 +9,6 @@
/* System configurations */
#define CONFIG_MX28 /* i.MX28 SoC */
-#define MACH_TYPE_M28EVK 3613
#define CONFIG_MACH_TYPE MACH_TYPE_M28EVK
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 39cb446a5997..b6c73b12f5a9 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -20,7 +20,6 @@
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
-#define MACH_TYPE_MCX 3656
#define CONFIG_MACH_TYPE MACH_TYPE_MCX
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 6b9bb6a52972..f7190feabc05 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -29,14 +29,6 @@
*/
#define CONFIG_SYS_TEXT_BASE 0x21F00000
-/*
- * since a number of boards are not being listed in linux
- * arch/arm/tools/mach-types any more, the mach-types have to be
- * defined here
- */
-#define MACH_TYPE_MEESC 2165
-#define MACH_TYPE_ETHERCAN2 2407
-
/* ARM asynchronous clock */
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* 32.768 kHz crystal */
#define CONFIG_SYS_AT91_MAIN_CLOCK 16000000/* 16.0 MHz crystal */
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 2420612800fb..3172c0e7251f 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -19,7 +19,6 @@
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10) + \
6 * 1024 * 1024)
-#define MACH_TYPE_AM3517_MT_VENTOUX 3832
#define CONFIG_MACH_TYPE MACH_TYPE_AM3517_MT_VENTOUX
#define CONFIG_BOOTFILE "uImage"
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 501d7de54489..eafe906be6fb 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -15,8 +15,7 @@
#include "imx6_spl.h"
#endif
-#define MACH_TYPE_MX6SLEVK 4307
-#define CONFIG_MACH_TYPE MACH_TYPE_MX6SLEVK
+#define CONFIG_MACH_TYPE MACH_TYPE_MX6SL_EVK
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 7cfdacd789e2..1da02f2187d3 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -13,10 +13,9 @@
#define _CONFIG_NAS220_H
/*
- * Machine type definition and ID
+ * Machine type ID
*/
-#define MACH_TYPE_NAS220 MACH_TYPE_RD88F6192_NAS
-#define CONFIG_MACH_TYPE MACH_TYPE_NAS220
+#define CONFIG_MACH_TYPE MACH_TYPE_RD88F6192_NAS
/*
* High Level Configuration Options (easy to change)
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index aff4635e90e6..abd00c483ea7 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -22,7 +22,6 @@
#include <configs/ti_am335x_common.h>
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
-#define MACH_TYPE_PCM051 4144 /* Until the next sync */
#define CONFIG_MACH_TYPE MACH_TYPE_PCM051
/* set to negative value for no autoboot */
diff --git a/include/configs/pepper.h b/include/configs/pepper.h
index 6034baa63410..9552dd1bcbba 100644
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -16,7 +16,6 @@
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
/* Mach type */
-#define MACH_TYPE_PEPPER 4207 /* Until the next sync */
#define CONFIG_MACH_TYPE MACH_TYPE_PEPPER
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index c19e7dc9f3b2..c89de05e3c13 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -31,7 +31,6 @@
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_SYS_TEXT_BASE 0
-#define MACH_TYPE_PM9261 1187
#define CONFIG_MACH_TYPE MACH_TYPE_PM9261
/* clocks */
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index eddc81a8bdd0..ada48f658f6a 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -31,7 +31,6 @@
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_SYS_TEXT_BASE 0
-#define MACH_TYPE_PM9263 1475
#define CONFIG_MACH_TYPE MACH_TYPE_PM9263
/* clocks */
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 28690c28faa2..06b5d2cd4410 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -25,7 +25,6 @@
#define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */
#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45"
-#define MACH_TYPE_PM9G45 2672
#define CONFIG_MACH_TYPE MACH_TYPE_PM9G45
/* ARM asynchronous clock */
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index fb1339c02de9..e06caf617edd 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -16,7 +16,6 @@
/*
* Machine type definition and ID
*/
-#define MACH_TYPE_POGO_E02 3542
#define CONFIG_MACH_TYPE MACH_TYPE_POGO_E02
/*
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index d797a2ce4d7b..4776e97ed6a8 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -15,7 +15,6 @@
#define __CONFIG_PXM2_H
#define CONFIG_SIEMENS_PXM2
-#define MACH_TYPE_PXM2 4309
#define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_PXM2
#include "siemens-am33x-common.h"
diff --git a/include/configs/rut.h b/include/configs/rut.h
index e5933b85ee12..1a939e9de74a 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -15,7 +15,6 @@
#define __CONFIG_RUT_H
#define CONFIG_SIEMENS_RUT
-#define MACH_TYPE_RUT 4316
#define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_RUT
#include "siemens-am33x-common.h"
diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h
index 56a23a6ef00a..c23f665e1af3 100644
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@ -11,7 +11,6 @@
/* System configuration */
#define CONFIG_MX28 /* i.MX28 SoC */
-#define MACH_TYPE_SC_SPS_1 4172
#define CONFIG_MACH_TYPE MACH_TYPE_SC_SPS_1
/* U-Boot Commands */
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 42d3060ec31c..b49804033199 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -24,8 +24,6 @@
#define CONFIG_ARM_ERRATA_430973
#define CONFIG_ARM_ERRATA_621766
-#define MACH_TYPE_OMAP3_TAO3530 2836
-
#define CONFIG_SDRC /* Has an SDRC controller */
#include <asm/arch/cpu.h> /* get chip and board defs */
diff --git a/include/configs/trats.h b/include/configs/trats.h
index a771ddb27c5b..f027940c3d30 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -40,10 +40,6 @@
#define CONFIG_SERIAL2
#define CONFIG_BAUDRATE 115200
-/* Console configuration */
-
-/* MACH_TYPE_TRATS macro will be removed once added to mach-types */
-#define MACH_TYPE_TRATS 3928
#define CONFIG_MACH_TYPE MACH_TYPE_TRATS
#define CONFIG_BOOTARGS "Please use defined boot"
diff --git a/include/configs/twister.h b/include/configs/twister.h
index fd117b8260c1..30ad241f7ffd 100644
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -14,7 +14,6 @@
#include "tam3517-common.h"
-#define MACH_TYPE_TAM3517 2818
#define CONFIG_MACH_TYPE MACH_TYPE_TAM3517
#define CONFIG_TAM3517_SW3_SETTINGS
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 125c74ed1e95..11f3f5736d20 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -14,8 +14,7 @@
#include "imx6_spl.h"
-#define MACH_TYPE_WANDBOARD 4412
-#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD
+#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 4aaeea91fe0d..4380d3882be2 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -20,11 +20,6 @@
#define CONFIG_SYS_DCACHE_OFF
-/* Only in case the value is not present in mach-types.h */
-#ifndef MACH_TYPE_FLEA3
-#define MACH_TYPE_FLEA3 3668
-#endif
-
#define CONFIG_MACH_TYPE MACH_TYPE_FLEA3
/* This is required to setup the ESDC controller */
--
1.9.1
More information about the U-Boot
mailing list