From: York Sun Date: Wed, 16 Nov 2016 19:45:18 +0000 (-0800) Subject: powerpc: MPC8544DS: Remove macro CONFIG_MPC8544DS X-Git-Tag: v2017.01-rc1~157^2~92 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ae59dded8d612c1f893d31d8741f8e7a09166e5d;p=oweals%2Fu-boot.git powerpc: MPC8544DS: Remove macro CONFIG_MPC8544DS Use CONFIG_TARGET_MPC8544DS instead. Signed-off-by: York Sun --- diff --git a/board/freescale/common/pixis.h b/board/freescale/common/pixis.h index 9328404ff2..29a2eeaf69 100644 --- a/board/freescale/common/pixis.h +++ b/board/freescale/common/pixis.h @@ -46,7 +46,7 @@ typedef struct pixis { u8 res2[4]; } __attribute__ ((packed)) pixis_t; -#elif defined(CONFIG_MPC8544DS) +#elif defined(CONFIG_TARGET_MPC8544DS) typedef struct pixis { u8 id; u8 ver; diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index fb5309a02e..6c17a3be5c 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -14,7 +14,6 @@ /* High Level Configuration Options */ #define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_E500 1 /* BOOKE e500 family */ -#define CONFIG_MPC8544DS 1 #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0xfff80000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9a1bc548dc..cfbb5d1d9d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3151,7 +3151,6 @@ CONFIG_MPC8540 CONFIG_MPC8540ADS CONFIG_MPC8541 CONFIG_MPC8541CDS -CONFIG_MPC8544DS CONFIG_MPC855 CONFIG_MPC8555 CONFIG_MPC8555CDS