diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:42 +0200 |
| commit | dd9f6d08a2736bf8ddc0004779c563a4c3a77cef (patch) | |
| tree | 9e829ce3e8a29e76b6e8f1459b2636768d170a71 /arch/arm/cpu/Makefile | |
| parent | 2143dfda8b32b8d1cda16982efeca57ca97b3996 (diff) | |
| parent | a81ec0225f5a100341c20b4329c8b1d81ab025c4 (diff) | |
| download | barebox-dd9f6d08a2736bf8ddc0004779c563a4c3a77cef.tar.gz barebox-dd9f6d08a2736bf8ddc0004779c563a4c3a77cef.tar.xz | |
Merge branch 'for-next/relocate'
Conflicts:
arch/arm/lib/barebox.lds.S
Diffstat (limited to 'arch/arm/cpu/Makefile')
| -rw-r--r-- | arch/arm/cpu/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index 525a1806fe..c442b35797 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -22,3 +22,6 @@ pbl-$(CONFIG_CPU_32v7) += cache-armv7.o obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o pbl-y += start-pbl.o setupc.o + +obj-y += common.o +pbl-y += common.o |