do not have to use uart_litex gpio_litex names
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Thu, 24 Sep 2020 20:17:05 +0000 (21:17 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Thu, 24 Sep 2020 20:17:05 +0000 (21:17 +0100)
src/soc/litex/florent/libresoc/ls180.py
src/soc/litex/florent/ls180soc.py

index b7e01ccdd0d81b4cc9f95d5a535e87711a7f3d71..a98c639b26b266d1eb0ab3b0ccc76e39d1486a64 100644 (file)
@@ -112,15 +112,15 @@ _io = [
 n_gpio = 16
 
 # 16 GPIOs
-_io.append( make_gpio("gpio_litex", 0, n_gpio) )
+_io.append( make_gpio("gpio", 0, n_gpio) )
 
 # EINT: 3 pins
 _io.append( ("eint", 3, Pins("E0 E1 E2"), IOStandard("LVCMOS33")) )
 
 # UART0: 2 pins
-_io.append(make_uart("uart_litex", 0))
+_io.append(make_uart("uart", 0))
 # UART1: 2 pins
-_io.append(make_uart("uart_litex", 1))
+_io.append(make_uart("uart", 1))
 
 
 # Platform -----------------------------------------------------------------------------------------
index 21ecbb4c14f307c7708b049a59f39b9249792e69..9c7547f7078522cedccb5cc38f2beed6e58b7f6b 100755 (executable)
@@ -251,7 +251,7 @@ class LibreSoCSim(SoCCore):
             uart_name = "sim"
         elif platform == 'ls180':
             platform     = LS180Platform()
-            uart_name = "uart_litex"
+            uart_name = "uart"
 
         #cpu_data_width = 32
         cpu_data_width = 64
@@ -386,7 +386,7 @@ class LibreSoCSim(SoCCore):
         self.submodules.gpio = GPIOTristateASIC(gpio_core_pads)
         self.add_csr("gpio")
 
-        gpio_pads = platform.request("gpio_litex")
+        gpio_pads = platform.request("gpio")
         gpio_io_pads = self.cpu.iopads['gpio'] # C4M JTAG pads
         self.comb += gpio_pads.i.eq(gpio_io_pads.i)
         self.comb += gpio_io_pads.o.eq(gpio_pads.o)