projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NetStar: make crcit utility more readable
[oweals/u-boot.git]
/
board
/
netstar
/
Makefile
diff --git
a/board/netstar/Makefile
b/board/netstar/Makefile
index 88da2b948385fe1b454b962abb2114cc79350092..11578b7f3df448755e5030b3889b53b558569837 100644
(file)
--- a/
board/netstar/Makefile
+++ b/
board/netstar/Makefile
@@
-28,7
+28,7
@@
include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
LIB = $(obj)lib$(BOARD).a
-COBJS := netstar.o
flash.o nand.o
+COBJS := netstar.o
SOBJS := setup.o crcek.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) eeprom.c \
SOBJS := setup.o crcek.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) eeprom.c \
@@
-42,7
+42,7
@@
LOAD_ADDR = 0x10400000
LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds
lnk = $(if $(obj),$(obj),.)
LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds
lnk = $(if $(obj),$(obj),.)
-HOST
_
CFLAGS = -Wall -pedantic -I$(TOPDIR)/include
+HOSTCFLAGS = -Wall -pedantic -I$(TOPDIR)/include
all: $(obj).depend $(LIB) $(obj)eeprom.srec $(obj)eeprom.bin \
$(obj)crcek.srec $(obj)crcek.bin $(obj)crcit
all: $(obj).depend $(LIB) $(obj)eeprom.srec $(obj)eeprom.bin \
$(obj)crcek.srec $(obj)crcek.bin $(obj)crcit
@@
-50,10
+50,10
@@
all: $(obj).depend $(LIB) $(obj)eeprom.srec $(obj)eeprom.bin \
$(LIB): $(OBJS) $(SOBJS)
$(AR) $(ARFLAGS) $@ $^
$(LIB): $(OBJS) $(SOBJS)
$(AR) $(ARFLAGS) $@ $^
-$(obj)eeprom.srec: $(obj)eeprom.o $(obj)eeprom_start.o
- cd $(lnk) && $(LD) -T $(
LDSCRIPT)
-g -Ttext $(LOAD_ADDR) \
+$(obj)eeprom.srec: $(obj)eeprom.o $(obj)eeprom_start.o
$(obj)u-boot.lds
+ cd $(lnk) && $(LD) -T $(
obj)u-boot.lds
-g -Ttext $(LOAD_ADDR) \
-o $(<:.o=) -e eeprom eeprom.o eeprom_start.o \
-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=) $@
-L$(obj)../../lib_generic -lgeneric \
-L$(gcclibdir) -lgcc
$(OBJCOPY) -O srec $(<:.o=) $@
@@
-70,21
+70,24
@@
$(obj)crcek.bin: $(obj)crcek.srec
$(OBJCOPY) -I srec -O binary $< $@ 2>/dev/null
$(obj)crcit: $(obj)crcit.o $(obj)crc32.o
$(OBJCOPY) -I srec -O binary $< $@ 2>/dev/null
$(obj)crcit: $(obj)crcit.o $(obj)crc32.o
- $(HOSTCC) $(HOST
_
CFLAGS) -o $@ $^
+ $(HOSTCC) $(HOSTCFLAGS) -o $@ $^
$(obj)crcit.o: crcit.c
$(obj)crcit.o: crcit.c
- $(HOSTCC) $(HOST
_
CFLAGS) -o $@ -c $<
+ $(HOSTCC) $(HOSTCFLAGS) -o $@ -c $<
-$(obj)crc32.o: $(OBJTREE)/tools/crc32.c
- $(HOSTCC) $(HOST_CFLAGS) -DUSE_HOSTCC -o $@ -c $<
+$(obj)crc32.o: $(SRCTREE)/lib_generic/crc32.c
+ $(HOSTCC) $(HOSTCFLAGS) -DUSE_HOSTCC -o $@ -c $<
+
+$(obj)u-boot.lds: $(LDSCRIPT)
+ $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
clean:
rm -f $(SOBJS) $(OBJS) $(obj)eeprom $(obj)eeprom.srec \
$(obj)eeprom.bin $(obj)crcek $(obj)crcek.srec \
clean:
rm -f $(SOBJS) $(OBJS) $(obj)eeprom $(obj)eeprom.srec \
$(obj)eeprom.bin $(obj)crcek $(obj)crcek.srec \
- $(obj)crcek.bin
+ $(obj)crcek.bin
$(obj)u-boot.lds
distclean: clean
distclean: clean
- rm -f $(LIB) core *.bak .depend
+ rm -f $(LIB) core *.bak
$(obj)
.depend
#########################################################################
#########################################################################