Commit 84ad6884 authored by Peter Tyser's avatar Peter Tyser Committed by Wolfgang Denk

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

Signed-off-by: default avatarPeter Tyser <ptyser@xes-inc.com>
parent 8f0fec74
......@@ -193,7 +193,7 @@ ifdef SOC
LIBS += $(CPUDIR)/$(SOC)/lib$(SOC).a
endif
ifeq ($(CPU),ixp)
LIBS += cpu/ixp/npe/libnpe.a
LIBS += arch/arm/cpu/ixp/npe/libnpe.a
endif
LIBS += arch/$(ARCH)/lib/lib$(ARCH).a
LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \
......
......@@ -39,7 +39,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
cpu/arm1136/start.o (.text)
arch/arm/cpu/arm1136/start.o (.text)
*(.text)
}
......
......@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
cpu/arm1176/start.o (.text)
arch/arm/cpu/arm1176/start.o (.text)
*(.text)
}
......
......@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
cpu/arm720t/start.o (.text)
arch/arm/cpu/arm720t/start.o (.text)
*(.text)
}
......
......@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
cpu/arm920t/start.o (.text)
arch/arm/cpu/arm920t/start.o (.text)
/* the EP93xx expects to find the pattern 'CRUS' at 0x1000 */
. = 0x1000;
LONG(0x53555243)
......
......@@ -39,7 +39,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
cpu/arm920t/start.o (.text)
arch/arm/cpu/arm920t/start.o (.text)
*(.text)
}
......
......@@ -34,7 +34,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
cpu/arm925t/start.o (.text)
arch/arm/cpu/arm925t/start.o (.text)
*(.text)
}
......
......@@ -28,7 +28,7 @@ COBJS = generic.o timer.o
MX27OBJS = reset.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
SRCS += $(addprefix $(SRCTREE)/cpu/arm926ejs/mx27/,$(MX27OBJS:.o=.c))
SRCS += $(addprefix $(SRCTREE)/arch/arm/cpu/arm926ejs/mx27/,$(MX27OBJS:.o=.c))
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS) $(MX27OBJS))
all: $(obj).depend $(LIB)
......
......@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
cpu/arm926ejs/start.o (.text)
arch/arm/cpu/arm926ejs/start.o (.text)
*(.text)
}
......
......@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
cpu/arm_intcm/start.o (.text)
arch/arm/cpu/arm946es/start.o (.text)
*(.text)
}
......
......@@ -36,7 +36,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
cpu/arm_cortexa8/start.o
arch/arm/cpu/arm_cortexa8/start.o
*(.text)
}
......
......@@ -2,7 +2,7 @@
* Copyright (C) 2009 Samsung Electronics
* Minkyu Kang <mk7.kang@samsung.com>
*
* based on cpu/arm_cortexa8/omap3/cache.S
* based on arch/arm/cpu/arm_cortexa8/omap3/cache.S
*
* See file CREDITS for list of people who contributed to this
* project.
......
......@@ -34,7 +34,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
cpu/arm_cortexa8/start.o (.text)
arch/arm/cpu/arm_cortexa8/start.o (.text)
*(.text)
}
......
......@@ -31,7 +31,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
cpu/arm946es/start.o (.text)
arch/arm/cpu/arm_intcm/start.o (.text)
*(.text)
}
......
......@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libnpe.a
LOCAL_CFLAGS += -I$(TOPDIR)/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
LOCAL_CFLAGS += -I$(TOPDIR)/arch/arm/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
CFLAGS += $(LOCAL_CFLAGS)
HOSTCFLAGS += $(LOCAL_CFLAGS)
......