ソースを参照

projects/riscv_usb: Update BOARD define for C source to match verilog one

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Sylvain Munaut 4 年 前
コミット
c1483f3018
2 ファイル変更4 行追加3 行削除
  1. 2 1
      projects/riscv_usb/fw/Makefile
  2. 2 2
      projects/riscv_usb/fw/led.c

+ 2 - 1
projects/riscv_usb/fw/Makefile

@@ -4,7 +4,8 @@ CC = $(CROSS)gcc
 OBJCOPY = $(CROSS)objcopy
 ICEPROG = iceprog
 
-CFLAGS=-Wall -Os -march=rv32i -mabi=ilp32 -ffreestanding -flto -nostartfiles -fomit-frame-pointer -Wl,--gc-section -DBOARD_$(BOARD)
+BOARD_DEFINE=BOARD_$(shell echo $(BOARD) | tr a-z\- A-Z_)
+CFLAGS=-Wall -Os -march=rv32i -mabi=ilp32 -ffreestanding -flto -nostartfiles -fomit-frame-pointer -Wl,--gc-section -D$(BOARD_DEFINE)
 
 HEADERS=\
 	config.h \

+ 2 - 2
projects/riscv_usb/fw/led.c

@@ -102,11 +102,11 @@ led_init(void)
 void
 led_color(uint8_t r, uint8_t g, uint8_t b)
 {
-#if defined(BOARD_icebreaker)
+#if defined(BOARD_ICEBREAKER)
 	led_regs->ip.pwrr = r;
 	led_regs->ip.pwrg = b;
 	led_regs->ip.pwrb = g;
-#elif defined(BOARD_bitsy)
+#elif defined(BOARD_BITSY)
 	led_regs->ip.pwrr = g;
 	led_regs->ip.pwrg = r;
 	led_regs->ip.pwrb = b;