Browse Source

projects/riscv_usb: Remove some board support

Those board were supported here only to get a DFU bootloader for them
and not for the demo app.

Since the bootloader is no longer part of this repo, only leave support
for boards intended for this demo.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Sylvain Munaut 4 years ago
parent
commit
3038fcadf6

+ 0 - 39
projects/riscv_usb/data/top-e1tracer.pcf

@@ -1,39 +0,0 @@
-# LIU
-set_io -nowarn liu_mosi 31
-set_io -nowarn liu_miso 32
-set_io -nowarn liu_clk 34
-set_io -nowarn liu_cs_n[0] 42
-set_io -nowarn liu_cs_n[1] 43
-
-set_io -nowarn liu0_rx_data 45
-set_io -nowarn liu0_rx_clk  44
-set_io -nowarn liu1_rx_data 47
-set_io -nowarn liu1_rx_clk  46
-
-# Vio (needed for compat with proto)
-set_io -nowarn vio_pdm 19
-
-# USB
-set_io -nowarn usb_dp 10
-set_io -nowarn usb_dn 9
-set_io -nowarn usb_pu 6
-
-# UART (used for DFU debug)
-set_io -nowarn uart_tx 38
-
-# Clock
-set_io -nowarn clk_in 20
-
-# Button
-set_io -nowarn -pullup yes btn 25
-
-# SPI
-set_io -nowarn -pullup yes spi_mosi 14
-set_io -nowarn -pullup yes spi_miso 17
-set_io -nowarn -pullup yes spi_clk 15
-set_io -nowarn -pullup yes spi_flash_cs_n 16
-
-# Leds
-set_io -nowarn rgb[0] 39
-set_io -nowarn rgb[1] 40
-set_io -nowarn rgb[2] 41

+ 0 - 25
projects/riscv_usb/data/top-ice1usb.pcf

@@ -1,25 +0,0 @@
-# SPI
-set_io -nowarn spi_mosi 14
-set_io -nowarn spi_miso 17
-set_io -nowarn spi_clk 15
-set_io -nowarn spi_flash_cs_n 16
-
-# USB
-set_io -nowarn usb_dp 10
-set_io -nowarn usb_dn  9
-set_io -nowarn usb_pu 11
-
-# UART
-set_io -nowarn uart_rx 21
-set_io -nowarn uart_tx 12
-
-# Clock
-set_io -nowarn clk_in 44
-
-# Button
-set_io -nowarn -pullup yes btn 18
-
-# Leds
-set_io -nowarn rgb[0] 39
-set_io -nowarn rgb[1] 40
-set_io -nowarn rgb[2] 41

+ 0 - 65
projects/riscv_usb/data/top-icepick.pcf

@@ -1,65 +0,0 @@
-# IOs
-set_io -nowarn io_d_a[5] 43
-set_io -nowarn io_d_a[4] 42
-set_io -nowarn io_d_a[3] 38
-set_io -nowarn io_d_a[2] 34
-set_io -nowarn io_d_a[1] 32
-set_io -nowarn io_d_a[0] 31
-
-set_io -nowarn io_p_a[5] 37
-set_io -nowarn io_p_a[4] 36
-set_io -nowarn io_p_a[3] 35
-set_io -nowarn io_p_a[2] 28
-set_io -nowarn io_p_a[1] 27
-set_io -nowarn io_p_a[0] 26
-
-set_io -nowarn io_d_b[3] 47
-set_io -nowarn io_d_b[2] 46
-set_io -nowarn io_d_b[1] 45
-set_io -nowarn io_d_b[0] 44
-
-set_io -nowarn io_p_b[3] 4
-set_io -nowarn io_p_b[2] 3
-set_io -nowarn io_p_b[1] 2
-set_io -nowarn io_p_b[0] 48
-
-# Sense
-set_io -nowarn sense_ctrl 11
-set_io -nowarn sense_hi 12
-set_io -nowarn sense_lo 21
-
-set_io -nowarn sense_ena_n 13
-
-set_io -nowarn -pullup yes sense_mux[3] 18
-set_io -nowarn -pullup yes sense_mux[2] 14
-set_io -nowarn -pullup yes sense_mux[1] 17
-set_io -nowarn -pullup yes sense_mux[0] 15
-
-# Vio
-set_io -nowarn vio_pdm 19
-
-# USB
-set_io -nowarn usb_dp 10
-set_io -nowarn usb_dn 9
-set_io -nowarn usb_pu 6
-
-# UART (used for DFU debug)
-set_io -nowarn -pullup yes uart_rx 45
-set_io -nowarn uart_tx 44
-
-# Clock
-set_io -nowarn clk_in 20
-
-# Button
-set_io -nowarn -pullup yes btn 25
-
-# SPI
-set_io -nowarn -pullup yes spi_mosi 14
-set_io -nowarn -pullup yes spi_miso 17
-set_io -nowarn -pullup yes spi_clk 15
-set_io -nowarn -pullup yes spi_flash_cs_n 16
-
-# Leds
-set_io -nowarn rgb[0] 39
-set_io -nowarn rgb[1] 40
-set_io -nowarn rgb[2] 41

+ 0 - 11
projects/riscv_usb/fw/usb_desc_app.c

@@ -163,19 +163,8 @@ static const struct usb_dev_desc _dev_desc = {
 	.bDeviceSubClass	= 0,
 	.bDeviceProtocol	= 0,
 	.bMaxPacketSize0	= 64,
-#if defined(BOARD_ICE1USB)
-	.idVendor		= 0x1d50,
-	.idProduct		= 0x6145,
-#elif defined(BOARD_ICEPICK)
-	.idVendor		= 0x1d50,
-	.idProduct		= 0x6149,
-#elif defined(BOARD_E1TRACER)
-	.idVendor		= 0x1d50,
-	.idProduct		= 0x6151,
-#else
 	.idVendor		= 0x1d50,
 	.idProduct		= 0x6147,
-#endif
 	.bcdDevice		= 0x0001,	/* v0.1 */
 	.iManufacturer		= 2,
 	.iProduct		= 3,

+ 1 - 1
projects/riscv_usb/fw/usb_str_app.txt

@@ -1,6 +1,6 @@
 0000000000000000
 osmocom
-!{"bitsy-v0": "iCEBreaker bitsy v0.x", "bitsy-v1": "iCEBreaker bitsy v1.x", "e1tracer": "E1 tracer", "ice1usb": "icE1usb", "icebreaker": "iCEBreaker", "icepick": "iCEpick", "": "iCE40 USB Demo"}
+!{"bitsy-v0": "iCEBreaker bitsy v0.x", "bitsy-v1": "iCEBreaker bitsy v1.x", "icebreaker": "iCEBreaker", "": "iCE40 USB Demo"}
 Main
 Console (control)
 Console (data)

+ 0 - 17
projects/riscv_usb/rtl/boards.vh

@@ -40,23 +40,6 @@
 `elsif BOARD_ICEBREAKER
 	// 1bitsquared iCEbreaker
 	`define HAS_PSRAM
-`elsif BOARD_ICEPICK
-	// iCEpick
-	`define PLL_CORE
-	`define HAS_VIO
-`elsif BOARD_ICE1USB
-	// icE1usb
-		// 30.72M input, 48M output
-	`define PLL_CORE
-	`define PLL_CUSTOM
-	`define PLL_DIVR 4'b0000
-	`define PLL_DIVF 7'b0011000
-	`define PLL_DIVQ 3'b100
-	`define PLL_FILTER_RANGE 3'b011
-`elsif BOARD_E1TRACER
-	// osmocom E1 tracer
-	`define PLL_CORE
-	`define HAS_VIO
 `endif
 
 

+ 0 - 20
projects/riscv_usb/rtl/top.v

@@ -44,16 +44,13 @@ module top (
 	inout  wire spi_ram_cs_n,
 `endif
 
-
 	// USB
 	inout  wire usb_dp,
 	inout  wire usb_dn,
 	output wire usb_pu,
 
 	// Debug UART
-`ifndef BOARD_E1TRACER
 	input  wire uart_rx,
-`endif
 	output wire uart_tx,
 
 	// Button
@@ -62,11 +59,6 @@ module top (
 	// LED
 	output wire [2:0] rgb,
 
-`ifdef HAS_VIO
-	// Vio
-	output wire vio_pdm,
-`endif
-
 	// Clock
 	input  wire clk_in
 );
@@ -263,10 +255,6 @@ module top (
 	// UART
 	// ----
 
-`ifdef BOARD_E1TRACER
-	wire uart_rx = 1'b1;
-`endif
-
 	uart_wb #(
 		.DIV_WIDTH(12),
 		.DW(WB_DW)
@@ -531,14 +519,6 @@ module top (
 	);
 
 
-	// Vio
-	// ----
-
-`ifdef HAS_VIO
-	assign vio_pdm = 1'b1;
-`endif
-
-
 	// Clock / Reset
 	// -------------