diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2012-04-02 17:15:53 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2012-04-02 17:15:53 +0200 |
| commit | d45f815d51db77a592cd0e3f07440877a5c4f9ee (patch) | |
| tree | 1648f8642392b5d9e00619f7ce80837c68e3c99b /x-loader/cpu | |
| parent | 18ea53eaac88276357fb553d9b97d378ef48ba46 (diff) | |
| download | bootable_bootloader_goldelico_gta04_x-loader-d45f815d51db77a592cd0e3f07440877a5c4f9ee.zip bootable_bootloader_goldelico_gta04_x-loader-d45f815d51db77a592cd0e3f07440877a5c4f9ee.tar.gz bootable_bootloader_goldelico_gta04_x-loader-d45f815d51db77a592cd0e3f07440877a5c4f9ee.tar.bz2 | |
merge/overwrite of soures without commit log
Diffstat (limited to 'x-loader/cpu')
| -rw-r--r-- | x-loader/cpu/arm1136/Makefile | 16 | ||||
| -rw-r--r-- | x-loader/cpu/omap3/Makefile | 16 | ||||
| -rw-r--r-- | x-loader/cpu/omap3/config.mk | 2 |
3 files changed, 21 insertions, 13 deletions
diff --git a/x-loader/cpu/arm1136/Makefile b/x-loader/cpu/arm1136/Makefile index 565d016..b556419 100644 --- a/x-loader/cpu/arm1136/Makefile +++ b/x-loader/cpu/arm1136/Makefile @@ -23,21 +23,25 @@ include $(TOPDIR)/config.mk -LIB = lib$(CPU).a +LIB = $(obj)lib$(CPU).a START = start.o -OBJS = cpu.o +COBJS = cpu.o -all: .depend $(START) $(LIB) +SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) +START := $(addprefix $(obj),$(START)) + +all: $(obj).depend $(START) $(LIB) $(LIB): $(OBJS) $(AR) crv $@ $(OBJS) ######################################################################### -.depend: Makefile $(START:.o=.S) $(OBJS:.o=.c) - $(CC) -M $(CFLAGS) $(START:.o=.S) $(OBJS:.o=.c) > $@ +# defines $(obj).depend target +include $(SRCTREE)/rules.mk -sinclude .depend +sinclude $(obj).depend ######################################################################### diff --git a/x-loader/cpu/omap3/Makefile b/x-loader/cpu/omap3/Makefile index 5ce8941..678619c 100644 --- a/x-loader/cpu/omap3/Makefile +++ b/x-loader/cpu/omap3/Makefile @@ -23,21 +23,25 @@ include $(TOPDIR)/config.mk -LIB = lib$(CPU).a +LIB = $(obj)lib$(CPU).a START = start.o -OBJS = cpu.o mmc.o gpio.o +COBJS = cpu.o mmc.o gpio.o -all: .depend $(START) $(LIB) +SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) +START := $(addprefix $(obj),$(START)) + +all: $(obj).depend $(START) $(LIB) $(LIB): $(OBJS) $(AR) crv $@ $(OBJS) ######################################################################### -.depend: Makefile $(START:.o=.S) $(OBJS:.o=.c) - $(CC) -M $(CFLAGS) $(START:.o=.S) $(OBJS:.o=.c) > $@ +# defines $(obj).depend target +include $(SRCTREE)/rules.mk -sinclude .depend +sinclude $(obj).depend ######################################################################### diff --git a/x-loader/cpu/omap3/config.mk b/x-loader/cpu/omap3/config.mk index 6b68917..bd76483 100644 --- a/x-loader/cpu/omap3/config.mk +++ b/x-loader/cpu/omap3/config.mk @@ -22,7 +22,7 @@ # PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 -# PLATFORM_CPPFLAGS += -march=armv7-a +#PLATFORM_CPPFLAGS += -march=armv7-a # ========================================================================= # # Supply options according to compiler version |