diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-25 20:42:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-28 14:04:26 -0500 |
| commit | cd7b634413ea25838185db2faffc313d4d571fa9 (patch) | |
| tree | a3b69e1416aa130eb27c5a5a58fb95c123906ab3 /include | |
| parent | 4247fd69468e51af89083758d170a43608c5a4c5 (diff) | |
| download | u-boot-cd7b634413ea25838185db2faffc313d4d571fa9.tar.gz u-boot-cd7b634413ea25838185db2faffc313d4d571fa9.tar.xz u-boot-cd7b634413ea25838185db2faffc313d4d571fa9.zip | |
arm: Note vendor-required status of certain MACH_TYPE values
In the cases of some boards, a MACH_TYPE number is used which is either
not registered upstream or worse (for functionality) is re-using the
number of a different (or reference) platform instead. Make sure we
have a comment in these cases.
Cc: Albert ARIBAUD <albert.aribaud@3adev.fr>
Cc: Walter Schweizer <swwa@users.sourceforge.net>
Cc: Stefan Roese <sr@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ds109.h | 15 | ||||
| -rw-r--r-- | include/configs/exynos5420-common.h | 4 | ||||
| -rw-r--r-- | include/configs/omap3_cairo.h | 5 | ||||
| -rw-r--r-- | include/configs/titanium.h | 4 | ||||
| -rw-r--r-- | include/configs/udoo.h | 4 | ||||
| -rw-r--r-- | include/configs/work_92105.h | 3 |
6 files changed, 11 insertions, 24 deletions
diff --git a/include/configs/ds109.h b/include/configs/ds109.h index 222a510034..4c874367fd 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -12,24 +12,13 @@ #ifndef _CONFIG_DS109_H #define _CONFIG_DS109_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_SYNOLOGY -#error "MACH_TYPE_SYNOLOGY has been defined properly, please remove this." -#else -#define MACH_TYPE_SYNOLOGY 527 -#endif +/* Provide the MACH_TYPE value that the vendor kernel requires. */ +#define CONFIG_MACH_TYPE 527 /* * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_MACH_TYPE MACH_TYPE_SYNOLOGY /* * Commands configuration diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index 16153eb595..79e6d13491 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -15,8 +15,8 @@ #define CONFIG_EXYNOS5_DT -#define MACH_TYPE_SMDK5420 8002 -#define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420 +/* Provide the MACH_TYPE value that the vendor kernel requires. */ +#define CONFIG_MACH_TYPE 8002 #define CONFIG_VAR_SIZE_SPL diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 09f4ec0b74..b5d2b007e8 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -228,9 +228,8 @@ #define CONFIG_SERIAL2 #endif -/* Provide MACH_TYPE for compatibility with non-DT kernels */ -#define MACH_TYPE_OMAP3_CAIRO 3063 -#define CONFIG_MACH_TYPE MACH_TYPE_OMAP3_CAIRO +/* Provide the MACH_TYPE value the vendor kernel requires */ +#define CONFIG_MACH_TYPE 3063 /*----------------------------------------------------------------------- * FLASH and environment organization diff --git a/include/configs/titanium.h b/include/configs/titanium.h index a53969f74f..4a12245810 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -17,8 +17,8 @@ #define CONFIG_MX6Q -#define MACH_TYPE_TITANIUM 3769 -#define CONFIG_MACH_TYPE MACH_TYPE_TITANIUM +/* Provide the MACH_TYPE value that the vendor kernel requires. */ +#define CONFIG_MACH_TYPE 3769 /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 961062178d..90b682e100 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -13,8 +13,8 @@ #include "imx6_spl.h" -#define MACH_TYPE_UDOO 4800 -#define CONFIG_MACH_TYPE MACH_TYPE_UDOO +/* Provide the MACH_TYPE value that the vendor kernel requires. */ +#define CONFIG_MACH_TYPE 4800 /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M) diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 4ce8b09172..dd02142e32 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -18,8 +18,7 @@ * Define work_92105 machine type by hand -- done only for compatibility * with original board code */ -#define MACH_TYPE_WORK_92105 736 -#define CONFIG_MACH_TYPE MACH_TYPE_WORK_92105 +#define CONFIG_MACH_TYPE 736 #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF |