diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 08:47:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 08:48:14 +0200 |
| commit | 7787010e9b9b5f77c47856542120fa3f5d0abfc3 (patch) | |
| tree | 38c97d549babc633c363e6c52419abee04d55f7c /arch/arm/cpu/Makefile | |
| parent | da290d3fa3c9d4c753acb0b6c884229bcaf6d5f7 (diff) | |
| parent | 3c91b44b66b17564039e329278d2e76d3eab71fe (diff) | |
| download | barebox-7787010e9b9b5f77c47856542120fa3f5d0abfc3.tar.gz barebox-7787010e9b9b5f77c47856542120fa3f5d0abfc3.tar.xz | |
Merge branch 'for-next/arm-start' into for-next/arm
Diffstat (limited to 'arch/arm/cpu/Makefile')
| -rw-r--r-- | arch/arm/cpu/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index 6aab3aee89..4b0259c15b 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -1,7 +1,7 @@ obj-y += cpu.o obj-$(CONFIG_ARM_EXCEPTIONS) += exceptions.o obj-$(CONFIG_ARM_EXCEPTIONS) += interrupts.o -obj-y += start.o +obj-y += start.o setupc.o # # Any variants can be called as start-armxyz.S @@ -20,4 +20,4 @@ obj-$(CONFIG_CPU_32v7) += cache-armv7.o pbl-$(CONFIG_CPU_32v7) += cache-armv7.o obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o -pbl-y += start-pbl.o +pbl-y += start-pbl.o setupc.o |