liteeth: use bios ip_address in example designs

diff --git a/misoclib/com/liteeth/README b/misoclib/com/liteeth/README
index e49b8eed308c25d75320b17ddbfd203c9c72f149..5bbca60aa13beb3f5e3822ade7a7f3b65db5033e 100644 (file)
--- a/misoclib/com/liteeth/README
+++ b/misoclib/com/liteeth/README
@@ -70,7 +70,7 @@ devel [AT] lists.m-labs.hk.
   run ./make.py -t udp all load-bitstream
 
 5. Test design (only for KC705 for now):
-  try to ping 192.168.1.40
+  try to ping 192.168.0.42
   go to [..]/example_designs/test/
   run ./make.py test_udp
 
@@ -78,7 +78,7 @@ devel [AT] lists.m-labs.hk.
   python3 make.py -t etherbone all load-bitstream
 
 7. Test design (only for KC705 for now):
-  try to ping 192.168.1.40
+  try to ping 192.168.0.42
   go to [..]/example_designs/test/
   run ./make.py test_etherbone
 

diff --git a/misoclib/com/liteeth/example_designs/targets/base.py b/misoclib/com/liteeth/example_designs/targets/base.py
index ce27b06364f68c0b931f17554e5ddf71245342e8..3c2a120f8f4b234ff04132d1a4c2d6bd184debb9 100644 (file)
--- a/misoclib/com/liteeth/example_designs/targets/base.py
+++ b/misoclib/com/liteeth/example_designs/targets/base.py
@@ -21,7 +21,7 @@ class BaseSoC(SoC, AutoCSR):
        csr_map.update(SoC.csr_map)
        def __init__(self, platform, clk_freq=166*1000000,
                        mac_address=0x10e2d5000000,
-                       ip_address="192.168.1.40"):
+                       ip_address="192.168.0.42"):
                clk_freq = int((1/(platform.default_clk_period))*1000000000)
                self.submodules.uart2wb = LiteScopeUART2WB(platform.request("serial"), clk_freq, baudrate=115200)
                SoC.__init__(self, platform, clk_freq, self.uart2wb,

diff --git a/misoclib/com/liteeth/example_designs/targets/etherbone.py b/misoclib/com/liteeth/example_designs/targets/etherbone.py
index f1c9abfea2b5df590f26ff76d807e9f71c980495..9a9e9c5b02d3762db0145fae8808f4f91b227bbc 100644 (file)
--- a/misoclib/com/liteeth/example_designs/targets/etherbone.py
+++ b/misoclib/com/liteeth/example_designs/targets/etherbone.py
@@ -13,7 +13,7 @@ class EtherboneSoC(BaseSoC):
        def __init__(self, platform):
                BaseSoC.__init__(self, platform,
                        mac_address=0x10e2d5000000,
-                       ip_address="192.168.1.40")
+                       ip_address="192.168.0.42")
                self.submodules.etherbone = LiteEthEtherbone(self.core.udp, 20000)
                self.add_wb_master(self.etherbone.master.bus)
 

diff --git a/misoclib/com/liteeth/example_designs/targets/tty.py b/misoclib/com/liteeth/example_designs/targets/tty.py
index d3ffa50a418c9e14c080a6b5afef9fa1959a9c81..2b69f0525e51ae4fc77eafd1e54c5c5a74283fd3 100644 (file)
--- a/misoclib/com/liteeth/example_designs/targets/tty.py
+++ b/misoclib/com/liteeth/example_designs/targets/tty.py
@@ -13,8 +13,8 @@ class TTYSoC(BaseSoC):
        def __init__(self, platform):
                BaseSoC.__init__(self, platform,
                        mac_address=0x10e2d5000000,
-                       ip_address="192.168.1.40")
-               self.submodules.tty = LiteEthTTY(self.core.udp, convert_ip("192.168.1.12"), 10000)
+                       ip_address="192.168.0.42")
+               self.submodules.tty = LiteEthTTY(self.core.udp, convert_ip("192.168.0.14"), 10000)
                self.comb += Record.connect(self.tty.source, self.tty.sink)
 
 class TTYSoCDevel(TTYSoC):

diff --git a/misoclib/com/liteeth/example_designs/targets/udp.py b/misoclib/com/liteeth/example_designs/targets/udp.py
index 18c806968bc41d1663f05a2e8f9e331ccaf4cbd4..46a124de97ed41689fc91510c98465ffcc8041ba 100644 (file)
--- a/misoclib/com/liteeth/example_designs/targets/udp.py
+++ b/misoclib/com/liteeth/example_designs/targets/udp.py
@@ -12,7 +12,7 @@ class UDPSoC(BaseSoC):
        def __init__(self, platform):
                BaseSoC.__init__(self, platform,
                        mac_address=0x10e2d5000000,
-                       ip_address="192.168.1.40")
+                       ip_address="192.168.0.42")
 
                # add udp loopback on port 6000 with dw=8
                self.add_udp_loopback(6000, 8,  8192, "loopback_8")

diff --git a/misoclib/com/liteeth/example_designs/test/make.py b/misoclib/com/liteeth/example_designs/test/make.py
index f9ccec089425c06e22d80d3ca4bee03975bccac9..5c16ca0551650a26974917665d912b8922c2921d 100644 (file)
--- a/misoclib/com/liteeth/example_designs/test/make.py
+++ b/misoclib/com/liteeth/example_designs/test/make.py
@@ -4,9 +4,9 @@ import argparse, importlib
 def _get_args():
        parser = argparse.ArgumentParser()
        parser.add_argument("-b", "--bridge", default="uart", help="Bridge to use")
-       parser.add_argument("--port", default=2, help="UART port")
+       parser.add_argument("--port", default="2", help="UART port")
        parser.add_argument("--baudrate", default=921600, help="UART baudrate")
-       parser.add_argument("--ip_address", default="192.168.1.40", help="Etherbone  IP address")
+       parser.add_argument("--ip_address", default="192.168.0.42", help="Etherbone  IP address")
        parser.add_argument("--udp_port", default=20000, help="Etherbone UDP port")
        parser.add_argument("--busword", default=32, help="CSR busword")
 

diff --git a/misoclib/com/liteeth/example_designs/test/test_etherbone.py b/misoclib/com/liteeth/example_designs/test/test_etherbone.py
index e60af2163d31d357cf8cac00fd2ef46c81d42b5f..d11bf496817bbeb5ed7c220effc46d60b136e2fb 100644 (file)
--- a/misoclib/com/liteeth/example_designs/test/test_etherbone.py
+++ b/misoclib/com/liteeth/example_designs/test/test_etherbone.py
@@ -12,7 +12,7 @@ def main(wb):
        packet = EtherbonePacket()
        packet.pf = 1
        packet.encode()
-       sock.sendto(bytes(packet), ("192.168.1.40", 20000))
+       sock.sendto(bytes(packet), ("192.168.0.42", 20000))
        time.sleep(0.01)
 
        # test writes
@@ -34,7 +34,7 @@ def main(wb):
        packet = EtherbonePacket()
        packet.records = [record]
        packet.encode()
-       sock.sendto(bytes(packet), ("192.168.1.40", 20000))
+       sock.sendto(bytes(packet), ("192.168.0.42", 20000))
        time.sleep(0.01)
 
        # test reads
@@ -56,5 +56,5 @@ def main(wb):
        packet = EtherbonePacket()
        packet.records = [record]
        packet.encode()
-       sock.sendto(bytes(packet), ("192.168.1.40", 20000))
+       sock.sendto(bytes(packet), ("192.168.0.42", 20000))
        time.sleep(0.01)

diff --git a/misoclib/com/liteeth/example_designs/test/test_tty.py b/misoclib/com/liteeth/example_designs/test/test_tty.py
index af6f2df024dd97dc840b377c70ddcb1035571e25..88f31bdc5b1fb7605d6155d57d66ae0e572e8f86 100644 (file)
--- a/misoclib/com/liteeth/example_designs/test/test_tty.py
+++ b/misoclib/com/liteeth/example_designs/test/test_tty.py
@@ -33,4 +33,4 @@ def test(fpga_ip, udp_port, test_message):
 
 def main(wb):
        test_message = "LiteEth virtual TTY Hello world\n"
-       test("192.168.1.40", 10000, test_message)
+       test("192.168.0.42", 10000, test_message)

diff --git a/misoclib/com/liteeth/example_designs/test/test_udp.py b/misoclib/com/liteeth/example_designs/test/test_udp.py
index 65d47b74fee5b48e5dd555ae97e712f55b7816da..1f56a27532c43119570471226b56f8573e9f47b3 100644 (file)
--- a/misoclib/com/liteeth/example_designs/test/test_udp.py
+++ b/misoclib/com/liteeth/example_designs/test/test_udp.py
@@ -77,5 +77,5 @@ def test(fpga_ip, udp_port, test_size):
                pass
 
 def main(wb):
-       test("192.168.1.40", 6000, 128*KB)
-       test("192.168.1.40", 8000, 128*KB)
+       test("192.168.0.42", 6000, 128*KB)
+       test("192.168.0.42", 8000, 128*KB)

diff --git a/misoclib/mem/litesata/example_designs/test/make.py b/misoclib/mem/litesata/example_designs/test/make.py
index f9ccec089425c06e22d80d3ca4bee03975bccac9..5c16ca0551650a26974917665d912b8922c2921d 100644 (file)
--- a/misoclib/mem/litesata/example_designs/test/make.py
+++ b/misoclib/mem/litesata/example_designs/test/make.py
@@ -4,9 +4,9 @@ import argparse, importlib
 def _get_args():
        parser = argparse.ArgumentParser()
        parser.add_argument("-b", "--bridge", default="uart", help="Bridge to use")
-       parser.add_argument("--port", default=2, help="UART port")
+       parser.add_argument("--port", default="2", help="UART port")
        parser.add_argument("--baudrate", default=921600, help="UART baudrate")
-       parser.add_argument("--ip_address", default="192.168.1.40", help="Etherbone  IP address")
+       parser.add_argument("--ip_address", default="192.168.0.42", help="Etherbone  IP address")
        parser.add_argument("--udp_port", default=20000, help="Etherbone UDP port")
        parser.add_argument("--busword", default=32, help="CSR busword")
 

diff --git a/misoclib/tools/litescope/example_designs/test/make.py b/misoclib/tools/litescope/example_designs/test/make.py
index b0a3c2bcdbc66d461b919ea5c29326965d1d2074..e0c78b28d8c455a970bfacf99ee502eca03129e2 100644 (file)
--- a/misoclib/tools/litescope/example_designs/test/make.py
+++ b/misoclib/tools/litescope/example_designs/test/make.py
@@ -4,9 +4,9 @@ import argparse, importlib
 def _get_args():
        parser = argparse.ArgumentParser()
        parser.add_argument("-b", "--bridge", default="uart", help="Bridge to use")
-       parser.add_argument("--port", default=3, help="UART port")
+       parser.add_argument("--port", default="2", help="UART port")
        parser.add_argument("--baudrate", default=115200, help="UART baudrate")
-       parser.add_argument("--ip_address", default="192.168.1.40", help="Etherbone  IP address")
+       parser.add_argument("--ip_address", default="192.168.0.42", help="Etherbone  IP address")
        parser.add_argument("--udp_port", default=20000, help="Etherbone UDP port")
        parser.add_argument("--busword", default=32, help="CSR busword")