Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 2 contributors
Commits on Nov 22, 2011
Xiangfu Liu connect the dependency between softusb and libhal, add libs dependenc…
…y to bios

Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
be76d7d
@sbourdeauducq sbourdeauducq Cleanup BIOS makefile 1ee812a
View
2  softusb-input/Makefile
@@ -5,7 +5,7 @@ all: softusb-input.bin
%.bin: %.elf
avr-objcopy -O binary $< $@
-softusb-input.elf: $(SOURCES)
+softusb-input.elf: $(SOURCES) $(wildcard *.h)
avr-gcc -o softusb-input.elf -mmcu=avr2 -mno-interrupts -Wall -Os $(SOURCES) $(CFLAGS) -nostdlib -Wl,-T -Wl,navre.ld
.PHONY: clean
View
19 software/bios/Makefile
@@ -3,6 +3,8 @@ include $(MMDIR)/software/include.mak
OBJECTS=crt0.o isr.o main.o unlzma.o boot.o boot-helper.o splash.o
SEGMENTS=-j .text -j .data -j .rodata
+LIBS=$(MMDIR)/software/libhpdmc/libhpdmc.a $(MMDIR)/software/libbase/libbase-light.a \
+ $(MMDIR)/software/libhal/libhal.a $(MMDIR)/software/libnet/libnet.a
all: bios.bin bios-rescue.bin
@@ -12,14 +14,25 @@ all: bios.bin bios-rescue.bin
chmod -x $@
$(MMDIR)/tools/mkmmimg $@ write
-# make sure the linker*.ld at the first of depends
-bios.elf: linker.ld $(OBJECTS)
-bios-rescue.elf: linker-rescue.ld $(OBJECTS)
+bios.elf: linker.ld $(OBJECTS) $(LIBS)
+bios-rescue.elf: linker-rescue.ld $(OBJECTS) $(LIBS)
%.elf:
$(LD) $(LDFLAGS) -T $< -N -o $@ $(OBJECTS) -L$(MMDIR)/software/libhpdmc -L$(MMDIR)/software/libbase -L$(MMDIR)/software/libhal -L$(MMDIR)/software/libnet --start-group -lhpdmc -lbase-light -lhal -lnet --end-group
chmod -x $@
+$(MMDIR)/software/libhpdmc/libhpdmc.a:
+ make -C $(MMDIR)/software/libhpdmc/
+
+$(MMDIR)/software/libbase/libbase-light.a:
+ make -C $(MMDIR)/software/libbase/
+
+$(MMDIR)/software/libhal/libhal.a:
+ make -C $(MMDIR)/software/libhal/
+
+$(MMDIR)/software/libnet/libnet.a:
+ make -C $(MMDIR)/software/libnet/
+
.PHONY: clean depend
depend:
View
5 software/libhal/Makefile
@@ -5,7 +5,7 @@ OBJECTS=brd.o dmx.o font8x16.o mem.o pfpu.o snd.o time.o tmu.o ukb.o usb.o vga.o
all: libhal.a
-libhal.a: $(OBJECTS)
+libhal.a: $(OBJECTS) softusb-input.h
$(AR) clr libhal.a $(OBJECTS)
$(RANLIB) libhal.a
@@ -13,10 +13,9 @@ $(MMDIR)/softusb-input/softusb-input.bin:
$(MAKE) -C $(MMDIR)/softusb-input
softusb-input.h: $(MMDIR)/softusb-input/softusb-input.bin
- $(MAKE) -C $(MMDIR)/softusb-input
cat $(MMDIR)/softusb-input/softusb-input.bin | xxd -i - softusb-input.h
-.PHONY: clean depend
+.PHONY: clean depend $(MMDIR)/softusb-input/softusb-input.bin
depend: softusb-input.h
makedepend -Y -- $(CFLAGS) -- *.c

No commit comments for this range

Something went wrong with that request. Please try again.