From bcc500fb65581ebdb18f14169ff0967d2081e30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Burdukiewicz?= Date: Thu, 22 Oct 2020 19:27:53 +0200 Subject: [PATCH 1/5] linux-mainline: added 5.9.1 kernel. --- recipes-kernel/linux/linux-mainline_5.9.1.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 recipes-kernel/linux/linux-mainline_5.9.1.bb diff --git a/recipes-kernel/linux/linux-mainline_5.9.1.bb b/recipes-kernel/linux/linux-mainline_5.9.1.bb new file mode 100644 index 0000000..290e1d1 --- /dev/null +++ b/recipes-kernel/linux/linux-mainline_5.9.1.bb @@ -0,0 +1,9 @@ +require linux-mainline.inc + +DESCRIPTION = "Mainline Stable Linux kernel" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +SRC_URI[md5sum] = "199f037b5adc4ca158dc281b60a226f6" +SRC_URI[sha256sum] = "ba4a11e93896305835c630969cf330ae808b0e43f09b375b510cde1bd0efc036" From eaf085f87f504e52372bce4adc052357e2fbb366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Burdukiewicz?= Date: Thu, 22 Oct 2020 19:30:01 +0200 Subject: [PATCH 2/5] conf: added sunxi and sunxi64 machine overrides. --- conf/machine/include/sunxi.inc | 2 ++ conf/machine/include/sunxi64.inc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/conf/machine/include/sunxi.inc b/conf/machine/include/sunxi.inc index b2a74bf..92e2b02 100644 --- a/conf/machine/include/sunxi.inc +++ b/conf/machine/include/sunxi.inc @@ -1,6 +1,8 @@ SOC_FAMILY ??= "" include conf/machine/include/soc-family.inc +MACHINEOVERRIDES =. "sunxi:" + # Sub-architecture support MACHINE_SOCARCH_SUFFIX ?= "" MACHINE_SOCARCH_SUFFIX_sun4i = "-sun4i" diff --git a/conf/machine/include/sunxi64.inc b/conf/machine/include/sunxi64.inc index dc8b92d..d7ef8f2 100644 --- a/conf/machine/include/sunxi64.inc +++ b/conf/machine/include/sunxi64.inc @@ -1,6 +1,8 @@ SOC_FAMILY ??= "" include conf/machine/include/soc-family.inc +MACHINEOVERRIDES =. "sunxi:sunxi64:" + PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline" PREFERRED_PROVIDER_u-boot ?= "u-boot" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" From 636b3b74d7719f225bb649644d9c6d321f4b34a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Burdukiewicz?= Date: Thu, 22 Oct 2020 19:30:32 +0200 Subject: [PATCH 3/5] u-boot: don't override u-boot configuration when building for other machines. --- recipes-bsp/u-boot/u-boot_%.bbappend | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 9305d77..979dfe8 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS_prepend_sunxi := "${THISDIR}/files:" -DEPENDS += " bc-native dtc-native swig-native python3-native flex-native bison-native " +DEPENDS_append_sunxi = " bc-native dtc-native swig-native python3-native flex-native bison-native " DEPENDS_append_sun50i = " atf-sunxi " COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)" @@ -11,19 +11,19 @@ DEFAULT_PREFERENCE_sun7i="1" DEFAULT_PREFERENCE_sun8i="1" DEFAULT_PREFERENCE_sun50i="1" -SRC_URI += " \ +SRC_URI_append_sunxi = " \ file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \ file://boot.cmd \ " -UBOOT_ENV_SUFFIX = "scr" -UBOOT_ENV = "boot" +UBOOT_ENV_SUFFIX_sunxi = "scr" +UBOOT_ENV_sunxi = "boot" -EXTRA_OEMAKE += ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" ' +EXTRA_OEMAKE_append_sunxi = ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" ' EXTRA_OEMAKE_append_sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin " do_compile_sun50i[depends] += "atf-sunxi:do_deploy" -do_compile_append() { +do_compile_append_sunxi() { ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY} } From 9396098deff81c4c0637e118c67283961b5a1fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Burdukiewicz?= Date: Thu, 22 Oct 2020 20:54:26 +0200 Subject: [PATCH 4/5] layer: added support for upcomming gatesgarth release. --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index 5ea199d..a9d19c0 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -14,4 +14,4 @@ LAYERVERSION_meta-sunxi = "1" LAYERDEPENDS_meta-sunxi = "core openembedded-layer" -LAYERSERIES_COMPAT_meta-sunxi = "zeus dunfell" +LAYERSERIES_COMPAT_meta-sunxi = "zeus dunfell gatesgarth" From 3f6dcb3d08293c531ca0bca8c7ad60936eb4e357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Burdukiewicz?= Date: Fri, 23 Oct 2020 00:08:17 +0200 Subject: [PATCH 5/5] u-boot: don't override COMPATIBLE_MACHINE. --- recipes-bsp/u-boot/u-boot_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 979dfe8..f6acd3b 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend_sunxi := "${THISDIR}/files:" DEPENDS_append_sunxi = " bc-native dtc-native swig-native python3-native flex-native bison-native " DEPENDS_append_sun50i = " atf-sunxi " -COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)" +COMPATIBLE_MACHINE_sunxi = "(sun4i|sun5i|sun7i|sun8i|sun50i)" DEFAULT_PREFERENCE_sun4i="1" DEFAULT_PREFERENCE_sun5i="1"