Merge branch 'master' of /home/wd/git/u-boot/custodians
diff --git a/board/netstar/Makefile b/board/netstar/Makefile
index 91bac38..cb3f7c9 100644
--- a/board/netstar/Makefile
+++ b/board/netstar/Makefile
@@ -53,7 +53,7 @@
$(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 30e5fbb..3a92c0d 100644
--- a/board/trab/Makefile
+++ b/board/trab/Makefile
@@ -49,7 +49,7 @@
$(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 e7c1cbb..7bb92a6 100644
--- a/board/voiceblue/Makefile
+++ b/board/voiceblue/Makefile
@@ -47,7 +47,7 @@
$(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=) $@