diff options
author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2015-10-30 20:12:23 -0700 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-11-02 08:39:22 +0100 |
commit | 33d482fdd391d334f7e8f8b5f3d8cef22a4d3b97 (patch) | |
tree | f90031f88600ee232999548e3fdb52c3805be4a7 /arch/arm/cpu/Makefile | |
parent | 2c68f4e53c964059a77121f2089d1326a641b9cd (diff) | |
download | barebox-33d482fdd391d334f7e8f8b5f3d8cef22a4d3b97.tar.gz barebox-33d482fdd391d334f7e8f8b5f3d8cef22a4d3b97.tar.xz |
arm/cpu: Avoid multiple definitions of barebox_arm_entry
All versions of barebox_arm_entry (in uncompress.c, start.c and
start-pbl.c) appear to be doing exacty the same thing. So move the
definition into a separate file and use IS_ENABLED macro to avoid
re-definition.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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 fb3929c94e..418bcab759 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 setupc.o +obj-y += start.o setupc.o entry.o # # Any variants can be called as start-armxyz.S @@ -23,7 +23,7 @@ AFLAGS_pbl-cache-armv7.o :=-Wa,-march=armv7-a pbl-$(CONFIG_CPU_32v7) += cache-armv7.o obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o -pbl-y += setupc.o +pbl-y += setupc.o entry.o pbl-$(CONFIG_PBL_SINGLE_IMAGE) += start-pbl.o pbl-$(CONFIG_PBL_MULTI_IMAGES) += uncompress.o |