summaryrefslogtreecommitdiff
path: root/board/cogent/serial.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-03-05 17:40:10 +0900
committerTom Rini <trini@ti.com>2014-03-07 10:59:06 -0500
commit58dac32764728f2f621377442d785936ec6925e8 (patch)
tree130896c760141228f08b56f5297cc7b83390378b /board/cogent/serial.c
parentcfda6bd2d803d0c01f485668eb8d952deb23cf2b (diff)
downloadu-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 'board/cogent/serial.c')
-rw-r--r--board/cogent/serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/cogent/serial.c b/board/cogent/serial.c
index f0d6b22..95c8120 100644
--- a/board/cogent/serial.c
+++ b/board/cogent/serial.c
@@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR;
#if (CMA_MB_CAPS & CMA_MB_CAP_SERPAR)
#if (defined(CONFIG_8xx) && defined(CONFIG_8xx_CONS_NONE)) || \
- (defined(CONFIG_8260) && defined(CONFIG_CONS_NONE))
+ (defined(CONFIG_MPC8260) && defined(CONFIG_CONS_NONE))
#if CONFIG_CONS_INDEX == 1
#define CMA_MB_SERIAL_BASE CMA_MB_SERIALA_BASE