Commit 8d1f2682 authored by Peter Tyser's avatar Peter Tyser Committed by Wolfgang Denk

ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU

Signed-off-by: default avatarPeter Tyser <ptyser@xes-inc.com>
parent 819833af
......@@ -227,12 +227,12 @@ LIBS += drivers/qe/qe.a
endif
ifeq ($(CPU),mpc85xx)
LIBS += drivers/qe/qe.a
LIBS += cpu/mpc8xxx/ddr/libddr.a
LIBS += cpu/mpc8xxx/lib8xxx.a
LIBS += arch/ppc/cpu/mpc8xxx/ddr/libddr.a
LIBS += arch/ppc/cpu/mpc8xxx/lib8xxx.a
endif
ifeq ($(CPU),mpc86xx)
LIBS += cpu/mpc8xxx/ddr/libddr.a
LIBS += cpu/mpc8xxx/lib8xxx.a
LIBS += arch/ppc/cpu/mpc8xxx/ddr/libddr.a
LIBS += arch/ppc/cpu/mpc8xxx/lib8xxx.a
endif
LIBS += drivers/rtc/librtc.a
LIBS += drivers/serial/libserial.a
......@@ -3768,7 +3768,7 @@ clobber: clean
@rm -f $(obj)u-boot.kwb
@rm -f $(obj)u-boot.imx
@rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes}
@rm -f $(obj)cpu/mpc824x/bedbug_603e.c
@rm -f $(obj)arch/ppc/cpu/mpc824x/bedbug_603e.c
@rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
@[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
@[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f
......
......@@ -1393,7 +1393,7 @@ The following options need to be configured:
to run and CONFIG_SYS_I2C_SLAVE to be the address of this node (ie
the CPU's i2c node address).
Now, the u-boot i2c code for the mpc8xx (cpu/mpc8xx/i2c.c)
Now, the u-boot i2c code for the mpc8xx (arch/ppc/cpu/mpc8xx/i2c.c)
sets the CPU up as a master node and so its address should
therefore be cleared to 0 (See, eg, MPC823e User's Manual
p.16-473). So, set CONFIG_SYS_I2C_SLAVE to 0.
......@@ -2703,7 +2703,7 @@ Low Level (hardware related) configuration options:
CONFIG_SYS_PCI_MSTR_MEMIO_SIZE, CONFIG_SYS_POCMR1_MASK_ATTRIB, CONFIG_SYS_PCI_MSTR_IO_LOCAL,
CONFIG_SYS_PCI_MSTR_IO_BUS, CONFIG_SYS_CPU_PCI_IO_START, CONFIG_SYS_PCI_MSTR_IO_SIZE,
CONFIG_SYS_POCMR2_MASK_ATTRIB: (MPC826x only)
Overrides the default PCI memory map in cpu/mpc8260/pci.c if set.
Overrides the default PCI memory map in arch/ppc/cpu/mpc8260/pci.c if set.
- CONFIG_PCI_DISABLE_PCIE:
Disable PCI-Express on systems where it is supported but not
......
......@@ -37,8 +37,8 @@ COBJS-y += iopin.o
COBJS-y += serial.o
COBJS-y += speed.o
COBJS-${CONFIG_FSL_DIU_FB} += diu.o
COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_diu_fb.o
COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_logo_bmp.o
COBJS-${CONFIG_FSL_DIU_FB} += ../../../../board/freescale/common/fsl_diu_fb.o
COBJS-${CONFIG_FSL_DIU_FB} += ../../../../board/freescale/common/fsl_logo_bmp.o
COBJS-${CONFIG_CMD_IDE} += ide.o
COBJS-${CONFIG_IIM} += iim.o
COBJS-$(CONFIG_PCI) += pci.o
......
/*
* needed for cpu/mpc512x/start.S
* needed for arch/ppc/cpu/mpc512x/start.S
*
* These should be auto-generated
*/
......
......@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \
# Use default linker script.
# A board port can override this setting in board/*/config.mk
LDSCRIPT := $(SRCTREE)/cpu/mpc512x/u-boot.lds
LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc512x/u-boot.lds
......@@ -27,7 +27,7 @@
#include <command.h>
#include <asm/io.h>
#include "../../board/freescale/common/fsl_diu_fb.h"
#include "../../../../board/freescale/common/fsl_diu_fb.h"
#if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
#include <stdio_dev.h>
......
......@@ -49,7 +49,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
cpu/mpc512x/start.o (.text)
arch/ppc/cpu/mpc512x/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
......
......@@ -25,11 +25,11 @@
#
#
# File: cpu/mpc5xx/Makefile
# File: arch/ppc/cpu/mpc5xx/Makefile
#
# Discription: Makefile to build mpc5xx cpu configuration.
# Will include top config.mk which itselfs
# uses the definitions made in cpu/mpc5xx/config.mk
# uses the definitions made in arch/ppc/cpu/mpc5xx/config.mk
#
......
......@@ -33,4 +33,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi
PLATFORM_CPPFLAGS += -DCONFIG_5xx -ffixed-r2 -mpowerpc -msoft-float
# Use default linker script. Board port can override in board/*/config.mk
LDSCRIPT := $(SRCTREE)/cpu/mpc5xx/u-boot.lds
LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xx/u-boot.lds
......@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
cpu/mpc5xx/start.o (.text)
arch/ppc/cpu/mpc5xx/start.o (.text)
*(.text)
*(.got1)
......
......@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 \
-mstring -mcpu=603e -mmultiple
# Use default linker script. Board port can override in board/*/config.mk
LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot.lds
LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds
......@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
cpu/mpc5xxx/start.o (.text)
cpu/mpc5xxx/traps.o (.text)
arch/ppc/cpu/mpc5xxx/start.o (.text)
arch/ppc/cpu/mpc5xxx/traps.o (.text)
lib/crc32.o (.text)
arch/ppc/lib/cache.o (.text)
arch/ppc/lib/time.o (.text)
......
......@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
cpu/mpc5xxx/start.o (.text)
arch/ppc/cpu/mpc5xxx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
......
......@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC8220 -ffixed-r2 \
-mstring -mcpu=603e -mmultiple
# Use default linker script. Board port can override in board/*/config.mk
LDSCRIPT := $(SRCTREE)/cpu/mpc8220/u-boot.lds
LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8220/u-boot.lds
......@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
cpu/mpc8220/start.o (.text)
arch/ppc/cpu/mpc8220/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
......
......@@ -26,4 +26,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi
PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float
# Use default linker script. Board port can override in board/*/config.mk
LDSCRIPT := $(SRCTREE)/cpu/mpc824x/u-boot.lds
LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc824x/u-boot.lds
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.