]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
powerpc: mpc8260: consolidate CONFIG_MPC8260 and CONFIG_8260
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Wed, 5 Mar 2014 08:40:10 +0000 (17:40 +0900)
committerTom Rini <trini@ti.com>
Fri, 7 Mar 2014 15:59:06 +0000 (10:59 -0500)
commit58dac32764728f2f621377442d785936ec6925e8
tree130896c760141228f08b56f5297cc7b83390378b
parentcfda6bd2d803d0c01f485668eb8d952deb23cf2b
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>
42 files changed:
api/api_platform-powerpc.c
arch/powerpc/cpu/mpc8260/config.mk
arch/powerpc/cpu/mpc8260/kgdb.S
arch/powerpc/cpu/mpc8260/start.S
arch/powerpc/include/asm/processor.h
arch/powerpc/include/asm/status_led.h
arch/powerpc/include/asm/u-boot.h
arch/powerpc/lib/board.c
arch/powerpc/lib/kgdb.c
board/cogent/mb.c
board/cogent/serial.c
board/hymod/hymod.h
common/board_f.c
common/cmd_bdinfo.c
common/cmd_immap.c
examples/standalone/Makefile
include/asm-generic/u-boot.h
include/common.h
include/configs/CPU86.h
include/configs/CPU87.h
include/configs/IDS8247.h
include/configs/IPHASE4539.h
include/configs/ISPAN.h
include/configs/MPC8260ADS.h
include/configs/MPC8266ADS.h
include/configs/PM826.h
include/configs/PM828.h
include/configs/RPXsuper.h
include/configs/Rattler.h
include/configs/TQM8260.h
include/configs/TQM8272.h
include/configs/ZPC1900.h
include/configs/atc.h
include/configs/ep8260.h
include/configs/ep82xxm.h
include/configs/gw8260.h
include/configs/hymod.h
include/configs/muas3001.h
include/configs/ppmc8260.h
include/configs/rsdproto.h
include/configs/sacsng.h
include/ppc_asm.tmpl