A few boards were defining a MACH_TYPE_xxx name and value until it had been synced in officially. These values now are here so remove the config header defines.
Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/am335x_igep0033.h | 1 - include/configs/apx4devkit.h | 1 - include/configs/dalmore.h | 2 -- include/configs/draco.h | 1 - include/configs/m28evk.h | 1 - include/configs/pcm051.h | 1 - include/configs/pepper.h | 1 - include/configs/pxm2.h | 1 - include/configs/rut.h | 1 - include/configs/sc_sps_1.h | 1 - include/configs/wandboard.h | 3 +-- 11 files changed, 1 insertion(+), 13 deletions(-)
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/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/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/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/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/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/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)