diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-03-05 17:40:10 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-07 10:59:06 -0500 |
| commit | 58dac32764728f2f621377442d785936ec6925e8 (patch) | |
| tree | 130896c760141228f08b56f5297cc7b83390378b /api/api_platform-powerpc.c | |
| parent | cfda6bd2d803d0c01f485668eb8d952deb23cf2b (diff) | |
| download | olio-uboot-2014.01-58dac32764728f2f621377442d785936ec6925e8.tar.xz olio-uboot-2014.01-58dac32764728f2f621377442d785936ec6925e8.zip | |
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/config.mk
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/config.mk.
- Rename #ifdef CONFIG_8260 to #ifdef CONFIG_MPC8260
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'api/api_platform-powerpc.c')
| -rw-r--r-- | api/api_platform-powerpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/api_platform-powerpc.c b/api/api_platform-powerpc.c index eb421d642..f23f17501 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) |