mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-01 06:21:56 -09:00
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. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
ded7b29e5e
commit
552cafd7a8
@@ -19,15 +19,16 @@ image efi-part.vfat {
|
|||||||
# * the efi-partition created above
|
# * the efi-partition created above
|
||||||
image sdcard.img {
|
image sdcard.img {
|
||||||
hdimage {
|
hdimage {
|
||||||
|
gpt = true
|
||||||
}
|
}
|
||||||
|
|
||||||
partition boot {
|
partition boot {
|
||||||
partition-type = 0xEF
|
partition-type-uuid = U
|
||||||
image = "efi-part.vfat"
|
image = "efi-part.vfat"
|
||||||
}
|
}
|
||||||
|
|
||||||
partition rootfs {
|
partition rootfs {
|
||||||
partition-type = 0x83
|
partition-type-uuid = L
|
||||||
image = "rootfs.ext4"
|
image = "rootfs.ext4"
|
||||||
size = 512M
|
size = 512M
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ set default="0"
|
|||||||
set timeout="5"
|
set timeout="5"
|
||||||
|
|
||||||
menuentry "Buildroot" {
|
menuentry "Buildroot" {
|
||||||
linux /bzImage root=/dev/mmcblk2p2 rootwait console=tty0 console=ttyS0,115200
|
linux /bzImage root=PARTLABEL=rootfs rootwait console=tty0 console=ttyS0,115200
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ CONFIG_NET=y
|
|||||||
CONFIG_PACKET=y
|
CONFIG_PACKET=y
|
||||||
CONFIG_UNIX=y
|
CONFIG_UNIX=y
|
||||||
CONFIG_INET=y
|
CONFIG_INET=y
|
||||||
|
CONFIG_PCI=y
|
||||||
CONFIG_BLK_DEV_SD=y
|
CONFIG_BLK_DEV_SD=y
|
||||||
CONFIG_CHR_DEV_SG=y
|
CONFIG_CHR_DEV_SG=y
|
||||||
CONFIG_ATA=y
|
CONFIG_ATA=y
|
||||||
|
|||||||
@@ -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_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg"
|
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg"
|
||||||
|
|
||||||
# Linux headers same as kernel, a 4.19 series
|
# Linux headers same as kernel, a 5.10 series
|
||||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
|
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
|
||||||
# Needed for grub2
|
# Needed for grub2
|
||||||
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
|
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
|
|||||||
# Linux kernel
|
# Linux kernel
|
||||||
BR2_LINUX_KERNEL=y
|
BR2_LINUX_KERNEL=y
|
||||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=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_USE_CUSTOM_CONFIG=y
|
||||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config"
|
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user