Skip to content

Commit 236ea0f

Browse files
enjoy-digitalenjoy-digital
committedMar 18, 2015
liteeth: use bios ip_address in example designs
·
0.120.1
1 parent cb4be52 commit 236ea0f

File tree

11 files changed

+19
-19
lines changed

11 files changed

+19
-19
lines changed
 

‎misoclib/com/liteeth/README

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ devel [AT] lists.m-labs.hk.
7070
run ./make.py -t udp all load-bitstream
7171

7272
5. Test design (only for KC705 for now):
73-
try to ping 192.168.1.40
73+
try to ping 192.168.0.42
7474
go to [..]/example_designs/test/
7575
run ./make.py test_udp
7676

7777
6. Build and load Etherbone design (only for KC705 for now):
7878
python3 make.py -t etherbone all load-bitstream
7979

8080
7. Test design (only for KC705 for now):
81-
try to ping 192.168.1.40
81+
try to ping 192.168.0.42
8282
go to [..]/example_designs/test/
8383
run ./make.py test_etherbone
8484

‎misoclib/com/liteeth/example_designs/targets/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class BaseSoC(SoC, AutoCSR):
2121
csr_map.update(SoC.csr_map)
2222
def __init__(self, platform, clk_freq=166*1000000,
2323
mac_address=0x10e2d5000000,
24-
ip_address="192.168.1.40"):
24+
ip_address="192.168.0.42"):
2525
clk_freq = int((1/(platform.default_clk_period))*1000000000)
2626
self.submodules.uart2wb = LiteScopeUART2WB(platform.request("serial"), clk_freq, baudrate=115200)
2727
SoC.__init__(self, platform, clk_freq, self.uart2wb,

‎misoclib/com/liteeth/example_designs/targets/etherbone.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class EtherboneSoC(BaseSoC):
1313
def __init__(self, platform):
1414
BaseSoC.__init__(self, platform,
1515
mac_address=0x10e2d5000000,
16-
ip_address="192.168.1.40")
16+
ip_address="192.168.0.42")
1717
self.submodules.etherbone = LiteEthEtherbone(self.core.udp, 20000)
1818
self.add_wb_master(self.etherbone.master.bus)
1919

‎misoclib/com/liteeth/example_designs/targets/tty.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ class TTYSoC(BaseSoC):
1313
def __init__(self, platform):
1414
BaseSoC.__init__(self, platform,
1515
mac_address=0x10e2d5000000,
16-
ip_address="192.168.1.40")
17-
self.submodules.tty = LiteEthTTY(self.core.udp, convert_ip("192.168.1.12"), 10000)
16+
ip_address="192.168.0.42")
17+
self.submodules.tty = LiteEthTTY(self.core.udp, convert_ip("192.168.0.14"), 10000)
1818
self.comb += Record.connect(self.tty.source, self.tty.sink)
1919

2020
class TTYSoCDevel(TTYSoC):

‎misoclib/com/liteeth/example_designs/targets/udp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class UDPSoC(BaseSoC):
1212
def __init__(self, platform):
1313
BaseSoC.__init__(self, platform,
1414
mac_address=0x10e2d5000000,
15-
ip_address="192.168.1.40")
15+
ip_address="192.168.0.42")
1616

1717
# add udp loopback on port 6000 with dw=8
1818
self.add_udp_loopback(6000, 8, 8192, "loopback_8")

‎misoclib/com/liteeth/example_designs/test/make.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
def _get_args():
55
parser = argparse.ArgumentParser()
66
parser.add_argument("-b", "--bridge", default="uart", help="Bridge to use")
7-
parser.add_argument("--port", default=2, help="UART port")
7+
parser.add_argument("--port", default="2", help="UART port")
88
parser.add_argument("--baudrate", default=921600, help="UART baudrate")
9-
parser.add_argument("--ip_address", default="192.168.1.40", help="Etherbone IP address")
9+
parser.add_argument("--ip_address", default="192.168.0.42", help="Etherbone IP address")
1010
parser.add_argument("--udp_port", default=20000, help="Etherbone UDP port")
1111
parser.add_argument("--busword", default=32, help="CSR busword")
1212

‎misoclib/com/liteeth/example_designs/test/test_etherbone.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def main(wb):
1212
packet = EtherbonePacket()
1313
packet.pf = 1
1414
packet.encode()
15-
sock.sendto(bytes(packet), ("192.168.1.40", 20000))
15+
sock.sendto(bytes(packet), ("192.168.0.42", 20000))
1616
time.sleep(0.01)
1717

1818
# test writes
@@ -34,7 +34,7 @@ def main(wb):
3434
packet = EtherbonePacket()
3535
packet.records = [record]
3636
packet.encode()
37-
sock.sendto(bytes(packet), ("192.168.1.40", 20000))
37+
sock.sendto(bytes(packet), ("192.168.0.42", 20000))
3838
time.sleep(0.01)
3939

4040
# test reads
@@ -56,5 +56,5 @@ def main(wb):
5656
packet = EtherbonePacket()
5757
packet.records = [record]
5858
packet.encode()
59-
sock.sendto(bytes(packet), ("192.168.1.40", 20000))
59+
sock.sendto(bytes(packet), ("192.168.0.42", 20000))
6060
time.sleep(0.01)

‎misoclib/com/liteeth/example_designs/test/test_tty.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ def send():
3333

3434
def main(wb):
3535
test_message = "LiteEth virtual TTY Hello world\n"
36-
test("192.168.1.40", 10000, test_message)
36+
test("192.168.0.42", 10000, test_message)

‎misoclib/com/liteeth/example_designs/test/test_udp.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,5 @@ def send():
7777
pass
7878

7979
def main(wb):
80-
test("192.168.1.40", 6000, 128*KB)
81-
test("192.168.1.40", 8000, 128*KB)
80+
test("192.168.0.42", 6000, 128*KB)
81+
test("192.168.0.42", 8000, 128*KB)

‎misoclib/mem/litesata/example_designs/test/make.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
def _get_args():
55
parser = argparse.ArgumentParser()
66
parser.add_argument("-b", "--bridge", default="uart", help="Bridge to use")
7-
parser.add_argument("--port", default=2, help="UART port")
7+
parser.add_argument("--port", default="2", help="UART port")
88
parser.add_argument("--baudrate", default=921600, help="UART baudrate")
9-
parser.add_argument("--ip_address", default="192.168.1.40", help="Etherbone IP address")
9+
parser.add_argument("--ip_address", default="192.168.0.42", help="Etherbone IP address")
1010
parser.add_argument("--udp_port", default=20000, help="Etherbone UDP port")
1111
parser.add_argument("--busword", default=32, help="CSR busword")
1212

‎misoclib/tools/litescope/example_designs/test/make.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
def _get_args():
55
parser = argparse.ArgumentParser()
66
parser.add_argument("-b", "--bridge", default="uart", help="Bridge to use")
7-
parser.add_argument("--port", default=3, help="UART port")
7+
parser.add_argument("--port", default="2", help="UART port")
88
parser.add_argument("--baudrate", default=115200, help="UART baudrate")
9-
parser.add_argument("--ip_address", default="192.168.1.40", help="Etherbone IP address")
9+
parser.add_argument("--ip_address", default="192.168.0.42", help="Etherbone IP address")
1010
parser.add_argument("--udp_port", default=20000, help="Etherbone UDP port")
1111
parser.add_argument("--busword", default=32, help="CSR busword")
1212

0 commit comments

Comments
 (0)
Please sign in to comment.