From 7954383391a8c6d3befc53ed6a1f483a69d8c73b Mon Sep 17 00:00:00 2001 From: Vicentiu Galanopulo Date: Tue, 29 Oct 2019 16:20:30 +0100 Subject: [PATCH 1/2] linux-mainline_%.bbappend: Add kernel config for configfs Customer requested i2c and UART enabled on the orange pi zero. The directory /sys/kernel/config/device-tree which is used to add overlays at runtime is not present in the file system. This patch enables configfs and generation of the needed directory. Changelog-entry: Add configs in the kernel to enable configfs Signed-off-by: Vicentiu Galanopulo --- .../recipes-kernel/linux/linux-mainline_%.bbappend | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend index 8ef406e..357a4a3 100644 --- a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend +++ b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend @@ -67,6 +67,16 @@ RESIN_CONFIGS[8189fs] ?= " \ CONFIG_RTL8189FS=m \ " +RESIN_CONFIGS_append = " \ + configfs \ +" + +RESIN_CONFIGS[configfs] = " \ + CONFIG_OF_CONFIGFS=y \ + CONFIG_OF_OVERLAY=y \ + CONFIG_CONFIGFS_FS=m \ +" + FILES_${PN}-fixup-scr = " \ /boot/sun8i-h3-fixup.scr \ " From e32f34f65ba46888c6cd8cc0a22c6b87040e8cda Mon Sep 17 00:00:00 2001 From: Vicentiu Galanopulo Date: Wed, 30 Oct 2019 14:42:52 +0100 Subject: [PATCH 2/2] u-boot_2019.04.bbappend: Fix applying of patches The eMMC patch has been removed because it applies from meta-sunxi. The resin-kconfig-integration patch has been removed and a re-worked version of it has been applied. Changelog-entry: U-boot patches fixup Signed-off-by: Vicentiu Galanopulo --- .../recipes-bsp/u-boot/u-boot_2019.04.bbappend | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2019.04.bbappend b/layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2019.04.bbappend index d675858..59903d7 100644 --- a/layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2019.04.bbappend +++ b/layers/meta-balena-allwinner/recipes-bsp/u-boot/u-boot_2019.04.bbappend @@ -3,17 +3,15 @@ inherit resin-u-boot pythonnative FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -#remove the resin-specific-env-integration-kconfig.patch patch from meta-resin -#and the 0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch patch from -#meta-sunxi because these fail to apply -SRC_URI_remove = "file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \ - file://resin-specific-env-integration-kconfig.patch" +# remove the resin-specific-env-integration-kconfig.patch patch from meta-resin +# because it fails to apply +SRC_URI_remove = "file://resin-specific-env-integration-kconfig.patch" -#Add updated patches for 0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch -#and for 0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch -SRC_URI += "file://0001-Add-Resin-specific-boot-command.patch \ - file://resin-specific-env-integration-kconfig.patch \ - " +# Add re-worked patch which was previously removed +SRC_URI_append = " \ + file://0001-Add-Resin-specific-boot-command.patch \ + file://resin-specific-env-integration-kconfig_reworked.patch \ + " do_deploy_append() { install -m 0644 ${WORKDIR}/armbianEnv.txt ${DEPLOYDIR}/armbianEnv.txt