diff --git a/lambdalib/__init__.py b/lambdalib/__init__.py index 64d87c9..87ef3d1 100644 --- a/lambdalib/__init__.py +++ b/lambdalib/__init__.py @@ -12,7 +12,6 @@ padring, \ ramlib, \ stdlib, \ - syslib, \ vectorlib @@ -34,7 +33,6 @@ def setup(): padring.setup(), ramlib.setup(), stdlib.setup(), - syslib.setup(), vectorlib.setup() ] diff --git a/lambdalib/syslib/__init__.py b/lambdalib/syslib/__init__.py deleted file mode 100644 index 6950102..0000000 --- a/lambdalib/syslib/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -from siliconcompiler import Library -from lambdalib._common import register_data_source - - -######################## -# SiliconCompiler Setup -######################## -def setup(): - ''' - Lambdalib syslib - ''' - - lib = Library('lambdalib_syslib', package='lambdalib', auto_enable=True) - register_data_source(lib) - - lib.add('option', 'ydir', "syslib/rtl") - - return lib diff --git a/lambdalib/syslib/rtl/la_eth.v b/lambdalib/syslib/rtl/la_eth.v deleted file mode 100644 index d571360..0000000 --- a/lambdalib/syslib/rtl/la_eth.v +++ /dev/null @@ -1,54 +0,0 @@ -/***************************************************************************** - * Function: Ethernet Interface - * Copyright: Lambda Project Authors. All rights Reserved. - * License: MIT (see LICENSE file in Lambda repository) - * - * Docs: - * - ****************************************************************************/ - -module la_eth #( - parameter TARGET = "DEFAULT", // technology target - parameter RW = 32, // register width - parameter DW = 128, // umi packet width - parameter AW = 64, // address width - parameter CW = 32 // command width -) ( // basic control signals - input clk, // core clock - input nreset, // active low async reset - input [RW-1:0] ctrl, // free form ctrl inputs - output [RW-1:0] status, // free form status outputs - // UMI access - input udev_req_valid, - input [CW-1:0] udev_req_cmd, - input [AW-1:0] udev_req_dstaddr, - input [AW-1:0] udev_req_srcaddr, - input [DW-1:0] udev_req_data, - output udev_req_ready, - output udev_resp_valid, - output [CW-1:0] udev_resp_cmd, - output [AW-1:0] udev_resp_dstaddr, - output [AW-1:0] udev_resp_srcaddr, - output [DW-1:0] udev_resp_data, - input udev_resp_ready, - // gmii interface - input [ 7:0] gmii_rx_data, - input gmii_rx_valid, - input gmii_rx_error, - output gmii_tx_clk, - output [ 7:0] gmii_tx_data, - output gmii_tx_enable, - output gmii_tx_error, - // rgmii interface - input [ 3:0] rgmii_rx_data, - input rgmii_rx_ctl, - input rgmii_rx_mdc, - input rgmii_rx_mdin, - output rgmii_rx_mdout, - output rgmii_rx_mden, - output rgmii_tx_clk, - output [ 3:0] rgmii_tx_data, - output rgmii_tx_ctl -); - -endmodule // la_eth diff --git a/lambdalib/syslib/rtl/la_gpio.v b/lambdalib/syslib/rtl/la_gpio.v deleted file mode 100644 index f4ae86f..0000000 --- a/lambdalib/syslib/rtl/la_gpio.v +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * Function: GPIO Interface - * Copyright: Lambda Project Authors. All rights Reserved. - * License: MIT (see LICENSE file in Lambda repository) - * - * Docs: - * - ****************************************************************************/ - -module la_gpio #( - parameter TARGET = "DEFAULT", // technology target - parameter PROP = "HOST", // block selector - parameter RW = 32, // register width - parameter DW = 128, // umi packet width - parameter AW = 64, // address width - parameter CW = 32, // command width - parameter N = 8 // number of GPIO -) ( // basic control signals - input clk, // core clock - input nreset, // active low async reset - input [RW-1:0] ctrl, // free form ctrl inputs - output [RW-1:0] status, // free form status outputs - // UMI access - input udev_req_valid, - input [CW-1:0] udev_req_cmd, - input [AW-1:0] udev_req_dstaddr, - input [AW-1:0] udev_req_srcaddr, - input [DW-1:0] udev_req_data, - output udev_req_ready, - output udev_resp_valid, - output [CW-1:0] udev_resp_cmd, - output [AW-1:0] udev_resp_dstaddr, - output [AW-1:0] udev_resp_srcaddr, - output [DW-1:0] udev_resp_data, - input udev_resp_ready, - // io interface - input [ N-1:0] gpio_in, // data from IO pins - output [ N-1:0] gpio_out, // data to drive to IO pins - output [ N-1:0] gpio_oe, // output enable - output gpio_irq //global gpio interrupt (or-ed) -); - -endmodule // la_gpio diff --git a/lambdalib/syslib/rtl/la_i2c.v b/lambdalib/syslib/rtl/la_i2c.v deleted file mode 100644 index 9708f5f..0000000 --- a/lambdalib/syslib/rtl/la_i2c.v +++ /dev/null @@ -1,56 +0,0 @@ -/***************************************************************************** - * Function: I2C interface - * Copyright: Lambda Project Authors. All rights Reserved. - * License: MIT (see LICENSE file in Lambda repository) - * - * Docs: - * - * Firmware configurable as host or device. - * - ****************************************************************************/ - -module la_i2c #( - parameter TARGET = "DEFAULT", // technology target - parameter PROP = "HOST", // block selector - parameter RW = 32, // register width - parameter DW = 128, // umi packet width - parameter AW = 64, // address width - parameter CW = 32 // command width -) ( // basic control signals - input clk, // core clock - input nreset, // active low async reset - input [RW-1:0] ctrl, // free form ctrl inputs - output [RW-1:0] status, // free form status outputs - // UMI access - input udev_req_valid, - input [CW-1:0] udev_req_cmd, - input [AW-1:0] udev_req_dstaddr, - input [AW-1:0] udev_req_srcaddr, - input [DW-1:0] udev_req_data, - output udev_req_ready, - output udev_resp_valid, - output [CW-1:0] udev_resp_cmd, - output [AW-1:0] udev_resp_dstaddr, - output [AW-1:0] udev_resp_srcaddr, - output [DW-1:0] udev_resp_data, - input udev_resp_ready, - // inputs - input i2c_scl_in, - input i2c_sda_in, - // outputs - output i2c_scl_out, - output i2c_sda_out, - // output enable - output i2c_scl_oe, - output i2c_sda_oe -); - - generate - if (PROP == "HOST") begin - assign i2c_scl_oe = 1'b1; - end else begin - assign i2c_scl_oe = 1'b0; - end - endgenerate - -endmodule // la_i2c diff --git a/lambdalib/syslib/rtl/la_jtag.v b/lambdalib/syslib/rtl/la_jtag.v deleted file mode 100644 index 2424aa9..0000000 --- a/lambdalib/syslib/rtl/la_jtag.v +++ /dev/null @@ -1,72 +0,0 @@ -/***************************************************************************** - * Function: JTAG debug interface (device) - * Copyright: Lambda Project Authors. All rights Reserved. - * License: MIT (see LICENSE file in Lambda repository) - * - * Docs: - * - ****************************************************************************/ - - -module la_jtag #( - parameter TARGET = "DEFAULT", // technology target - parameter PROP = "HOST", // block selector - parameter RW = 32, // register width - parameter DW = 128, // umi packet width - parameter AW = 64, // address width - parameter CW = 32 // command width -) ( // basic control signals - input clk, // core clock - input nreset, // active low async reset - input [RW-1:0] ctrl, // free form ctrl inputs - output [RW-1:0] status, // free form status outputs - // UMI access - input udev_req_valid, - input [CW-1:0] udev_req_cmd, - input [AW-1:0] udev_req_dstaddr, - input [AW-1:0] udev_req_srcaddr, - input [DW-1:0] udev_req_data, - output udev_req_ready, - output udev_resp_valid, - output [CW-1:0] udev_resp_cmd, - output [AW-1:0] udev_resp_dstaddr, - output [AW-1:0] udev_resp_srcaddr, - output [DW-1:0] udev_resp_data, - input udev_resp_ready, - // inputs - input jtag_tck_in, - input jtag_tms_in, - input jtag_trst_in, - input jtag_tdi_in, - input jtag_tdo_in, - // outputs - output jtag_tck_out, - output jtag_tms_out, - output jtag_trst_out, - output jtag_tdi_out, - output jtag_tdo_out, - // output enable - output jtag_tck_oe, - output jtag_tms_oe, - output jtag_trst_oe, - output jtag_tdi_oe, - output jtag_tdo_oe -); - - generate - if (PROP == "HOST") begin - assign jtag_tms_oe = 1'b1; - assign jtag_trst_oe = 1'b1; - assign jtag_tdi_oe = 1'b1; - assign jtag_tck_oe = 1'b1; - assign jtag_tdo_oe = 1'b0; - end else begin - assign jtag_tms_oe = 1'b0; - assign jtag_trst_oe = 1'b0; - assign jtag_tdi_oe = 1'b0; - assign jtag_tck_oe = 1'b0; - assign jtag_tdo_oe = 1'b1; - end - endgenerate - -endmodule // la_jtag diff --git a/lambdalib/syslib/rtl/la_qspi.v b/lambdalib/syslib/rtl/la_qspi.v deleted file mode 100644 index f67f427..0000000 --- a/lambdalib/syslib/rtl/la_qspi.v +++ /dev/null @@ -1,69 +0,0 @@ -/***************************************************************************** - * Function: QSPI Interface - * Copyright: Lambda Project Authors. All rights Reserved. - * License: MIT (see LICENSE file in Lambda repository) - * - * Docs: - * - * 1. Statically configurable as host/device by PROP. - - ****************************************************************************/ -module la_qspi #( - parameter TARGET = "DEFAULT", // technology target - parameter PROP = "HOST", // block selector - parameter RW = 32, // register width - parameter DW = 128, // umi packet width - parameter AW = 64, // address width - parameter CW = 32 // command width -) ( // basic control signals - input clk, // core clock - input nreset, // active low async reset - input [RW-1:0] ctrl, // free form ctrl inputs - output [RW-1:0] status, // free form status outputs - // UMI access - input udev_req_valid, - input [CW-1:0] udev_req_cmd, - input [AW-1:0] udev_req_dstaddr, - input [AW-1:0] udev_req_srcaddr, - input [DW-1:0] udev_req_data, - output udev_req_ready, - output udev_resp_valid, - output [CW-1:0] udev_resp_cmd, - output [AW-1:0] udev_resp_dstaddr, - output [AW-1:0] udev_resp_srcaddr, - output [DW-1:0] udev_resp_data, - input udev_resp_ready, - // inputs - input qspi_clk_in, - input qspi_csn_in, - input qspi_io0_in, - input qspi_io1_in, - input qspi_io2_in, - input qspi_io3_in, - // outputs - output qspi_clk_out, - output qspi_csn_out, - output qspi_io0_out, - output qspi_io1_out, - output qspi_io2_out, - output qspi_io3_out, - // output enable - output qspi_clk_oe, - output qspi_csn_oe, - output qspi_io0_oe, - output qspi_io1_oe, - output qspi_io2_oe, - output qspi_io3_oe -); - - generate - if (PROP == "HOST") begin - assign qspi_clk_oe = 1'b1; - assign qspi_csn_oe = 1'b1; - end else begin - assign qspi_clk_oe = 1'b0; - assign qspi_csn_oe = 1'b0; - end - endgenerate - -endmodule // la_qspi diff --git a/lambdalib/syslib/rtl/la_sd.v b/lambdalib/syslib/rtl/la_sd.v deleted file mode 100644 index bee073e..0000000 --- a/lambdalib/syslib/rtl/la_sd.v +++ /dev/null @@ -1,65 +0,0 @@ -/***************************************************************************** - * Function: SD/SDIO/MMC Controller - * Copyright: Lambda Project Authors. All rights Reserved. - * License: MIT (see LICENSE file in Lambda repository) - * - * Docs: - * - ****************************************************************************/ - - -module la_sd #( - parameter TARGET = "DEFAULT", // technology target - parameter PROP = "HOST", // block selector - parameter RW = 32, // register width - parameter DW = 128, // umi packet width - parameter AW = 64, // address width - parameter CW = 32 // command width -) ( // basic control signals - input clk, // core clock - input nreset, // active low async reset - input [RW-1:0] ctrl, // free form ctrl inputs - output [RW-1:0] status, // free form status outputs - // UMI access - input udev_req_valid, - input [CW-1:0] udev_req_cmd, - input [AW-1:0] udev_req_dstaddr, - input [AW-1:0] udev_req_srcaddr, - input [DW-1:0] udev_req_data, - output udev_req_ready, - output udev_resp_valid, - output [CW-1:0] udev_resp_cmd, - output [AW-1:0] udev_resp_dstaddr, - output [AW-1:0] udev_resp_srcaddr, - output [DW-1:0] udev_resp_data, - input udev_resp_ready, - // inputs - input sd_clk_in, - input sd_cd_in, - input sd_wp_in, - input sd_cmd_in, - input sd_dat0_in, - input sd_dat1_in, - input sd_dat2_in, - input sd_dat3_in, - // outputs - output sd_clk_out, - output sd_cd_out, - output sd_wp_out, - output sd_cmd_out, - output sd_dat0_out, - output sd_dat1_out, - output sd_dat2_out, - output sd_dat3_out, - // enables - output sd_clk_oe, - output sd_cd_oe, - output sd_wp_oe, - output sd_cmd_oe, - output sd_dat0_oe, - output sd_dat1_oe, - output sd_dat2_oe, - output sd_dat3_oe -); - -endmodule // la_sd diff --git a/lambdalib/syslib/rtl/la_spi.v b/lambdalib/syslib/rtl/la_spi.v deleted file mode 100644 index 8439c8d..0000000 --- a/lambdalib/syslib/rtl/la_spi.v +++ /dev/null @@ -1,53 +0,0 @@ -/***************************************************************************** - * Function: SPI Interface - * Copyright: Lambda Project Authors. All rights Reserved. - * License: MIT (see LICENSE file in Lambda repository) - * - * Docs: - * - ****************************************************************************/ - -module la_spi #( - parameter TARGET = "DEFAULT", // technology target - parameter PROP = "HOST", // block selector - parameter RW = 32, // register width - parameter DW = 128, // umi packet width - parameter AW = 64, // address width - parameter CW = 32 // command width -) ( // basic control signals - input clk, // core clock - input nreset, // active low async reset - input [RW-1:0] ctrl, // free form ctrl inputs - output [RW-1:0] status, // free form status outputs - input hostmode, // peripheral operates in host mode - output irq, // interrupt - // UMI access - input udev_req_valid, - input [CW-1:0] udev_req_cmd, - input [AW-1:0] udev_req_dstaddr, - input [AW-1:0] udev_req_srcaddr, - input [DW-1:0] udev_req_data, - output udev_req_ready, - output udev_resp_valid, - output [CW-1:0] udev_resp_cmd, - output [AW-1:0] udev_resp_dstaddr, - output [AW-1:0] udev_resp_srcaddr, - output [DW-1:0] udev_resp_data, - input udev_resp_ready, - // io interface - input spi_sck_in, // serial clock - output spi_sck_out, - output spi_sck_oe, - input spi_csn_in, // chip select (active low) - output spi_csn_out, - output spi_csn_oe, - input spi_sd_in, // serial data - output spi_sd_out, - output spi_sd_oe -); - - assign spi_sck_oe = hostmode ? 1'b1 : 1'b0; - assign spi_csn_oe = hostmode ? 1'b1 : 1'b0; - assign spi_sd_oe = hostmode ? 1'b1 : 1'b0; - -endmodule // la_spi diff --git a/lambdalib/syslib/rtl/la_uart.v b/lambdalib/syslib/rtl/la_uart.v deleted file mode 100644 index a5f5a79..0000000 --- a/lambdalib/syslib/rtl/la_uart.v +++ /dev/null @@ -1,45 +0,0 @@ -/***************************************************************************** - * Function: UART interface - * Copyright: Lambda Project Authors. All rights Reserved. - * License: MIT (see LICENSE file in Lambda repository) - * - * Docs: - * - ****************************************************************************/ - -module la_uart #( - parameter TARGET = "DEFAULT", // technology target - parameter PROP = "HOST", // block selector - parameter RW = 32, // register width - parameter DW = 128, // umi packet width - parameter AW = 64, // address width - parameter CW = 32 // command width -) ( // basic control signals - input clk, // core clock - input nreset, // active low async reset - input [RW-1:0] ctrl, // free form ctrl inputs - output [RW-1:0] status, // free form status outputs - output irq, // interrupt request - // UMI access - input udev_req_valid, - input [CW-1:0] udev_req_cmd, - input [AW-1:0] udev_req_dstaddr, - input [AW-1:0] udev_req_srcaddr, - input [DW-1:0] udev_req_data, - output udev_req_ready, - output udev_resp_valid, - output [CW-1:0] udev_resp_cmd, - output [AW-1:0] udev_resp_dstaddr, - output [AW-1:0] udev_resp_srcaddr, - output [DW-1:0] udev_resp_data, - input udev_resp_ready, - // uart interface - input uart_rx, // data from io - output uart_tx, // data to io - input uart_cts_in, // clear to send - output uart_cts_out, // - input uart_dtr_in, // data terminal ready - output uart_dtr_out // -); - -endmodule // la_uart diff --git a/lambdalib/syslib/rtl/la_usb.v b/lambdalib/syslib/rtl/la_usb.v deleted file mode 100644 index e7e7fd9..0000000 --- a/lambdalib/syslib/rtl/la_usb.v +++ /dev/null @@ -1,52 +0,0 @@ -/***************************************************************************** - * Function: USB Interface - * Copyright: Lambda Project Authors. All rights Reserved. - * License: MIT (see LICENSE file in Lambda repository) - * - * Docs: - * - ****************************************************************************/ -module la_usb #( - parameter TARGET = "DEFAULT", // technology target - parameter RW = 32, // register width - parameter DW = 128, // umi packet width - parameter AW = 64, // address width - parameter CW = 32 // command width -) ( // basic control signals - input clk, // core clock - input nreset, // active low async reset - input [RW-1:0] ctrl, // free form ctrl inputs - output [RW-1:0] status, // free form status outputs - // UMI access - input udev_req_valid, - input [CW-1:0] udev_req_cmd, - input [AW-1:0] udev_req_dstaddr, - input [AW-1:0] udev_req_srcaddr, - input [DW-1:0] udev_req_data, - output udev_req_ready, - output udev_resp_valid, - output [CW-1:0] udev_resp_cmd, - output [AW-1:0] udev_resp_dstaddr, - output [AW-1:0] udev_resp_srcaddr, - output [DW-1:0] udev_resp_data, - input udev_resp_ready, - // low/full speed - input usb_oen, // output enable for bidir signals - output usb_dp_out, // data output (pos) - output usb_dn_out, // data output (neg) - input usb_dp_in, // data input (pos) - input usb_dn_in, // data input (pos) - input usb_id, // indicates initial usb role for otg - // ulpi - input ulpi_clk, // clock from PHY - input ulpi_dir, // data direction control from PHY - input ulpi_nxt, // nxt throttle - output ulpi_stp, // end of packet from link - input [ 7:0] ulpi_data_in, // data bus - output [ 7:0] ulpi_data_out, - output ulpi_oen // output enable for bidir signals -); - - - -endmodule // la_usb diff --git a/tests/test_setup.py b/tests/test_setup.py index f624766..e222ace 100644 --- a/tests/test_setup.py +++ b/tests/test_setup.py @@ -8,7 +8,6 @@ padring, \ ramlib, \ stdlib, \ - syslib, \ vectorlib libraries = [ auxlib, @@ -17,7 +16,6 @@ padring, ramlib, stdlib, - syslib, vectorlib ]