configs/minnowboard_max_defconfig: bump kernel to 5.10.11
PATCH 1/3 configs/minnowboard_max_defconfig: bump kernel to 5.10.11
Explicitly enable PCI support in the kernel after commit eb01d42a77785 (PCI:
consolidate PCI config entry in drivers/pci) and change to GPT partitions / root=PARTLABEL to find the rootfs instead of hardcoding /dev/mmcblk2p2 as the mmc probing order has changed since commit 21b2cec61c04bd1 (mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.4).
This has the additional advantage that the same image will work when written to a USB drive instead of a microsd.
--- board/minnowboard/genimage.cfg | 5 +++-- board/minnowboard/grub.cfg | 2 +- board/minnowboard/linux.config | 1 + configs/minnowboard_max_defconfig | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-)
board/minnowboard/genimage.cfg +3 -2
@@ -19,15 +19,16 @@ image efi-part.vfat { # * the efi-partition created above image sdcard.img { hdimage { + gpt = true } partition boot { - partition-type = 0xEF + partition-type-uuid = U image = "efi-part.vfat" } partition rootfs { - partition-type = 0x83 + partition-type-uuid = L image = "rootfs.ext4" size = 512M }
board/minnowboard/grub.cfg +1 -1
@@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /bzImage root=/dev/mmcblk2p2 rootwait console=tty0 console=ttyS0,115200 + linux /bzImage root=PARTLABEL=rootfs rootwait console=tty0 console=ttyS0,115200 }
board/minnowboard/linux.config +1 -0
@@ -14,6 +14,7 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y +CONFIG_PCI=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_SG=y CONFIG_ATA=y
configs/minnowboard_max_defconfig +3 -3
@@ -8,8 +8,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for grub2 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
@@ -24,7 +24,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config"
Signature · 1 line
2.20.1
PATCH 2/3 configs/minnowboard_max-graphical_defconfig: bump kernel to 5.10.11
To match minnowboard_max_defconfig.
--- configs/minnowboard_max-graphical_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
configs/minnowboard_max-graphical_defconfig +2 -2
@@ -3,7 +3,7 @@ BR2_x86_64=y BR2_x86_silvermont=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_TOOLCHAIN_BUILDROOT_CXX=y # needed for TARGET_GRUB2
@@ -24,7 +24,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # Linux BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config"
Signature · 1 line
2.20.1
PATCH 3/3 board/minnowboard: grub.cfg: disable eudev network interface renaming
In reply to Peter KorsgaardSo the normal DHCP-on-eth0 logic works for the graphical defconfig where eudev is used.
--- board/minnowboard/grub.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/minnowboard/grub.cfg +1 -1
@@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /bzImage root=PARTLABEL=rootfs rootwait console=tty0 console=ttyS0,115200 + linux /bzImage root=PARTLABEL=rootfs rootwait console=tty0 console=ttyS0,115200 net.ifnames=0 }
Signature · 1 line
2.20.1
PATCH 1/3 configs/minnowboard_max_defconfig: bump kernel to 5.10.11
In reply to Peter KorsgaardQuoted 9 lines · On Sat, 30 Jan 2021 11:19:13 +0100 Peter Korsgaard <[email protected]> wrote:
Explicitly enable PCI support in the kernel after commit
eb01d42a77785(PCI:
consolidate PCI config entry indrivers/pci) and change to GPT partitions / root=PARTLABEL to find the rootfs instead of hardcoding/dev/mmcblk2p2as the mmc probing order has changed since commit21b2cec61c04bd1(mmc: SetPROBE_PREFER_ASYNCHRONOUSfor drivers that existed in v4.4).This has the additional advantage that the same image will work when written to a USB drive instead of a microsd.
Quoted 7 lines
Signed-off-by Peter Korsgaard <[email protected]>--- board/minnowboard/genimage.cfg | 5 +++-- board/minnowboard/grub.cfg | 2 +- board/minnowboard/linux.config | 1 + configs/minnowboard_max_defconfig | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-)
Series applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com