Skip to content

Commit 79ff61e

Browse files
committed
Remove previous experiment, use multicart.bin, ignore the right things
1 parent d1a9a21 commit 79ff61e

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

code/veccart/.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ Module.symvers
5656
Mkfile.old
5757
dkms.conf
5858

59-
# built multicart menu pulled from other directory (don't want it checked in here)
60-
multicart
59+
# generated filed for multicart menu pulled from other directory (don't want it checked in here)
60+
multicart.ld

code/veccart/Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ CC = $(PREFIX)-gcc
5656
LD = $(PREFIX)-gcc
5757
OBJCOPY = $(PREFIX)-objcopy
5858
OBJDUMP = $(PREFIX)-objdump
59-
BINLD = $(PREFIX)-ld
6059

6160
# Uncomment this line if you want to use the installed (not local) library.
6261
#TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX)
@@ -130,16 +129,15 @@ rom.o: rom.inc rom.c rom.h
130129
%.o: %.c Makefile
131130
$(CC) $(CFLAGS) -o $@ -c $<
132131

133-
multicart:
132+
multicart.bin:
134133
make -C ../multicart/ docker-build
135134
make -C ../multicart/
136-
cp ../multicart/multicart.bin ./multicart
135+
cp ../multicart/multicart.bin .
137136

138-
multicart.ld: multicart
137+
multicart.ld: multicart.bin
139138
cat $< | hexdump -v -e '"BYTE(0x" 1/1 "%02X" ")\n"' > $@
140139

141140
clean:
142-
rm -f multicart
143141
rm -f $(OBJS)
144142
rm -f *.elf
145143
rm -f *.bin

0 commit comments

Comments
 (0)