diff --git a/bsp/risc-v/Makefile b/bsp/hifive1/Makefile
similarity index 100%
rename from bsp/risc-v/Makefile
rename to bsp/hifive1/Makefile
diff --git a/bsp/risc-v/SConscript b/bsp/hifive1/SConscript
similarity index 100%
rename from bsp/risc-v/SConscript
rename to bsp/hifive1/SConscript
diff --git a/bsp/risc-v/SConstruct b/bsp/hifive1/SConstruct
similarity index 100%
rename from bsp/risc-v/SConstruct
rename to bsp/hifive1/SConstruct
diff --git a/bsp/risc-v/applications/SConscript b/bsp/hifive1/applications/SConscript
similarity index 100%
rename from bsp/risc-v/applications/SConscript
rename to bsp/hifive1/applications/SConscript
diff --git a/bsp/risc-v/applications/applications.c b/bsp/hifive1/applications/applications.c
similarity index 100%
rename from bsp/risc-v/applications/applications.c
rename to bsp/hifive1/applications/applications.c
diff --git a/bsp/risc-v/applications/cmd.c b/bsp/hifive1/applications/cmd.c
similarity index 100%
rename from bsp/risc-v/applications/cmd.c
rename to bsp/hifive1/applications/cmd.c
diff --git a/bsp/risc-v/applications/startup.c b/bsp/hifive1/applications/startup.c
similarity index 100%
rename from bsp/risc-v/applications/startup.c
rename to bsp/hifive1/applications/startup.c
diff --git a/bsp/risc-v/drivers/SConscript b/bsp/hifive1/drivers/SConscript
similarity index 100%
rename from bsp/risc-v/drivers/SConscript
rename to bsp/hifive1/drivers/SConscript
diff --git a/bsp/risc-v/drivers/board.c b/bsp/hifive1/drivers/board.c
similarity index 100%
rename from bsp/risc-v/drivers/board.c
rename to bsp/hifive1/drivers/board.c
diff --git a/bsp/risc-v/drivers/board.h b/bsp/hifive1/drivers/board.h
similarity index 100%
rename from bsp/risc-v/drivers/board.h
rename to bsp/hifive1/drivers/board.h
diff --git a/bsp/risc-v/drivers/cpuusage.c b/bsp/hifive1/drivers/cpuusage.c
similarity index 100%
rename from bsp/risc-v/drivers/cpuusage.c
rename to bsp/hifive1/drivers/cpuusage.c
diff --git a/bsp/risc-v/drivers/led.c b/bsp/hifive1/drivers/led.c
similarity index 65%
rename from bsp/risc-v/drivers/led.c
rename to bsp/hifive1/drivers/led.c
index 090a62445..ad9e63c42 100644
--- a/bsp/risc-v/drivers/led.c
+++ b/bsp/hifive1/drivers/led.c
@@ -8,25 +8,6 @@ void rt_hw_led_init(void)
 void rt_hw_led_on(int led)
 {
 
-	/*
-	// Make sure the HFROSC is on before the next line:
-	PRCI_REG(PRCI_HFROSCCFG) |= ROSC_EN(1);
-	// Run off 16 MHz Crystal for accuracy. Note that the
-	// first line is 
-	PRCI_REG(PRCI_PLLCFG) = (PLL_REFSEL(1) | PLL_BYPASS(1));
-	PRCI_REG(PRCI_PLLCFG) |= (PLL_SEL(1));
-	// Turn off HFROSC to save power
-	PRCI_REG(PRCI_HFROSCCFG) &= ~(ROSC_EN(1));
-	*/
-
-
-	// Wait a bit to avoid corruption on the UART.
-	// (In some cases, switching to the IOF can lead
-	// to output glitches, so need to let the UART
-	// reciever time out and resynchronize to the real 
-	// start of the stream.
-	volatile int i=0;
-	while(i < 10000){i++;}
 
 	uint16_t r=0xFF;
 	uint16_t g=0;
diff --git a/bsp/risc-v/drivers/led.h b/bsp/hifive1/drivers/led.h
similarity index 100%
rename from bsp/risc-v/drivers/led.h
rename to bsp/hifive1/drivers/led.h
diff --git a/bsp/risc-v/drivers/usart.c b/bsp/hifive1/drivers/usart.c
similarity index 100%
rename from bsp/risc-v/drivers/usart.c
rename to bsp/hifive1/drivers/usart.c
diff --git a/bsp/risc-v/drivers/usart.h b/bsp/hifive1/drivers/usart.h
similarity index 100%
rename from bsp/risc-v/drivers/usart.h
rename to bsp/hifive1/drivers/usart.h
diff --git a/bsp/risc-v/openocd.cfg b/bsp/hifive1/openocd.cfg
similarity index 100%
rename from bsp/risc-v/openocd.cfg
rename to bsp/hifive1/openocd.cfg
diff --git a/bsp/risc-v/platform/SConscript b/bsp/hifive1/platform/SConscript
similarity index 100%
rename from bsp/risc-v/platform/SConscript
rename to bsp/hifive1/platform/SConscript
diff --git a/bsp/risc-v/platform/interrupt.c b/bsp/hifive1/platform/interrupt.c
similarity index 100%
rename from bsp/risc-v/platform/interrupt.c
rename to bsp/hifive1/platform/interrupt.c
diff --git a/bsp/risc-v/platform/interrupt.h b/bsp/hifive1/platform/interrupt.h
similarity index 100%
rename from bsp/risc-v/platform/interrupt.h
rename to bsp/hifive1/platform/interrupt.h
diff --git a/bsp/risc-v/platform/plic_driver.h b/bsp/hifive1/platform/plic_driver.h
similarity index 100%
rename from bsp/risc-v/platform/plic_driver.h
rename to bsp/hifive1/platform/plic_driver.h
diff --git a/bsp/risc-v/platform/rt_low_level_gcc.inc b/bsp/hifive1/platform/rt_low_level_gcc.inc
similarity index 100%
rename from bsp/risc-v/platform/rt_low_level_gcc.inc
rename to bsp/hifive1/platform/rt_low_level_gcc.inc
diff --git a/bsp/risc-v/platform/rt_low_level_init.c b/bsp/hifive1/platform/rt_low_level_init.c
similarity index 100%
rename from bsp/risc-v/platform/rt_low_level_init.c
rename to bsp/hifive1/platform/rt_low_level_init.c
diff --git a/bsp/risc-v/rtconfig.h b/bsp/hifive1/rtconfig.h
similarity index 100%
rename from bsp/risc-v/rtconfig.h
rename to bsp/hifive1/rtconfig.h
diff --git a/bsp/risc-v/rtconfig.py b/bsp/hifive1/rtconfig.py
similarity index 100%
rename from bsp/risc-v/rtconfig.py
rename to bsp/hifive1/rtconfig.py
diff --git a/bsp/risc-v/sdram.ld b/bsp/hifive1/sdram.ld
similarity index 100%
rename from bsp/risc-v/sdram.ld
rename to bsp/hifive1/sdram.ld
diff --git a/bsp/risc-v/wrap_exit.c b/bsp/hifive1/wrap_exit.c
similarity index 100%
rename from bsp/risc-v/wrap_exit.c
rename to bsp/hifive1/wrap_exit.c