diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index c8c4ad2a9822683a533df5bf46b86c71557f01ad..16040e19d79f813a1f8b3f6720726de00c8cf0ec 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 d9a06273a3191f66daf3ab06df7be954efb1d827..c5349b900e8c0851753443a8d2dc3fe2bb640a81 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 3786842d365d70b2bbeb311ecf9295a3e71f468d..c9cd62e3344e1f6d2227fbe6a83235ed54a6bcf2 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 38e3b1557f1d1b2657acbc895a9214fb4baea285..d8e6ba3e4f2f730279f9aa634a5ebae2e10fba17 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 16fb1ae8aa6a98147abd33b4e8f8fe2e1f031f8e..7bf1f3bf598473a053fcd3cd1b59874a0251260c 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 3252aea114d644eac69ab1635f82c3af60c6090b..e8729b93bcd843c3b366f5ac675a2c9015f0ab06 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 38c9480dbe17e16c998c4375fd2ba2794dd9cdec..65c4470dc2eccb59f2ab03fbda70572ec31e6097 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 b6feb290ecc30959adfe096b24ba120bba63c681..e134f23ec90b836c634bfc7ac3c806d802d62986 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 528ed6f6bbd0dcb4107d1c8eb869b1cd16e0707d..0fe47ec4abf362ef48bf81479d54f4fb638cea9c 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 dab4ec2aacf4aebe6129dfc8b19efc6aeba648b3..e990dedc9f6f27a8a378d5e5ad5a05d74bbb5c44 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 8d5f26a139c3d4261307e7d2973a78da01529b0d..2898f47e83fbcd27edfc2b46e83f32d8aa93bbf2 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 a0f04f9ce33c49fd05610c7a16755b50c6e3e4bb..1fa445a94c85d21bef89302653aabee6cd8165ec 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 2f3a20e9b8cc3dac98d991bdfa7fb2ca275959b4..9c7afa5005eb071d6512737e1a603a291bf90af0 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 1b61afd324a7042d35c7ed9ac2153ea122329869..1f06e5832fe59e7999bc85d9061262c2bc2cd89f 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 99c0a84e4d762d49a2575adcbab7b68f12d262b6..da77c451b0aa2545a0aace925ed4ab990725d780 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 252e5f5d1e003679853ef625b5b6cd1e4ecdfa99..003cf0e1f32282aa1a18d9aa28a2760eba2c41d5 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -12,19 +12,6 @@
#ifndef _CONFIG_DREAMPLUG_H
#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)
*/
diff --git a/include/configs/duovero.h b/include/configs/duovero.h
index c0c8a41ee7f27c1a3ede9c03139a2c2fbb821fda..4bb81e5d9cb4bf9e650c927b779b0059ab2bd223 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 c7b0a389c912ff7ff3b0408939b2ca5e2d16f2dd..03cc74c596627083d8fa13462848510ed1608704 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 daa6fae0eb260f19a8756a984fb757f37e976a13..03fa0a328f8fae96303d6f28e0cb5d298b394de0 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 846739a6c5006fb6a1c65ff9219010d5e70af668..aee9fea9da0eed9f36749cdca10e038f6cd4c470 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 96a2a80aca4bd6d80e27aef933dcef9e60ab728f..fa2fcb1ec7030cc4fe4a2c27b30145db0f9f1e02 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 7f84f7f6f44b3929aded45c4529fe04299165884..5639a45b377125dcb166b6529a7f02b64b1a9635 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -15,23 +15,13 @@
#ifndef __CONFIG_GPLUGD_H
#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 18b5488392de04daf60f859fa3c370fb5f02edb9..e22cf09c44ecc60a46214d188ce184a6bbd4eed6 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 b8698de9c2bc83e9636b7cf9cf1ceceb48a97e70..56d3f0260a412867a49a4467dc6ed92e176464d8 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 1d9224c21ce929c944f7b40c8ea4f803c3ed4060..61e658c66a7dd3d397b1c9c055e514a8a41dfe82 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 51825f2a2cb15df847086590a23bf63b7767b6aa..e39fbbae378d996953b40edb974251c8ca90eaa4 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 c31b464496d5bcfcd7b1579ca98838705bbf8729..0928f7699052f396886271acab186be80eba209e 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 5356e4c43aafeea2658d6121c8b18ca94304b765..af8bf3ad8e7285693995262c3be55114a3d78eec 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 2420612800fbde9b658ed8e97dcf7e8d97d63bf1..3172c0e7251fcb8767f8f0acc1b708bc7a6c77cf 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 e54982af2e88c96733f3669c84cd6d5fb2d21e79..3e7e5a39970d7f0cfd716b4779f4e3ff487d8bb3 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 6ec83dad2decd78d54844953bffa601ed0ff4d49..96bf833f9465a17e9ff6778a40facc3c88d504ab 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 b19349aeb330830ecf8663b265b77889035d77f6..9ce976ce43a12dcbdd48290703ef7a022c3082fb 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 6034baa63410a12aba33ff6047f6d9ec578abba6..9552dd1bcbba8488ab72324bcce5f47f711fa1a8 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 c7bb6c202b3d19ee7a2b8914e08f10f1e3042715..79b35d708e1832725619a2af7700e24022dd0ef1 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 6c790fb9209d71098de5e3825e4923caa294ebc4..ffea8c667b6877177dc644223b4c50f273c94b1b 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 7cf735005da8609dbd3d9d8e39acf1bcc520103f..3ec8ee102bf09cb7cea5afba065467ba7bacf88d 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 fb1339c02de9e86757e17fa61ab21de293dc75ec..e06caf617eddb1d883fba2953740b166a24470ad 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 d797a2ce4d7b2774207fdbe5d0a1fc3bb68bfb08..4776e97ed6a89a88a93273c937b0c17fbab6def7 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 36de45453fb4324610c8f9f2417476f562ab6fbb..51021e0e18d67e6b82c1de24d90d4a8e292dfe96 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 b79ba499826f145bc32757e25127257ce9edc358..c37f9131b92c445e83b5e470f37ca82775474bc6 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 515a28410abe6e6bb20ff3674443c95014989482..d93f9f350bc2fc8fbd1afe51718e8be52049923c 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 a771ddb27c5ba7aae11532fa6117c23bc3b218d7..f027940c3d3026e3c37cfe28011566f305163019 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 fd117b8260c10cc967c809aeaded19e6090d0d88..30ad241f7ffd127bfbce4c5bb54071e7230b1667 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 d337979f7c422743470f2b21e0a2cb931c6df466..7e9757a4806fe9e3915979eddfd1b78776af1672 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 6b7af823e4564bdf32c25fd2f296776034627e54..35ccd385d810522cd54ce1d0939dba4e35bbc1e6 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 */