Moved config for generic boards from inline defines in the makefile, back into separate #ifdefed blocks in config.h

rogerclarkmelbourne · rogerclarkmelbourne · commit 42da0d4f52c2 · 2015-05-31T20:47:30.000+10:00
diff --git a/STM32F1/Makefile b/STM32F1/Makefile
@@ -158,7 +158,7 @@ copy_maple-rev5:
 	@echo
 	
 	
-build_generic-pc13: TARGETFLAGS= -DTARGET_GENERIC_F103 -DLED_BANK=GPIOC -DLED_PIN=13 -DLED_ON_STATE=0
+build_generic-pc13: TARGETFLAGS= -DTARGET_GENERIC_F103_PC13
 # Set the linker script
 build_generic-pc13: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pc13: elf bin lss sym
@@ -169,7 +169,7 @@ copy_generic-pc13:
 	cp $(TARGET).bin binaries/generic_boot20_pc13.bin
 	@echo	
 	
-build_generic-pg15: TARGETFLAGS= -DTARGET_GENERIC_F103 -DLED_BANK=GPIOG -DLED_PIN=15 -DLED_ON_STATE=1
+build_generic-pg15: TARGETFLAGS= -DTARGET_GENERIC_F103_PG15
 # Set the linker script
 build_generic-pg15: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pg15: elf bin lss sym
@@ -181,7 +181,7 @@ copy_generic-pg15:
 	@echo		
 
 
-build_generic-pd2: TARGETFLAGS= -DTARGET_GENERIC_F103 -DLED_BANK=GPIOD -DLED_PIN=2 -DLED_ON_STATE=1
+build_generic-pd2: TARGETFLAGS= -DTARGET_GENERIC_F103_PD2
 # Set the linker script
 build_generic-pd2: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pd2: elf bin lss sym
@@ -193,7 +193,7 @@ copy_generic-pd2:
 	@echo	
 	
 	
-build_generic-pd1: TARGETFLAGS= -DTARGET_GENERIC_F103 -DLED_BANK=GPIOD -DLED_PIN=1 -DLED_ON_STATE=1
+build_generic-pd1: TARGETFLAGS= -DTARGET_GENERIC_F103_PD1
 # Set the linker script
 build_generic-pd1: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pd1: elf bin lss sym
diff --git a/STM32F1/config.h b/STM32F1/config.h
@@ -143,21 +143,78 @@
 	#define USER_CODE_RAM     			((u32)0x20000C00)
 	#define RAM_END           			((u32)0x20005000)
 	
-#elif defined TARGET_GENERIC_F103
-	#warning "Target TARGET_GENERIC_F103"
+#elif defined TARGET_GENERIC_F103_PC13
 	
-// LED now defined in the make file
+	#define LED_BANK			GPIOC 
+	#define LED_PIN 			13
+	#define LED_ON_STATE		0
 
-	// this is fairly meaningless on generic boards, but change this if you want to use a button
+	// Button (if you have one)
 	#define BUTTON_BANK GPIOC
 	#define BUTTON 14
 	
 	/* Generic boards don't have disconnect hardware, so we drive PA12 which is connected to the usb D+ line*/
 	#define USB_DISC_BANK         GPIOA
 	#define USB_DISC              12
 
+	// Ram stuff not really needed any more
 	#define USER_CODE_RAM     			((u32)0x20000C00)
 	#define RAM_END           			((u32)0x20005000)	
+	
+#elif defined TARGET_GENERIC_F103_PG15
+	
+	#define LED_BANK			GPIOG 
+	#define LED_PIN 			15
+	#define LED_ON_STATE		1
+
+	// Button (if you have one)
+	#define BUTTON_BANK GPIOC
+	#define BUTTON 14
+	
+	/* Generic boards don't have disconnect hardware, so we drive PA12 which is connected to the usb D+ line*/
+	#define USB_DISC_BANK         GPIOA
+	#define USB_DISC              12
+
+	// Ram stuff not really needed any more
+	#define USER_CODE_RAM     			((u32)0x20000C00)
+	#define RAM_END           			((u32)0x20005000)		
+	
+#elif defined TARGET_GENERIC_F103_PD2
+	
+	#define LED_BANK			GPIOD 
+	#define LED_PIN 			2
+	#define LED_ON_STATE		1
+
+	// Button (if you have one)
+	#define BUTTON_BANK GPIOC
+	#define BUTTON 14
+	
+	/* Generic boards don't have disconnect hardware, so we drive PA12 which is connected to the usb D+ line*/
+	#define USB_DISC_BANK         GPIOA
+	#define USB_DISC              12
+
+	// Ram stuff not really needed any more
+	#define USER_CODE_RAM     			((u32)0x20000C00)
+	#define RAM_END           			((u32)0x20005000)		
+	
+#elif defined TARGET_GENERIC_F103_PD1
+	
+	#define LED_BANK			GPIOD 
+	#define LED_PIN 			1
+	#define LED_ON_STATE		1
+
+	// Button (if you have one)
+	#define BUTTON_BANK GPIOC
+	#define BUTTON 14
+	
+	/* Generic boards don't have disconnect hardware, so we drive PA12 which is connected to the usb D+ line*/
+	#define USB_DISC_BANK         GPIOA
+	#define USB_DISC              12
+
+	// Ram stuff not really needed any more
+	#define USER_CODE_RAM     			((u32)0x20000C00)
+	#define RAM_END           			((u32)0x20005000)		
+	
 #else
 
 	#error "No config for this target"
