Modify Makefiles to build libc. Ensure correct build with multiple libraries.

diff --git a/Makefile b/Makefile
index 14daa49..62d71b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ export STRIP  = $(CROSS_COMPILE)strip
 export OBJCOPY = $(CROSS_COMPILE)objcopy
 export OBJDUMP = $(CROSS_COMPILE)objdump
 
-
+export CFLAGS += -nodefaultlibs  -nostdlib
 export CPPFLAGS        +=$(INCLUDE_DIRS)
 export AFLAGS=-mpfu=neon
 
@@ -35,14 +35,17 @@ MAKEFILES := $(CURDIR)/.config
 
 include $(MAKEFILES)
 
-SUBDIRS = arch
+SUBDIRS = arch libc
 
 all: bootloader-ap
 
-bootloader-ap: subdirs
-       $(OBJCOPY) -S -O binary arch/arch.o $@
+bootloader-ap: bootloader-ap.o
+       $(OBJCOPY) -S -O binary bootloader-ap.o $@
        @echo "ROM Image is " $@
 
+bootloader-ap.o: subdirs
+       $(LD) -N -o bootloader-ap.o arch/arch.o libc/libc.o
+
 subdirs: $(SUBDIRS)
 
 $(SUBDIRS):

diff --git a/arch/Makefile b/arch/Makefile
index 7751596..f4f5d2d 100644 (file)
--- a/arch/Makefile
+++ b/arch/Makefile
@@ -2,7 +2,7 @@ obj-$(CONFIG_ARCH_ARM) += arm-head.o
 obj-$(CONFIG_ARCH_MSM7X30) += arch-init-7x30.o
 
 arch.o: $(obj-y)
-       $(LD) -N -Ttext 0x8D000000 -e _start -o arch.o $(obj-y)
+       $(LD) -r -N -Ttext 0x8D000000 -e _start -o arch.o $(obj-y)
 
 all: arch.o