arm: spear: Do not link the _main branch

[oweals/u-boot.git] / arch / sandbox / config.mk

diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk
index 2babcde8815d3987ea4ea6c50fdb4448a61aeba6..31a12db103d77259c32c2f6cba4d0e0d178a7af2 100644 (file)
--- a/arch/sandbox/config.mk
+++ b/arch/sandbox/config.mk
@@ -3,6 +3,7 @@
 
 PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE
 PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM
+PLATFORM_CPPFLAGS += -fPIC
 PLATFORM_LIBS += -lrt
 
 # Define this to avoid linking with SDL, which requires SDL libraries
@@ -10,17 +11,16 @@ PLATFORM_LIBS += -lrt
 ifneq ($(NO_SDL),)
 PLATFORM_CPPFLAGS += -DSANDBOX_NO_SDL
 else
-ifdef CONFIG_SANDBOX_SDL
 PLATFORM_LIBS += $(shell sdl-config --libs)
 PLATFORM_CPPFLAGS += $(shell sdl-config --cflags)
 endif
-endif
 
-cmd_u-boot__ = $(CC) -o $@ -Wl,-T u-boot.lds \
+cmd_u-boot__ = $(CC) -o $@ -Wl,-T u-boot.lds $(u-boot-init) \
        -Wl,--start-group $(u-boot-main) -Wl,--end-group \
        $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map
 
 cmd_u-boot-spl = (cd $(obj) && $(CC) -o $(SPL_BIN) -Wl,-T u-boot-spl.lds \
+       $(patsubst $(obj)/%,%,$(u-boot-spl-init)) \
        -Wl,--start-group $(patsubst $(obj)/%,%,$(u-boot-spl-main)) \
        $(patsubst $(obj)/%,%,$(u-boot-spl-platdata)) -Wl,--end-group \
        $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot-spl.map -Wl,--gc-sections)