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 /include/configs/ISPAN.h | |
parent | cfda6bd2d803d0c01f485668eb8d952deb23cf2b (diff) | |
download | u-boot-imx-58dac32764728f2f621377442d785936ec6925e8.zip u-boot-imx-58dac32764728f2f621377442d785936ec6925e8.tar.gz u-boot-imx-58dac32764728f2f621377442d785936ec6925e8.tar.bz2 |
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 'include/configs/ISPAN.h')
-rw-r--r-- | include/configs/ISPAN.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h index a5cea8b..a2fdfd3 100644 --- a/include/configs/ISPAN.h +++ b/include/configs/ISPAN.h @@ -13,7 +13,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MPC8260 /* This is an MPC8260 CPU */ #define CONFIG_ISPAN /* ...on one of Interphase iSPAN boards */ #define CONFIG_CPM2 1 /* Has a CPM2 */ |