From bb851005866a85b5c801f69c27e3e351e4fa60d5 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Sat, 2 Apr 2011 02:24:44 +0200
Subject: [PATCH] rename DiskImg to msc_image

---
 firmware/Makefile                       | 21 +++++++++++----------
 firmware/obj/.gitignore                 |  6 +++---
 firmware/src/{DiskImg.c => msc_image.c} |  0
 3 files changed, 14 insertions(+), 13 deletions(-)
 rename firmware/src/{DiskImg.c => msc_image.c} (100%)

diff --git a/firmware/Makefile b/firmware/Makefile
index 0617675..d85768b 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,5 +1,6 @@
-CFLAGS  = -Wall -Werror -D__REDLIB__ -DDEBUG -D__CODE_RED -D__USE_CMSIS=CMSISv1p30_LPC13xx -O0 -g3 -Wall -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections -mcpu=cortex-m3 -mthumb
-LDFLAGS = -nostdlib -Xlinker -Map=obj/edubrm.map --gc-sections -mcpu=cortex-m3 -mthumb -T obj/debug.ld
+NAME = edubrm
+CFLAGS = -Wall -Werror -D__REDLIB__ -DDEBUG -D__CODE_RED -D__USE_CMSIS=CMSISv1p30_LPC13xx -O0 -g3 -Wall -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections -mcpu=cortex-m3 -mthumb
+LDFLAGS = -nostdlib -Xlinker -Map=obj/$(NAME).map --gc-sections -mcpu=cortex-m3 -mthumb -T obj/debug.ld
 LIST = $(shell cd src/ ; ls *.c)
 OBJS = $(addprefix obj/,$(LIST:.c=.o))
 SRCS = $(addprefix src/,$(LIST))
@@ -7,20 +8,20 @@ SRCS = $(addprefix src/,$(LIST))
 obj/%.o: src/%.c
 	arm-none-eabi-gcc $(CFLAGS) -c $< -o $@
 
-obj/edubrm.axf: $(OBJS)
-	arm-none-eabi-gcc $(LDFLAGS) -o obj/edubrm.axf $(OBJS)
+obj/$(NAME).axf: $(OBJS)
+	arm-none-eabi-gcc $(LDFLAGS) -o obj/$(NAME).axf $(OBJS)
 
-obj/edubrm.bin: obj/edubrm.axf
-	arm-none-eabi-size obj/edubrm.axf
-	arm-none-eabi-objcopy -O binary obj/edubrm.axf obj/edubrm.bin
-	checksum -v obj/edubrm.bin
+obj/$(NAME).bin: obj/$(NAME).axf
+	arm-none-eabi-size obj/$(NAME).axf
+	arm-none-eabi-objcopy -O binary obj/$(NAME).axf obj/$(NAME).bin
+	checksum -v obj/$(NAME).bin
 
 clean:
-	rm -f obj/*.o obj/edubrm.{axf,bin,map}
+	rm -f obj/*.o obj/*.{axf,bin,map}
 
 deploy:
 	dfu-util -d 0471:df55 -c 0 -t 2048 -R -D /opt/LPCXpresso/bin/LPCXpressoWIN.enc || :
 	sleep 1
 	crt_emu_lpc11_13_nxp -g -2 -pLPC1343 -wire=winusb -info-target
 	crt_emu_lpc11_13_nxp -g -2 -pLPC1343 -wire=winusb -flash-erase
-	crt_emu_lpc11_13_nxp -g -2 -pLPC1343 -wire=winusb -flash-load=obj/edubrm.axf
+	crt_emu_lpc11_13_nxp -g -2 -pLPC1343 -wire=winusb -flash-load=obj/$(NAME).axf
diff --git a/firmware/obj/.gitignore b/firmware/obj/.gitignore
index fadad03..e176531 100644
--- a/firmware/obj/.gitignore
+++ b/firmware/obj/.gitignore
@@ -1,4 +1,4 @@
 *.o
-edubrm.axf
-edubrm.bin
-edubrm.map
+*.axf
+*.bin
+*.map
diff --git a/firmware/src/DiskImg.c b/firmware/src/msc_image.c
similarity index 100%
rename from firmware/src/DiskImg.c
rename to firmware/src/msc_image.c