From 4a4733354b6bb45fcabfb6e17259b05c9bc9db58 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 29 Aug 2023 16:12:15 +0200 Subject: [PATCH] kernel: Use Buildroot's default kernel (6.1.y) Our custom version has gone from being newer than Buildroot's default to being older, so there is no reason for us override it anymore. The kernel has become a bit more picky and will give nasty error messages if a link's PHY connection is not explicitly defined, but instead relies on implicit defaults. This was missing from the CPU port of the CRB, so we supply a small patch to fix that. --- configs/aarch64_classic_defconfig | 2 -- configs/aarch64_defconfig | 2 -- configs/x86_64_classic_defconfig | 2 -- configs/x86_64_defconfig | 2 -- configs/x86_64_minimal_defconfig | 2 -- patches/linux/marvell-cn9130-crb-dts-fix.patch | 16 ++++++++++++++++ 6 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 patches/linux/marvell-cn9130-crb-dts-fix.patch diff --git a/configs/aarch64_classic_defconfig b/configs/aarch64_classic_defconfig index 6500f7bc..002b4672 100644 --- a/configs/aarch64_classic_defconfig +++ b/configs/aarch64_classic_defconfig @@ -21,8 +21,6 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/classic/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19.17" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 05a23fc9..95cd457f 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -23,8 +23,6 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/netconf/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19.17" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/x86_64_classic_defconfig b/configs/x86_64_classic_defconfig index 930048ac..aaccc074 100644 --- a/configs/x86_64_classic_defconfig +++ b/configs/x86_64_classic_defconfig @@ -20,8 +20,6 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/classic/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19.17" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig index 694c39eb..1beed79d 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_defconfig @@ -22,8 +22,6 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/netconf/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19.17" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/x86_64_minimal_defconfig b/configs/x86_64_minimal_defconfig index f0a54cf6..2bf169c4 100644 --- a/configs/x86_64_minimal_defconfig +++ b/configs/x86_64_minimal_defconfig @@ -22,8 +22,6 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/netconf/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19.17" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/patches/linux/marvell-cn9130-crb-dts-fix.patch b/patches/linux/marvell-cn9130-crb-dts-fix.patch new file mode 100644 index 00000000..c506312d --- /dev/null +++ b/patches/linux/marvell-cn9130-crb-dts-fix.patch @@ -0,0 +1,16 @@ +Index: linux-6.1.32/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi +=================================================================== +--- linux-6.1.32.orig/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi ++++ linux-6.1.32/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi +@@ -284,6 +284,11 @@ + reg = <10>; + label = "cpu"; + ethernet = <&cp0_eth0>; ++ phy-mode = "10gbase-r"; ++ fixed-link { ++ speed = <10000>; ++ full-duplex; ++ }; + }; + + };