arm: Clean up MACH_TYPE_xxx usage after re-sync of mach-types

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@konsulko.com>

42 files changed, 9 insertions, 100 deletions

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 38e3b1557f..d8e6ba3e4f 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 16fb1ae8aa..7bf1f3bf59 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 3252aea114..e8729b93bc 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 38c9480dbe..65c4470dc2 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 b6feb290ec..e134f23ec9 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 528ed6f6bb..0fe47ec4ab 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 dab4ec2aac..e990dedc9f 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 8d5f26a139..2898f47e83 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 a0f04f9ce3..1fa445a94c 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 2f3a20e9b8..9c7afa5005 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 1b61afd324..1f06e5832f 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 99c0a84e4d..da77c451b0 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 252e5f5d1e..003cf0e1f3 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 c0c8a41ee7..4bb81e5d9c 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 c7b0a389c9..03cc74c596 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 daa6fae0eb..03fa0a328f 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 846739a6c5..aee9fea9da 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 96a2a80aca..fa2fcb1ec7 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 7f84f7f6f4..5639a45b37 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 18b5488392..e22cf09c44 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 b8698de9c2..56d3f0260a 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 1d9224c21c..61e658c66a 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 51825f2a2c..e39fbbae37 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 c31b464496..0928f76990 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 5356e4c43a..af8bf3ad8e 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 2420612800..3172c0e725 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 e54982af2e..3e7e5a3997 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 6ec83dad2d..96bf833f94 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 b19349aeb3..9ce976ce43 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 6034baa634..9552dd1bcb 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 c7bb6c202b..79b35d708e 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 6c790fb920..ffea8c667b 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 7cf735005d..3ec8ee102b 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 fb1339c02d..e06caf617e 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 d797a2ce4d..4776e97ed6 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 36de45453f..51021e0e18 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 b79ba49982..c37f9131b9 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 515a28410a..d93f9f350b 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 a771ddb27c..f027940c3d 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 fd117b8260..30ad241f7f 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 d337979f7c..7e9757a480 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 6b7af823e4..35ccd385d8 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 */