ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed paths in config files

This commit is contained in:
schneider 2011-06-19 22:03:37 +02:00
parent 883e642618
commit 75b4e005ce
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/Makefile
View File

@ -51,7 +51,7 @@ loadables: $(OUTFILE).bin
clean: clean:
rm -f $(OBJS) $(LD_TEMP) $(OUTFILE).elf $(OUTFILE).bin $(OUTFILE).hex rm -f $(OBJS) $(LD_TEMP) $(OUTFILE).elf $(OUTFILE).bin $(OUTFILE).hex
@cd core && $(MAKE) clean @cd core && $(MAKE) clean
@cd tools && $(MAKE) clean @cd ../tools/bootloader && $(MAKE) clean
@cd lcd && $(MAKE) clean @cd lcd && $(MAKE) clean
@cd modules && $(MAKE) clean @cd modules && $(MAKE) clean
@cd filesystem && $(MAKE) clean @cd filesystem && $(MAKE) clean
@ -78,8 +78,8 @@ filesystem/libfat.a:
usb/libusb.a: usb/libusb.a:
cd usb && $(MAKE) ROOT_PATH=../$(ROOT_PATH) cd usb && $(MAKE) ROOT_PATH=../$(ROOT_PATH)
tools/lpcfix: ../tools/bootloader/lpcfix:
cd tools && $(MAKE) cd ../tools/bootloader && $(MAKE)
$(LD_TEMP): $(LD_TEMP):
-@echo "MEMORY" > $(LD_TEMP) -@echo "MEMORY" > $(LD_TEMP)

2
firmware/Makefile.inc
View File

@ -26,7 +26,7 @@ SIZE = $(CROSS_COMPILE)size
OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump OBJDUMP = $(CROSS_COMPILE)objdump
OUTFILE = firmware OUTFILE = firmware
LPCFIX = tools/lpcfix LPCFIX = ../tools/bootloader/lpcfix
ifeq (LPC11xx,$(TARGET)) ifeq (LPC11xx,$(TARGET))
CORTEX_TYPE=m0 CORTEX_TYPE=m0

3
tools/font/makefont.pl
View File

@ -33,8 +33,7 @@ push @charlist,map {ord $_} qw(
my ($verbose,$raw); my ($verbose,$raw);
my $size=18; my $size=18;
my $font="../ttf/Ubuntu-Regular.ttf"; my $font="ttf/Ubuntu-Regular.ttf";
$font="6x9.bdf";
GetOptions ("size=i" => \$size, # numeric GetOptions ("size=i" => \$size, # numeric
"font=s" => \$font, # string "font=s" => \$font, # string