From cefe11cdb2a0d1fe0daf90408d3c49e627ef39a7 Mon Sep 17 00:00:00 2001 From: York Sun Date: Fri, 18 Nov 2016 11:30:56 -0800 Subject: powerpc: P5020: Remove macro CONFIG_PPC_P5020 Replace CONFIG_PPC_P5020 with ARCH_P5020 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- include/configs/P5020DS.h | 1 - include/configs/cyrus.h | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h index d2cedfe860d..a942d0c10e5 100644 --- a/include/configs/P5020DS.h +++ b/include/configs/P5020DS.h @@ -9,7 +9,6 @@ * Also supports P5010 DS */ #define CONFIG_P5020DS -#define CONFIG_PPC_P5020 #define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */ diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 4a110926877..5f5138acbb0 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -9,7 +9,7 @@ #define CONFIG_CYRUS -#if !defined(CONFIG_PPC_P5020) && !defined(CONFIG_PPC_P5040) +#if !defined(CONFIG_ARCH_P5020) && !defined(CONFIG_PPC_P5040) #error Must call Cyrus CONFIG with a specific CPU enabled. #endif @@ -18,7 +18,7 @@ #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE3 #define CONFIG_PCIE4 -#ifdef CONFIG_PPC_P5020 +#ifdef CONFIG_ARCH_P5020 #define CONFIG_SYS_FSL_RAID_ENGINE #define CONFIG_SYS_DPAA_RMAN #endif @@ -30,7 +30,7 @@ #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc #define CONFIG_SYS_FSL_PBL_PBI board/varisys/cyrus/pbi.cfg -#if defined(CONFIG_PPC_P5020) +#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) -- cgit v1.2.3