diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-18 11:39:36 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:11 -0800 |
| commit | 95390360121451337738f73ed2f75f8dfbdce831 (patch) | |
| tree | d236bc32d6ab97a0f8d0e186b99d9ac2d834907d /include | |
| parent | 3b83649d53896cf115788130799d9ff585867e4a (diff) | |
powerpc: P5040: Remove macro CONFIG_P5040
Replace CONFIG_P5040 with ARCH_P5040 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/P5040DS.h | 1 | ||||
| -rw-r--r-- | include/configs/cyrus.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/configs/P5040DS.h b/include/configs/P5040DS.h index dc827210d2..548d091f2a 100644 --- a/include/configs/P5040DS.h +++ b/include/configs/P5040DS.h @@ -9,7 +9,6 @@ * */ #define CONFIG_P5040DS -#define CONFIG_PPC_P5040 #define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */ diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 5f5138acbb..13e4690bc9 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -9,7 +9,7 @@ #define CONFIG_CYRUS -#if !defined(CONFIG_ARCH_P5020) && !defined(CONFIG_PPC_P5040) +#if !defined(CONFIG_ARCH_P5020) && !defined(CONFIG_ARCH_P5040) #error Must call Cyrus CONFIG with a specific CPU enabled. #endif @@ -33,7 +33,7 @@ #if defined(CONFIG_ARCH_P5020) #define CONFIG_SYS_CLK_FREQ 133000000 #define CONFIG_SYS_FSL_PBL_RCW board/varisys/cyrus/rcw_p5020_v2.cfg -#elif defined(CONFIG_PPC_P5040) +#elif defined(CONFIG_ARCH_P5040) #define CONFIG_SYS_CLK_FREQ 100000000 #define CONFIG_SYS_FSL_PBL_RCW board/varisys/cyrus/rcw_p5040.cfg #endif |