liteeth: use bios ip_address in example designs
This commit is contained in:
parent
cb4be52922
commit
236ea0f572
|
@ -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
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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")
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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")
|
||||
|
||||
|
|
|
@ -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")
|
||||
|
||||
|
|
Loading…
Reference in New Issue