Message ID | 20211218163742.13297-1-peter@korsgaard.com |
---|---|
State | Accepted |
Headers | show |
Series | configs/roseapplypi_defconfig: bump kernel to 5.15.10 | expand |
Peter, All, On 2021-12-18 17:37 +0100, Peter Korsgaard spake thusly: > The kernel now has support for dma, ethernet, i2c, mmc, pinctrl, regulator, > so enable drivers for those, change to a ext4 rootfs and enable DHCP on > eth0. > > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Applied to master, thanks. Will we at some point be able to drop our custom kernel config file, and use an upstream defconfig instead? Regards, Yann E. MORIN. > --- > board/roseapplepi/genimage.cfg | 6 ++++++ > board/roseapplepi/linux.config | 25 +++++++++++++++++++++++++ > board/roseapplepi/uEnv.txt | 2 +- > configs/roseapplepi_defconfig | 7 ++++--- > 4 files changed, 36 insertions(+), 4 deletions(-) > > diff --git a/board/roseapplepi/genimage.cfg b/board/roseapplepi/genimage.cfg > index f1bceb0ede..4c5a8de902 100644 > --- a/board/roseapplepi/genimage.cfg > +++ b/board/roseapplepi/genimage.cfg > @@ -36,4 +36,10 @@ image sdcard.img { > bootable = "true" > image = "boot.vfat" > } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + size = 512M > + } > } > diff --git a/board/roseapplepi/linux.config b/board/roseapplepi/linux.config > index aea48b7730..89e7c8917f 100644 > --- a/board/roseapplepi/linux.config > +++ b/board/roseapplepi/linux.config > @@ -26,19 +26,44 @@ CONFIG_INET=y > # CONFIG_IPV6 is not set > # CONFIG_WIRELESS is not set > # CONFIG_ETHTOOL_NETLINK is not set > +CONFIG_NETDEVICES=y > +CONFIG_OWL_EMAC=y > +CONFIG_REALTEK_PHY=y > +CONFIG_INPUT_EVDEV=y > +CONFIG_INPUT_MISC=y > +CONFIG_INPUT_ATC260X_ONKEY=y > # CONFIG_VT is not set > CONFIG_SERIAL_OWL=y > # CONFIG_HW_RANDOM is not set > +CONFIG_I2C=y > +CONFIG_I2C_CHARDEV=y > +CONFIG_I2C_OWL=y > +CONFIG_PINCTRL=y > +CONFIG_PINCTRL_OWL=y > +CONFIG_PINCTRL_S500=y > +CONFIG_POWER_RESET=y > +CONFIG_POWER_RESET_ATC260X=y > +CONFIG_MFD_ATC260X_I2C=y > +CONFIG_REGULATOR=y > +CONFIG_REGULATOR_FIXED_VOLTAGE=y > +CONFIG_REGULATOR_ATC260X=y > # CONFIG_HID is not set > # CONFIG_USB_SUPPORT is not set > +CONFIG_MMC=y > +CONFIG_MMC_OWL=y > +CONFIG_DMADEVICES=y > +CONFIG_OWL_DMA=y > # CONFIG_VIRTIO_MENU is not set > # CONFIG_VHOST_MENU is not set > # CONFIG_IOMMU_SUPPORT is not set > CONFIG_EXT4_FS=y > +CONFIG_VFAT_FS=y > CONFIG_TMPFS=y > CONFIG_TMPFS_POSIX_ACL=y > # CONFIG_MISC_FILESYSTEMS is not set > # CONFIG_NETWORK_FILESYSTEMS is not set > +CONFIG_NLS_CODEPAGE_437=y > +CONFIG_NLS_ISO8859_1=y > # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set > # CONFIG_CRYPTO_HW is not set > # CONFIG_FTRACE is not set > diff --git a/board/roseapplepi/uEnv.txt b/board/roseapplepi/uEnv.txt > index 2b9de727b4..339eb8aa0a 100644 > --- a/board/roseapplepi/uEnv.txt > +++ b/board/roseapplepi/uEnv.txt > @@ -1,3 +1,3 @@ > # no ramdisk > ramdisk_addr_r=- > -bootargs=console=ttyOWL2,115200 > +bootargs=console=ttyOWL2,115200 root=/dev/mmcblk0p2 rootwait clk_ignore_unused > diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig > index 2af94d010b..f4efacf80d 100644 > --- a/configs/roseapplepi_defconfig > +++ b/configs/roseapplepi_defconfig > @@ -3,15 +3,16 @@ BR2_cortex_a9=y > BR2_ARM_ENABLE_NEON=y > BR2_ARM_ENABLE_VFP=y > BR2_GLOBAL_PATCH_DIR="board/roseapplepi/patches" > -# Linux headers same as kernel, a 5.10 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +# Linux headers same as kernel, a 5.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y > +BR2_SYSTEM_DHCP="eth0" > BR2_ROOTFS_POST_BUILD_SCRIPT="board/roseapplepi/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.1" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.10" > BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config" > BR2_LINUX_KERNEL_UIMAGE=y > -- > 2.20.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes: > Peter, All, > On 2021-12-18 17:37 +0100, Peter Korsgaard spake thusly: >> The kernel now has support for dma, ethernet, i2c, mmc, pinctrl, regulator, >> so enable drivers for those, change to a ext4 rootfs and enable DHCP on >> eth0. >> >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> > Applied to master, thanks. > Will we at some point be able to drop our custom kernel config file, and > use an upstream defconfig instead? Possibly yes. Basic owl support was added to multi_v7_defconfig with: commit 26ba4a474aec5998e52826319c4d7a1c98e8fab5 Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Date: Thu Jan 21 11:44:47 2021 +0530 ARM: multi_v7_defconfig: Enable Actions Semi platform and drivers The support for Actions Semi ARM32 platform has matured enough in the mainline. So let's enable it in multi_v7_defconfig along with the relevant drivers. The platform can now boot a distro from eMMC or uSD without any out of tree patch. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=26ba4a474aec5998e52826319c4d7a1c98e8fab5 I haven't given it a try yet though. I'll try to find some time to do it.
diff --git a/board/roseapplepi/genimage.cfg b/board/roseapplepi/genimage.cfg index f1bceb0ede..4c5a8de902 100644 --- a/board/roseapplepi/genimage.cfg +++ b/board/roseapplepi/genimage.cfg @@ -36,4 +36,10 @@ image sdcard.img { bootable = "true" image = "boot.vfat" } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } } diff --git a/board/roseapplepi/linux.config b/board/roseapplepi/linux.config index aea48b7730..89e7c8917f 100644 --- a/board/roseapplepi/linux.config +++ b/board/roseapplepi/linux.config @@ -26,19 +26,44 @@ CONFIG_INET=y # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set # CONFIG_ETHTOOL_NETLINK is not set +CONFIG_NETDEVICES=y +CONFIG_OWL_EMAC=y +CONFIG_REALTEK_PHY=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_ATC260X_ONKEY=y # CONFIG_VT is not set CONFIG_SERIAL_OWL=y # CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_OWL=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_OWL=y +CONFIG_PINCTRL_S500=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_ATC260X=y +CONFIG_MFD_ATC260X_I2C=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_ATC260X=y # CONFIG_HID is not set # CONFIG_USB_SUPPORT is not set +CONFIG_MMC=y +CONFIG_MMC_OWL=y +CONFIG_DMADEVICES=y +CONFIG_OWL_DMA=y # CONFIG_VIRTIO_MENU is not set # CONFIG_VHOST_MENU is not set # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT4_FS=y +CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y # CONFIG_MISC_FILESYSTEMS is not set # CONFIG_NETWORK_FILESYSTEMS is not set +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set # CONFIG_CRYPTO_HW is not set # CONFIG_FTRACE is not set diff --git a/board/roseapplepi/uEnv.txt b/board/roseapplepi/uEnv.txt index 2b9de727b4..339eb8aa0a 100644 --- a/board/roseapplepi/uEnv.txt +++ b/board/roseapplepi/uEnv.txt @@ -1,3 +1,3 @@ # no ramdisk ramdisk_addr_r=- -bootargs=console=ttyOWL2,115200 +bootargs=console=ttyOWL2,115200 root=/dev/mmcblk0p2 rootwait clk_ignore_unused diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index 2af94d010b..f4efacf80d 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -3,15 +3,16 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_GLOBAL_PATCH_DIR="board/roseapplepi/patches" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/roseapplepi/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/roseapplepi/linux.config" BR2_LINUX_KERNEL_UIMAGE=y
The kernel now has support for dma, ethernet, i2c, mmc, pinctrl, regulator, so enable drivers for those, change to a ext4 rootfs and enable DHCP on eth0. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- board/roseapplepi/genimage.cfg | 6 ++++++ board/roseapplepi/linux.config | 25 +++++++++++++++++++++++++ board/roseapplepi/uEnv.txt | 2 +- configs/roseapplepi_defconfig | 7 ++++--- 4 files changed, 36 insertions(+), 4 deletions(-)