Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

liteeth: use bios ip_address in example designs

This commit is contained in:
Florent Kermarrec 2015-03-18 18:18:43 +01:00
parent cb4be52922
commit 236ea0f572
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misoclib/com/liteeth/README
View File

@ -70,7 +70,7 @@ devel [AT] lists.m-labs.hk.
run ./make.py -t udp all load-bitstream run ./make.py -t udp all load-bitstream
5. Test design (only for KC705 for now): 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/ go to [..]/example_designs/test/
run ./make.py test_udp run ./make.py test_udp
@ -78,7 +78,7 @@ devel [AT] lists.m-labs.hk.
python3 make.py -t etherbone all load-bitstream python3 make.py -t etherbone all load-bitstream
7. Test design (only for KC705 for now): 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/ go to [..]/example_designs/test/
run ./make.py test_etherbone run ./make.py test_etherbone

2
misoclib/com/liteeth/example_designs/targets/base.py
View File

@ -21,7 +21,7 @@ class BaseSoC(SoC, AutoCSR):
csr_map.update(SoC.csr_map) csr_map.update(SoC.csr_map)
def __init__(self, platform, clk_freq=166*1000000, def __init__(self, platform, clk_freq=166*1000000,
mac_address=0x10e2d5000000, mac_address=0x10e2d5000000,
ip_address="192.168.1.40"): ip_address="192.168.0.42"):
clk_freq = int((1/(platform.default_clk_period))*1000000000) clk_freq = int((1/(platform.default_clk_period))*1000000000)
self.submodules.uart2wb = LiteScopeUART2WB(platform.request("serial"), clk_freq, baudrate=115200) self.submodules.uart2wb = LiteScopeUART2WB(platform.request("serial"), clk_freq, baudrate=115200)
SoC.__init__(self, platform, clk_freq, self.uart2wb, SoC.__init__(self, platform, clk_freq, self.uart2wb,

2
misoclib/com/liteeth/example_designs/targets/etherbone.py
View File

@ -13,7 +13,7 @@ class EtherboneSoC(BaseSoC):
def __init__(self, platform): def __init__(self, platform):
BaseSoC.__init__(self, platform, BaseSoC.__init__(self, platform,
mac_address=0x10e2d5000000, mac_address=0x10e2d5000000,
ip_address="192.168.1.40") ip_address="192.168.0.42")
self.submodules.etherbone = LiteEthEtherbone(self.core.udp, 20000) self.submodules.etherbone = LiteEthEtherbone(self.core.udp, 20000)
self.add_wb_master(self.etherbone.master.bus) self.add_wb_master(self.etherbone.master.bus)

4
misoclib/com/liteeth/example_designs/targets/tty.py
View File

@ -13,8 +13,8 @@ class TTYSoC(BaseSoC):
def __init__(self, platform): def __init__(self, platform):
BaseSoC.__init__(self, platform, BaseSoC.__init__(self, platform,
mac_address=0x10e2d5000000, mac_address=0x10e2d5000000,
ip_address="192.168.1.40") ip_address="192.168.0.42")
self.submodules.tty = LiteEthTTY(self.core.udp, convert_ip("192.168.1.12"), 10000) self.submodules.tty = LiteEthTTY(self.core.udp, convert_ip("192.168.0.14"), 10000)
self.comb += Record.connect(self.tty.source, self.tty.sink) self.comb += Record.connect(self.tty.source, self.tty.sink)
class TTYSoCDevel(TTYSoC): class TTYSoCDevel(TTYSoC):

2
misoclib/com/liteeth/example_designs/targets/udp.py
View File

@ -12,7 +12,7 @@ class UDPSoC(BaseSoC):
def __init__(self, platform): def __init__(self, platform):
BaseSoC.__init__(self, platform, BaseSoC.__init__(self, platform,
mac_address=0x10e2d5000000, mac_address=0x10e2d5000000,
ip_address="192.168.1.40") ip_address="192.168.0.42")
# add udp loopback on port 6000 with dw=8 # add udp loopback on port 6000 with dw=8
self.add_udp_loopback(6000, 8, 8192, "loopback_8") self.add_udp_loopback(6000, 8, 8192, "loopback_8")

4
misoclib/com/liteeth/example_designs/test/make.py
View File

@ -4,9 +4,9 @@ import argparse, importlib
def _get_args(): def _get_args():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("-b", "--bridge", default="uart", help="Bridge to use") 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("--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("--udp_port", default=20000, help="Etherbone UDP port")
parser.add_argument("--busword", default=32, help="CSR busword") parser.add_argument("--busword", default=32, help="CSR busword")

6
misoclib/com/liteeth/example_designs/test/test_etherbone.py
View File

@ -12,7 +12,7 @@ def main(wb):
packet = EtherbonePacket() packet = EtherbonePacket()
packet.pf = 1 packet.pf = 1
packet.encode() packet.encode()
sock.sendto(bytes(packet), ("192.168.1.40", 20000)) sock.sendto(bytes(packet), ("192.168.0.42", 20000))
time.sleep(0.01) time.sleep(0.01)
# test writes # test writes
@ -34,7 +34,7 @@ def main(wb):
packet = EtherbonePacket() packet = EtherbonePacket()
packet.records = [record] packet.records = [record]
packet.encode() packet.encode()
sock.sendto(bytes(packet), ("192.168.1.40", 20000)) sock.sendto(bytes(packet), ("192.168.0.42", 20000))
time.sleep(0.01) time.sleep(0.01)
# test reads # test reads
@ -56,5 +56,5 @@ def main(wb):
packet = EtherbonePacket() packet = EtherbonePacket()
packet.records = [record] packet.records = [record]
packet.encode() packet.encode()
sock.sendto(bytes(packet), ("192.168.1.40", 20000)) sock.sendto(bytes(packet), ("192.168.0.42", 20000))
time.sleep(0.01) time.sleep(0.01)

2
misoclib/com/liteeth/example_designs/test/test_tty.py
View File

@ -33,4 +33,4 @@ def test(fpga_ip, udp_port, test_message):
def main(wb): def main(wb):
test_message = "LiteEth virtual TTY Hello world\n" test_message = "LiteEth virtual TTY Hello world\n"
test("192.168.1.40", 10000, test_message) test("192.168.0.42", 10000, test_message)

4
misoclib/com/liteeth/example_designs/test/test_udp.py
View File

@ -77,5 +77,5 @@ def test(fpga_ip, udp_port, test_size):
pass pass
def main(wb): def main(wb):
test("192.168.1.40", 6000, 128*KB) test("192.168.0.42", 6000, 128*KB)
test("192.168.1.40", 8000, 128*KB) test("192.168.0.42", 8000, 128*KB)

4
misoclib/mem/litesata/example_designs/test/make.py
View File

@ -4,9 +4,9 @@ import argparse, importlib
def _get_args(): def _get_args():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("-b", "--bridge", default="uart", help="Bridge to use") 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("--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("--udp_port", default=20000, help="Etherbone UDP port")
parser.add_argument("--busword", default=32, help="CSR busword") parser.add_argument("--busword", default=32, help="CSR busword")

4
misoclib/tools/litescope/example_designs/test/make.py
View File

@ -4,9 +4,9 @@ import argparse, importlib
def _get_args(): def _get_args():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("-b", "--bridge", default="uart", help="Bridge to use") 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("--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("--udp_port", default=20000, help="Etherbone UDP port")
parser.add_argument("--busword", default=32, help="CSR busword") parser.add_argument("--busword", default=32, help="CSR busword")