diff --git a/firmware/ice40-riscv/icE1usb/Makefile b/firmware/ice40-riscv/icE1usb/Makefile
index 67d0a5d..05fca43 100644
--- a/firmware/ice40-riscv/icE1usb/Makefile
+++ b/firmware/ice40-riscv/icE1usb/Makefile
@@ -2,7 +2,7 @@
 #ice1usb-proto-icebreaker
 #ice1usb-proto-bitsty
 #e1-tracer
-BOARD ?= ice1usb-proto-icebreaker
+BOARD ?= ice1usb
 CROSS ?= riscv-none-embed-
 CC = $(CROSS)gcc
 OBJCOPY = $(CROSS)objcopy
diff --git a/firmware/ice40-riscv/icE1usb/fw_app.c b/firmware/ice40-riscv/icE1usb/fw_app.c
index f5f0834..17379b3 100644
--- a/firmware/ice40-riscv/icE1usb/fw_app.c
+++ b/firmware/ice40-riscv/icE1usb/fw_app.c
@@ -80,19 +80,27 @@
 
 	/* SPI */
 	spi_init();
+	serial_no_init();
+
+	/* Enable LED now that we're done with SPI */
+	e1_led_set(true, 0x00);
 
 	/* Setup E1 Vref */
 	int d = 25;
+#if defined(BOARD_ICE1USB_PROTO_ICEBREAKER) || defined(BOARD_ICE1USB_PROTO_BITSY)
 	pdm_set(PDM_E1_CT, true, 128, false);
 	pdm_set(PDM_E1_P,  true, 128 - d, false);
 	pdm_set(PDM_E1_N,  true, 128 + d, false);
+#else
+	pdm_set(PDM_E1_RX0,  true, 128 + d, false);
+	pdm_set(PDM_E1_RX1,  true, 128 + d, false);
+#endif
 
 	/* Setup clock tuning */
 	pdm_set(PDM_CLK_HI, true, 2048, false);
 	pdm_set(PDM_CLK_LO, false,   0, false);
 
 	/* Enable USB directly */
-	serial_no_init();
 	usb_init(&app_stack_desc);
 	usb_dfu_rt_init();
 	usb_e1_init();
diff --git a/firmware/ice40-riscv/icE1usb/misc.c b/firmware/ice40-riscv/icE1usb/misc.c
index a8e48b3..4fdd2f5 100644
--- a/firmware/ice40-riscv/icE1usb/misc.c
+++ b/firmware/ice40-riscv/icE1usb/misc.c
@@ -45,6 +45,12 @@
 }
 
 
+void
+e1_led_set(bool enable, uint8_t cfg)
+{
+	misc_regs->e1_led = (enable ? 0x100 : 0x000) | cfg;
+}
+
 uint16_t
 e1_tick_read(void)
 {
diff --git a/firmware/ice40-riscv/icE1usb/misc.h b/firmware/ice40-riscv/icE1usb/misc.h
index 36126da..6d90364 100644
--- a/firmware/ice40-riscv/icE1usb/misc.h
+++ b/firmware/ice40-riscv/icE1usb/misc.h
@@ -13,6 +13,12 @@
 enum pdm_chan {
 	PDM_CLK_LO	= 0,
 	PDM_CLK_HI	= 1,
+
+	/* icE1usb */
+	PDM_E1_RX0	= 2,
+	PDM_E1_RX1	= 3,
+
+	/* icE1usb-proto */
 	PDM_E1_N	= 2,
 	PDM_E1_P	= 3,
 	PDM_E1_CT	= 4,
@@ -20,4 +26,5 @@
 
 void pdm_set(int chan, bool enable, unsigned value, bool normalize);
 
+void e1_led_set(bool enable, uint8_t cfg);
 uint16_t e1_tick_read(void);