Skip to content

Commit 6cfbd01

Browse files
SeanTai-ALPHAmshych
SeanTai-ALPHA
authored and
mshych
committed
Add support for Alpha Networks SNK60I0-320F r1 platform
 1. Add ONIE build support for x86_64-alphanetworks_snk60i0_320f-r1 platform. 2. Fix SSD selection during installation. Signed-off-by: sean <[email protected]> Signed-off-by: Michael Shych <[email protected]>
1 parent b54977a commit 6cfbd01

File tree

5 files changed

+29
-23
lines changed

5 files changed

+29
-23
lines changed

‎build-config/scripts/onie-build-targets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
{ "Vendor": "alphanetworks", "Platform": "alphanetworks_snj60d0_320f", "BuildEnv": "Debian9", "Release": "2021.05br", "Architecture": "amd64", "Notes": "No notes." },
124124
{ "Vendor": "alphanetworks", "Platform": "alphanetworks_snj61d0_320f", "BuildEnv": "Debian10", "Release": "2022.08br", "Architecture": "amd64", "Notes": "No notes." },
125125
{ "Vendor": "alphanetworks", "Platform": "alphanetworks_snj62d0_640f", "BuildEnv": "Debian10", "Release": "2022.02br", "Architecture": "amd64", "Notes": "No notes." },
126-
{ "Vendor": "alphanetworks", "Platform": "alphanetworks_snk60i0_320f", "BuildEnv": "Debian10", "Release": "2025.05br", "Architecture": "amd64", "Notes": "No notes." },
126+
{ "Vendor": "alphanetworks", "Platform": "alphanetworks_snk60i0_320f", "BuildEnv": "Debian10", "Release": "2025.08br", "Architecture": "amd64", "Notes": "No notes." },
127127
{ "Vendor": "alphanetworks", "Platform": "alphanetworks_snq6070_320f", "BuildEnv": "Debian9", "Release": "2020.05br", "Architecture": "PowerPC", "Notes": "No notes." },
128128
{ "Vendor": "alphanetworks", "Platform": "alphanetworks_snq60a0_320f", "BuildEnv": "Debian9", "Release": "2020.05br", "Architecture": "amd64", "Notes": "No notes." },
129129
{ "Vendor": "alphanetworks", "Platform": "alphanetworks_snx6070_486f", "BuildEnv": "Debian9", "Release": "2020.05br", "Architecture": "PowerPC", "Notes": "No notes." },

‎machine/alphanetworks/alphanetworks_snk60i0_320f/INSTALL‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ For example:
1717
When complete, the ONIE binaries are located in
1818
``build/images``:
1919

20-
-rw-r--r-- 1 build build 10821192 Feb 13 02:16 alphanetworks_snk60i0_320f-r0.initrd
21-
-rw-r--r-- 1 build build 4919968 Feb 3 03:42 alphanetworks_snk60i0_320f-r0.vmlinuz
22-
-rw-r--r-- 1 build build 37982208 Feb 13 02:17 onie-recovery-x86_64-alphanetworks_snk60i0_320f-r0.efi64.pxe
23-
-rw-r--r-- 1 build build 35323904 Feb 13 02:17 onie-recovery-x86_64-alphanetworks_snk60i0_320f-r0.iso
24-
-rw-r--r-- 1 build build 15689722 Feb 13 02:16 onie-updater-x86_64-alphanetworks_snk60i0_320f-r0
20+
-rw-r--r-- 1 build build 10825932 Aug 14 06:28 alphanetworks_snk60i0_320f-r1.initrd
21+
-rw-r--r-- 1 build build 4919968 Aug 14 06:27 alphanetworks_snk60i0_320f-r1.vmlinuz
22+
-rw-r--r-- 1 build build 37982208 Aug 14 06:29 onie-recovery-x86_64-alphanetworks_snk60i0_320f-r1.efi64.pxe
23+
-rw-r--r-- 1 build build 35323904 Aug 14 06:29 onie-recovery-x86_64-alphanetworks_snk60i0_320f-r1.iso
24+
-rw-r--r-- 1 build build 15689722 Aug 14 06:28 onie-updater-x86_64-alphanetworks_snk60i0_320f-r1
2525

26-
alphanetworks_snk60i0_320f-r0.vmlinuz -- This is the ONIE kernel image
26+
alphanetworks_snk60i0_320f-r1.vmlinuz -- This is the ONIE kernel image
2727

28-
alphanetworks_snk60i0_320f-r0.initrd -- This is the ONIE initramfs (filesystem)
28+
alphanetworks_snk60i0_320f-r1.initrd -- This is the ONIE initramfs (filesystem)
2929

30-
onie-updater-x86_64-alphanetworks_snk60i0_320f-r0 -- This is the ONIE self-update
30+
onie-updater-x86_64-alphanetworks_snk60i0_320f-r1 -- This is the ONIE self-update
3131
image. This image is a self-extracting archive used for installing ONIE.
3232

33-
onie-recovery-x86_64-alphanetworks_snk60i0_320f-r0.efi64.pxe -- This is the UEFI PXE image
33+
onie-recovery-x86_64-alphanetworks_snk60i0_320f-r1.efi64.pxe -- This is the UEFI PXE image
3434
that can be installed through UEFI PXE.
3535

36-
onie-recovery-x86_64-alphanetworks_snk60i0_320f-r0.iso -- This is a recovery ISO
36+
onie-recovery-x86_64-alphanetworks_snk60i0_320f-r1.iso -- This is a recovery ISO
3737
image. This image can be used to create a bootable USB memory stick for
3838
installing/recovery ONIE.
3939

@@ -51,9 +51,9 @@ Use ``dd`` to copy the .iso image to a USB stick and boot from that:
5151
dd if=<machine>.iso of=/dev/sdX bs=10M
5252

5353
For example:
54-
dd if=onie-recovery-x86_64-alphanetworks_snk60i0_320f-r0.iso of=/dev/sdb bs=10M
54+
dd if=onie-recovery-x86_64-alphanetworks_snk60i0_320f-r1.iso of=/dev/sdb bs=10M
5555

56-
You can find the correct ``/dev/sdX`` by inspecing the ``dmesg``
56+
You can find the correct ``/dev/sdX`` by inspecting the ``dmesg``
5757
output after inserting the USB stick into your work station.
5858

5959
Booting from USB stick

‎machine/alphanetworks/alphanetworks_snk60i0_320f/README.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Follow the instruction to identify your device's ONIE platform in order to insta
1919
| Platform name | Machine rev. | Label rev. | Build ONIE option |
2020
|:------------------------------------:|:------------:|:----------:|:-----------------:|
2121
| x86_64-alphanetworks_snk60i0_320f-r0 | `r0` | N/A | VENDOR_REV=0 |
22+
| x86_64-alphanetworks_snk60i0_320f-r1 | `r1` | N/A | VENDOR_REV=1 |
2223

2324
> **Label rev**. is N/A which means there is no label revision for this device.
2425
@@ -33,19 +34,19 @@ make -j4 MACHINEROOT=../machine/<vendor> MACHINE=<vendor>_<model> VENDOR_REV=<ve
3334
* \<model>: Model name.
3435
* \<vendor_rev>: Hardware machine revision. The default value is the latest hardware machine revision, you can specify the value to override it.
3536

36-
For example, to build ONIE platform **x86_64-alphanetworks_snk60i0_320f-r0** for Alpha Networks SNK-60I0-320F machine revision `r0`:
37+
For example, to build ONIE platform **x86_64-alphanetworks_snk60i0_320f-r1** for Alpha Networks SNK-60I0-320F machine revision `r1`:
3738

3839
```
3940
$ cd build-config
40-
$ make -j4 MACHINEROOT=../machine/alphanetworks MACHINE=alphanetworks_snk60i0_320f VENDOR_REV=0 all pxe-efi64
41+
$ make -j4 MACHINEROOT=../machine/alphanetworks MACHINE=alphanetworks_snk60i0_320f VENDOR_REV=1 all pxe-efi64
4142
```
4243

4344
For more information, please refer to [onie/machine/alphanetworks/alphanetworks_snk60i0_320f/INSTALL](https://github.com/opencomputeproject/onie/blob/master/machine/alphanetworks/alphanetworks_snk60i0_320f/INSTALL)
4445

4546
## Modification history
4647
Alpha Networks uses vendor version to record Alpha Networks own ONIE software history. ONIE master branch always build the latest version ONIE images, and there is no option to build the previous version ONIE images.
4748

48-
| Date | Vendor version | Description |
49-
|:----------:|:--------------:|:---------------------------------------------|
50-
| 2025/02/13 | .alpha-0.1 | Support SNK-60I0-320F machine revision `r0`. |
51-
49+
| Date | Vendor version | Description |
50+
|:----------:|:--------------:|:------------------------------------------------------|
51+
| 2025/02/13 | .alpha-0.1 | Support SNK-60I0-320F machine revision `r0`. |
52+
| 2025/08/14 | .alpha-0.2 | Support SNK-60I0-320F machine revision `r0` and `r1`. |

‎machine/alphanetworks/alphanetworks_snk60i0_320f/installer.conf‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ install_device_platform()
1212
##
1313

1414
for _device in /sys/block/sd*/device; do
15-
# Ice Lake-D LCC SATA 2 PCI Register (D:14,F:0).
16-
if echo $(readlink -f $_device)|egrep -q "pci0000:00\/0000:00:0e.0"; then
15+
# 1st SSD: Ice Lake-D LCC SATA 1 PCI Register (D:8,F:0)
16+
#
17+
# alphadiags:/# readlink -f /sys/block/sda/device
18+
# /sys/devices/pci0000:00/0000:00:08.0/ata5/host4/target4:0:0/4:0:0:0
19+
if echo $(readlink -f $_device)|egrep -q "pci0000:00\/0000:00:08.0"; then
1720
_disk=`echo $_device | cut -f4 -d/`
1821
echo /dev/$_disk
1922
return 0

‎machine/alphanetworks/alphanetworks_snk60i0_320f/machine.make‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
ONIE_ARCH ?= x86_64
44
SWITCH_ASIC_VENDOR = bcm
55

6-
VENDOR_REV ?= 0
6+
VENDOR_REV ?= 1
77

88
# Translate hardware revision to ONIE hardware revision
99
ifeq ($(VENDOR_REV),0)
1010
MACHINE_REV = 0
11+
else ifeq ($(VENDOR_REV),1)
12+
MACHINE_REV = 1
1113
else
1214
$(warning Unknown VENDOR_REV '$(VENDOR_REV)' for MACHINE '$(MACHINE)')
1315
$(error Unknown VENDOR_REV)
@@ -16,7 +18,7 @@ endif
1618
# The VENDOR_VERSION string is appended to the overal ONIE version
1719
# string. HW vendors can use this to appended their own versioning
1820
# information to the base ONIE version string.
19-
VENDOR_VERSION = .alpha-0.1
21+
VENDOR_VERSION = .alpha-0.2
2022

2123
# Vendor ID -- IANA Private Enterprise Number:
2224
# http://www.iana.org/assignments/enterprise-numbers

0 commit comments

Comments
 (0)