From 01d479eba3af4fcc4bc15cecb569c4f712a5ac23 Mon Sep 17 00:00:00 2001 From: Egor Savkin Date: Thu, 27 Jun 2024 15:27:07 +0800 Subject: [PATCH] No CIDR on kasli-soc Signed-off-by: Egor Savkin --- src/build_test_firmware.md | 4 ++-- src/extra/CONFIG.TXT | 2 +- src/sw_sup/networking.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/build_test_firmware.md b/src/build_test_firmware.md index 2b3606e..55b6573 100644 --- a/src/build_test_firmware.md +++ b/src/build_test_firmware.md @@ -57,7 +57,7 @@ artiq_coremgmt config write -f device_map dev_map.bin 1. Build firmware (see commands below) for SD card variant 2. Copy `results/boot.bin` to the SD card 3. Insert SD card to the Kasli-SoC and boot -4. Change IP from the default one: `artiq_coremgmt -D 192.168.1.56 config write -s ip 192.168.1.75/24` +4. Change IP from the default one: `artiq_coremgmt -D 192.168.1.56 config write -s ip 192.168.1.75` 5. Reboot and check it works on new IP address 6. Test hardware with the PSU, which is going to be shipped 7. Create a flash-drive with `device_db.py` file for customers (FAT32) @@ -72,7 +72,7 @@ artiq_ddb_template -o device_db.py .json nix build -L --impure --expr 'let fl = builtins.getFlake "git+https://git.m-labs.hk/m-labs/artiq-zynq?ref=release-8"; in (fl.makeArtiqZynqPackage {target="kasli_soc"; variant="[master, standalone, satellite]"; json=;}).kasli_soc-[master, standalone, satellite]-sd' # copy `results/boot.bin` to the SD card # insert SD card to the Kasli-SoC and boot -artiq_coremgmt -D 192.168.1.56 config write -s ip 192.168.1.75/24 # or just place extra/CONFIG.TXT near the boot.bin on SD card +artiq_coremgmt -D 192.168.1.56 config write -s ip 192.168.1.75 # or just place extra/CONFIG.TXT near the boot.bin on SD card # update firmware (alternative to copy to SD, if ARTIQ already running) artiq_coremgmt config write -f boot result/boot.bin artiq_coremgmt reboot diff --git a/src/extra/CONFIG.TXT b/src/extra/CONFIG.TXT index 17a83e1..7aca184 100644 --- a/src/extra/CONFIG.TXT +++ b/src/extra/CONFIG.TXT @@ -1,2 +1,2 @@ -ip=192.168.1.75/24 +ip=192.168.1.75 rtio_clock=int_125 diff --git a/src/sw_sup/networking.md b/src/sw_sup/networking.md index 29ac4fc..7b8e458 100644 --- a/src/sw_sup/networking.md +++ b/src/sw_sup/networking.md @@ -8,8 +8,8 @@ a-la `I can't connect, please help`. 1. `device_db.py` has misleading `core_addr` address. 2. PC and the crate are in different subnets. They should be in the same network. Also you may want to directly attach the Kasli to the PC. 3. Network restrictions/problems on your router, either by IP, MAC, protocols or anything else. -4. Wrong configuration of the Kasli. Change IP or MAC address to correspond your network. For ARTIQ-8, add - network mask to the `ip` setting on Kasli, like `192.168.1.75/24`. +4. Wrong configuration of the Kasli. Change IP or MAC address to correspond your network. For ARTIQ-8 and later, add + network mask to the `ip` setting on Kasli (not applicable for Kasli-SoC), like `192.168.1.75/24`. 5. Incompatible Ethernet cables/SFP RJ45. Try different cables and SFP adapters. We usually test them with CAT6 cables, but lower categories should be supported too. 6. SFP or Ethernet are not pushed til the end.