From cd7b634413ea25838185db2faffc313d4d571fa9 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 25 Jan 2017 20:42:38 -0500 Subject: 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 Cc: Walter Schweizer Cc: Stefan Roese Cc: Fabio Estevam Signed-off-by: Tom Rini Acked-by: Stefan Roese --- include/configs/ds109.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'include/configs/ds109.h') 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 -#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 -- cgit v1.2.3