diff --git a/Makefile b/Makefile index 9d9c2b5..44c6fe8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ NAME ?=talos-orangepi5 REGISTRY ?= ghcr.io -USERNAME ?= si0ls +USERNAME ?= schneid-l REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME) SOURCE ?= https://github.com/${USERNAME}/${NAME}.git AUTHORS ?= Louis S. @@ -21,10 +21,10 @@ KERNEL_OUTPUT_NAME ?= $(NAME)-kernel KERNEL_OUTPUT_TAG ?= $(KERNEL_TAG)-$(TAG) KERNEL_OUTPUT_IMAGE ?= $(REGISTRY_AND_USERNAME)/$(KERNEL_OUTPUT_NAME):$(KERNEL_OUTPUT_TAG) -TALOS_TAG ?= v1.8.0-alpha.1 +TALOS_TAG ?= v1.8.0-beta.0 TALOS_SOURCE ?= https://github.com/siderolabs/talos.git TALOS_VERSION ?= $(TALOS_TAG) -TALOS_AMD64_KERNEL ?= ghcr.io/siderolabs/kernel:v1.8.0-alpha.0-34-gce49757 +TALOS_AMD64_KERNEL ?= ghcr.io/siderolabs/kernel:v1.8.0 IMAGER_TALOS ?= talos/$(TALOS_VERSION) IMAGER_OUTPUT_NAME ?= $(NAME)-imager IMAGER_OUTPUT_TAG ?= $(TALOS_VERSION)-$(TAG) diff --git a/README.md b/README.md index 23a90e1..a233795 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Talos for Orange Pi 5 -[![Build Talos Linux for Orange Pi 5](https://github.com/si0ls/talos-orangepi5/actions/workflows/build-talos-opi5.yaml/badge.svg)](https://github.com/si0ls/talos-orangepi5/actions/workflows/build-talos-opi5.yaml) +[![Build Talos Linux for Orange Pi 5](https://github.com/schneid-l/talos-orangepi5/actions/workflows/build-talos-opi5.yaml/badge.svg)](https://github.com/schneid-l/talos-orangepi5/actions/workflows/build-talos-opi5.yaml) This repository provides Talos Linux support for the Orange Pi 5 and Orange Pi 5 Plus. @@ -26,7 +26,7 @@ The images provided in this repository do not includes a bootloader as the Orang The images provided in this repository are made to be booted with U-Boot or EDK2 UEFI firmware. -I provide U-Boot builds for Orange Pi 5 (and variants) in the [u-boot-orangepi5 repository](https://github.com/si0ls/u-boot-orangepi5). +I provide U-Boot builds for Orange Pi 5 (and variants) in the [u-boot-orangepi5 repository](https://github.com/schneid-l/u-boot-orangepi5). The informations to flash the bootloader are described in the repository README. You can also flash [EDK2 UEFI firmware for Rockchip RK3588 platforms](https://github.com/edk2-porting/edk2-rk3588) (not tested). @@ -39,7 +39,7 @@ The device tree are included in the image at the paths required by U-Boot and ED The Talos image can be flashed on an SD card or a NVMe drive. -You can download the latest image from the [releases page](https://github.com/si0ls/talos-orangepi5/releases). +You can download the latest image from the [releases page](https://github.com/schneid-l/talos-orangepi5/releases). The image can be flashed using [Etcher](https://www.balena.io/etcher/) on Windows, macOS, or Linux or using `dd` on Linux: @@ -57,7 +57,7 @@ dd if=talos-orangepi5.raw of=/dev/sdX bs=4M status=progress **This repository does not provide a PXE server**, it is up to you to set up the PXE environment. -The [release page](https://github.com/si0ls/talos-orangepi5/releases) provides the following files needed for PXE boot: +The [release page](https://github.com/schneid-l/talos-orangepi5/releases) provides the following files needed for PXE boot: - `kernel-arm64` (the kernel) - `initramfs-metal-arm64.xz` (the initramfs) @@ -65,13 +65,13 @@ The [release page](https://github.com/si0ls/talos-orangepi5/releases) provides t ## Machine configuration -Use the `ghcr.io/si0ls/talos-orangepi5` image instead of the upstream Talos Linux one. +Use the `ghcr.io/schneid-l/talos-orangepi5` image instead of the upstream Talos Linux one. ```yaml machine: install: disk: /dev/sda # replace with the device you want to install Talos on - image: ghcr.io/si0ls/talos-orangepi5:v1.1 + image: ghcr.io/schneid-l/talos-orangepi5:v1.1 wipe: false ``` @@ -79,7 +79,7 @@ To upgrade you machine to the latest version with `talosctl`, you can use the fo ```bash talosctl upgrade --nodes \ - --image ghcr.io/si0ls/talos-orangepi5: + --image ghcr.io/schneid-l/talos-orangepi5: ``` ## Build @@ -87,7 +87,7 @@ talosctl upgrade --nodes \ Clone the repository and build Talos Linux for Orange Pi 5: ```bash -git clone https://github.com/si0ls/talos-orangepi5.git +git clone https://github.com/schneid-l/talos-orangepi5.git cd talos-orangepi5 make ``` diff --git a/imager/patches/talos-orangepi5.patch b/imager/patches/talos-orangepi5.patch index 0852a3d..64e965d 100644 --- a/imager/patches/talos-orangepi5.patch +++ b/imager/patches/talos-orangepi5.patch @@ -1,18 +1,18 @@ -From 4e7a4115ea87965b60519d9353fbea8074fecf67 Mon Sep 17 00:00:00 2001 +From 6f01355e3b72f73b6a25913ff7ec526654389c3e Mon Sep 17 00:00:00 2001 From: Louis SCHNEIDER -Date: Mon, 22 Jul 2024 18:12:08 +0200 -Subject: [PATCH] use rk3588 v6.10 kernel +Date: Sun, 15 Sep 2024 15:41:42 +0200 +Subject: [PATCH] use rk3588 v6.11 kernel --- - hack/modules-arm64.txt | 33 ---------------------------- + hack/modules-arm64.txt | 36 ---------------------------- pkg/machinery/constants/constants.go | 2 +- - 2 files changed, 1 insertion(+), 34 deletions(-) + 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/hack/modules-arm64.txt b/hack/modules-arm64.txt -index 3b07203..b5c35b8 100644 +index d3fcd46..4bfb7b6 100644 --- a/hack/modules-arm64.txt +++ b/hack/modules-arm64.txt -@@ -3,42 +3,9 @@ kernel/crypto/async_tx/async_pq.ko +@@ -3,34 +3,8 @@ kernel/crypto/async_tx/async_pq.ko kernel/crypto/async_tx/async_raid6_recov.ko kernel/crypto/async_tx/async_tx.ko kernel/crypto/async_tx/async_xor.ko @@ -45,6 +45,15 @@ index 3b07203..b5c35b8 100644 -kernel/drivers/net/ethernet/sfc/sfc.ko -kernel/drivers/net/ethernet/sfc/siena/sfc-siena.ko kernel/drivers/net/vrf.ko + kernel/drivers/nvme/host/nvme-rdma.ko + kernel/drivers/nvme/target/nvme-loop.ko +@@ -38,16 +12,6 @@ kernel/drivers/nvme/target/nvmet-fc.ko + kernel/drivers/nvme/target/nvmet.ko + kernel/drivers/nvme/target/nvmet-rdma.ko + kernel/drivers/nvme/target/nvmet-tcp.ko +-kernel/drivers/scsi/mpi3mr/mpi3mr.ko +-kernel/drivers/uio/uio.ko +-kernel/drivers/uio/uio_pci_generic.ko -kernel/drivers/vfio/pci/vfio-pci-core.ko -kernel/drivers/vfio/pci/vfio-pci.ko -kernel/drivers/vfio/vfio_iommu_type1.ko @@ -56,17 +65,18 @@ index 3b07203..b5c35b8 100644 kernel/net/openvswitch/vport-gre.ko kernel/net/tls/tls.ko diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go -index 8380996..46c270d 100644 +index 0d7b938..bd8a65f 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -14,7 +14,7 @@ import ( const ( // DefaultKernelVersion is the default Linux kernel version. -- DefaultKernelVersion = "6.6.36-talos" +- DefaultKernelVersion = "6.6.49-talos" + DefaultKernelVersion = "6.11.0-rc1-talos" // KernelModulesPath is the default path to the kernel modules without the kernel version. KernelModulesPath = "/lib/modules" -- -2.45.2 +2.46.0 + diff --git a/installer/Dockerfile b/installer/Dockerfile index a043332..97fd6f8 100644 --- a/installer/Dockerfile +++ b/installer/Dockerfile @@ -31,7 +31,7 @@ ARG VERSION ARG IMAGE_NAME="talos-orangepi5-installer" ARG IMAGE_TITLE="Talos Orange Pi 5 Installer" ARG IMAGE_DESCRIPTION=$IMAGE_TITLE -ARG IMAGE_SOURCE="https://github.com/si0ls/talos-orangepi5" +ARG IMAGE_SOURCE="https://github.com/schneid-l/talos-orangepi5" ARG IMAGE_AUTHORS="Louis S. " ARG IMAGE_VENDOR=$IMAGE_AUTHORS ARG IMAGE_VERSION=$VERSION diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 74ef88a..4c61329 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -93,7 +93,7 @@ ARG KERNEL_VERSION=6.10 ARG IMAGE_NAME="talos-orangepi5-kernel" ARG IMAGE_TITLE="Talos Orange Pi 5 Kernel" ARG IMAGE_DESCRIPTION=$IMAGE_TITLE -ARG IMAGE_SOURCE="https://github.com/si0ls/talos-orangepi5" +ARG IMAGE_SOURCE="https://github.com/schneid-l/talos-orangepi5" ARG IMAGE_AUTHORS="Louis S. " ARG IMAGE_VENDOR="The Linux Foundation" ARG IMAGE_VERSION=$KERNEL_VERSION diff --git a/kernel/config b/kernel/config index 1536186..02acf0b 100644 --- a/kernel/config +++ b/kernel/config @@ -1348,7 +1348,7 @@ CONFIG_NFT_HASH=y # CONFIG_NFT_XFRM is not set # CONFIG_NFT_SOCKET is not set # CONFIG_NFT_OSF is not set -# CONFIG_NFT_TPROXY is not set +CONFIG_NFT_TPROXY=y # CONFIG_NFT_SYNPROXY is not set CONFIG_NF_DUP_NETDEV=y CONFIG_NFT_DUP_NETDEV=y @@ -1865,8 +1865,9 @@ CONFIG_PCIEAER=y # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y -# CONFIG_PCIE_DPC is not set -# CONFIG_PCIE_PTM is not set +CONFIG_PCIE_DPC=y +CONFIG_PCIE_PTM=y +CONFIG_PCIE_EDR=y CONFIG_PCI_MSI=y CONFIG_PCI_QUIRKS=y # CONFIG_PCI_DEBUG is not set @@ -1980,7 +1981,7 @@ CONFIG_PCIE_QCOM=y CONFIG_PCI_ENDPOINT=y CONFIG_PCI_ENDPOINT_CONFIGFS=y # CONFIG_PCI_EPF_TEST is not set -# CONFIG_PCI_EPF_NTB is not set +CONFIG_PCI_EPF_NTB=y # end of PCI Endpoint # @@ -2323,7 +2324,7 @@ CONFIG_BLK_DEV_RBD=y # # NVME Support # -CONFIG_NVME_AUTH=m +CONFIG_NVME_AUTH=y CONFIG_NVME_CORE=y CONFIG_BLK_DEV_NVME=y CONFIG_NVME_MULTIPATH=y @@ -7046,7 +7047,17 @@ CONFIG_DMABUF_HEAPS_SYSTEM=y CONFIG_DMABUF_HEAPS_CMA=y # end of DMABUF options -# CONFIG_UIO is not set +CONFIG_UIO=y +# CONFIG_UIO_CIF is not set +# CONFIG_UIO_PDRV_GENIRQ is not set +# CONFIG_UIO_DMEM_GENIRQ is not set +# CONFIG_UIO_AEC is not set +# CONFIG_UIO_SERCOS3 is not set +CONFIG_UIO_PCI_GENERIC=y +# CONFIG_UIO_NETX is not set +# CONFIG_UIO_PRUSS is not set +# CONFIG_UIO_MF624 is not set +# CONFIG_UIO_HV_GENERIC is not set CONFIG_VFIO=m CONFIG_VFIO_GROUP=y CONFIG_VFIO_CONTAINER=y diff --git a/kernel/config.talos b/kernel/config.talos index bddabb3..ab2b86e 100644 --- a/kernel/config.talos +++ b/kernel/config.talos @@ -1313,7 +1313,7 @@ CONFIG_NFT_HASH=y # CONFIG_NFT_XFRM is not set # CONFIG_NFT_SOCKET is not set # CONFIG_NFT_OSF is not set -# CONFIG_NFT_TPROXY is not set +CONFIG_NFT_TPROXY=y # CONFIG_NFT_SYNPROXY is not set CONFIG_NF_DUP_NETDEV=y CONFIG_NFT_DUP_NETDEV=y @@ -1825,8 +1825,9 @@ CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y -# CONFIG_PCIE_DPC is not set -# CONFIG_PCIE_PTM is not set +CONFIG_PCIE_DPC=y +CONFIG_PCIE_PTM=y +CONFIG_PCIE_EDR=y CONFIG_PCI_MSI=y CONFIG_PCI_QUIRKS=y # CONFIG_PCI_DEBUG is not set @@ -1936,7 +1937,7 @@ CONFIG_PCIE_QCOM=y CONFIG_PCI_ENDPOINT=y CONFIG_PCI_ENDPOINT_CONFIGFS=y # CONFIG_PCI_EPF_TEST is not set -# CONFIG_PCI_EPF_NTB is not set +CONFIG_PCI_EPF_NTB=y # end of PCI Endpoint # @@ -6365,7 +6366,17 @@ CONFIG_SYNC_FILE=y # CONFIG_DMABUF_SYSFS_STATS is not set # end of DMABUF options -# CONFIG_UIO is not set +CONFIG_UIO=y +# CONFIG_UIO_CIF is not set +# CONFIG_UIO_PDRV_GENIRQ is not set +# CONFIG_UIO_DMEM_GENIRQ is not set +# CONFIG_UIO_AEC is not set +# CONFIG_UIO_SERCOS3 is not set +CONFIG_UIO_PCI_GENERIC=y +# CONFIG_UIO_NETX is not set +# CONFIG_UIO_PRUSS is not set +# CONFIG_UIO_MF624 is not set +# CONFIG_UIO_HV_GENERIC is not set CONFIG_VFIO=m CONFIG_VFIO_GROUP=y CONFIG_VFIO_CONTAINER=y