path: root/api
diff options
authorMasahiro Yamada <>2014-03-05 17:40:10 +0900
committerTom Rini <>2014-03-07 10:59:06 -0500
commit58dac32764728f2f621377442d785936ec6925e8 (patch)
tree130896c760141228f08b56f5297cc7b83390378b /api
parentcfda6bd2d803d0c01f485668eb8d952deb23cf2b (diff)
powerpc: mpc8260: consolidate CONFIG_MPC8260 and CONFIG_8260
Before this commit, CONFIG_MPC8260 and CONFIG_8260 were used mixed-up. All boards with mpc8260 cpu defined both of them: - CONFIG_MPC8260 was defined in board config headers and include/common.h - CONFIG_8260 was defined arch/powerpc/cpu/mpc8260/ We do not need to have both of them. This commit keeps only CONFIG_MPC8260. This commit does: - Delete CONFIG_8260 and CONFIG_MPC8260 definition in config headers and include/common.h - Rename CONFIG_8260 to CONFIG_MPC8260 in arch/powerpc/cpu/mpc8260/ - Rename #ifdef CONFIG_8260 to #ifdef CONFIG_MPC8260 Signed-off-by: Masahiro Yamada <> Cc: Wolfgang Denk <>
Diffstat (limited to 'api')
1 files changed, 1 insertions, 1 deletions
diff --git a/api/api_platform-powerpc.c b/api/api_platform-powerpc.c
index eb421d642d..f23f17501f 100644
--- a/api/api_platform-powerpc.c
+++ b/api/api_platform-powerpc.c
@@ -30,7 +30,7 @@ int platform_sys_info(struct sys_info *si)
si->clk_bus = gd->bus_clk;
si->clk_cpu = gd->cpu_clk;
-#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_8260) || \
+#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_MPC8260) || \
defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
#define bi_bar bi_immr_base
#elif defined(CONFIG_MPC5xxx)
OpenPOWER on IntegriCloud