Merge branch 'master' of /home/wd/git/u-boot/custodians

diff --git a/board/netstar/Makefile b/board/netstar/Makefile
index 91bac3894942a0ac6eaa45d734cc47f09a19f942..cb3f7c90327033721e5fd90c301e5309f44ae872 100644 (file)
--- a/board/netstar/Makefile
+++ b/board/netstar/Makefile
@@ -53,7 +53,7 @@ $(LIB):       $(OBJS) $(SOBJS)
 $(obj)eeprom.srec:     $(obj)eeprom.o $(obj)eeprom_start.o
        cd $(lnk) && $(LD) -T $(LDSCRIPT) -g -Ttext $(LOAD_ADDR) \
                -o $(<:.o=) -e eeprom eeprom.o eeprom_start.o \
-               -L$(obj)../../examples -lstubs \
+               -L$(obj)../../examples/standalone -lstubs \
                -L$(obj)../../lib_generic -lgeneric \
                -L$(gcclibdir) -lgcc
        $(OBJCOPY) -O srec $(<:.o=) $@

diff --git a/board/trab/Makefile b/board/trab/Makefile
index 30e5fbbb3116697bd8c01710ae524c053e843f42..3a92c0d95f920e5dc48f0b4c095abd572309d6c3 100644 (file)
--- a/board/trab/Makefile
+++ b/board/trab/Makefile
@@ -49,7 +49,7 @@ $(LIB):       $(obj).depend $(OBJS) $(SOBJS)
 
 $(obj)trab_fkt.srec:   $(OBJS_FKT) $(LIB)
        $(LD) -g -Ttext $(LOAD_ADDR) -o $(<:.o=) -e trab_fkt $^ $(LIB) \
-               -L$(obj)../../examples -lstubs \
+               -L$(obj)../../examples/standalone -lstubs \
                -L$(obj)../../lib_generic -lgeneric \
                $(obj)../../lib_arm/div0.o \
                $(obj)../../lib_arm/_*.o

diff --git a/board/voiceblue/Makefile b/board/voiceblue/Makefile
index e7c1cbb3127b9e48bc1391d41389d21f4a6e2dbf..7bb92a681e50beacfac26cce783f712e44542972 100644 (file)
--- a/board/voiceblue/Makefile
+++ b/board/voiceblue/Makefile
@@ -47,7 +47,7 @@ $(LIB):       $(OBJS) $(SOBJS)
 $(obj)eeprom.srec:     $(obj)eeprom.o $(obj)eeprom_start.o
        cd $(lnk) && $(LD) -T $(LDSCRIPT) -g -Ttext $(LOAD_ADDR) \
                -o $(<:.o=) -e eeprom eeprom.o eeprom_start.o \
-               -L$(obj)../../examples -lstubs \
+               -L$(obj)../../examples/standalone -lstubs \
                -L$(obj)../../lib_generic -lgeneric \
                -L$(gcclibdir) -lgcc
        $(OBJCOPY) -O srec $(<:.o=) $@