diff --git a/conf/machine/mangopi-mq-pro.conf b/conf/machine/mangopi-mq-pro.conf index f7b0f29..9ff3ca6 100644 --- a/conf/machine/mangopi-mq-pro.conf +++ b/conf/machine/mangopi-mq-pro.conf @@ -11,7 +11,7 @@ KERNEL_CLASSES = "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" UBOOT_ENV ?= "boot" UBOOT_ENV_SUFFIX = "scr.uimg" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-mangopimqpro-dev" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-allwinnerd1-dev" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-mangopimqpro" PREFERRED_VERSION_openocd-native = "riscv" @@ -71,3 +71,12 @@ IMAGE_BOOT_FILES ?= " \ " WKS_FILE ?= "nezha.wks" + +KERNEL_MODULE_AUTOLOAD:append = " hci_uart 8723ds " + +# FIXME +# TODO Should be changed to +# https://github.com/smaeul/u-boot/commit/528ae9bc6c55edd3ffe642734b4132a8246ea777#diff-7a77df959a917850f0b29cd98afe6c3ca6de627a0c52dd9983cd42fede7a0e34 +# once it's is merged into kernel too +# mangopi_mq_pro_defconfig +KBUILD_DEFCONFIG = "nezha_defconfig" diff --git a/conf/machine/nezha-allwinner-d1.conf b/conf/machine/nezha-allwinner-d1.conf index 033464f..40a01fa 100644 --- a/conf/machine/nezha-allwinner-d1.conf +++ b/conf/machine/nezha-allwinner-d1.conf @@ -11,7 +11,7 @@ KERNEL_CLASSES = "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" UBOOT_ENV ?= "boot" UBOOT_ENV_SUFFIX = "scr.uimg" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-nezha-dev" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-allwinnerd1-dev" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-nezha" PREFERRED_VERSION_openocd-native = "riscv" @@ -65,3 +65,4 @@ IMAGE_BOOT_FILES ?= " \ " WKS_FILE ?= "nezha.wks" +KBUILD_DEFCONFIG = "nezha_defconfig" diff --git a/recipes-kernel/linux/linux-allwinnerd1-dev.bb b/recipes-kernel/linux/linux-allwinnerd1-dev.bb new file mode 100644 index 0000000..d2ecd01 --- /dev/null +++ b/recipes-kernel/linux/linux-allwinnerd1-dev.bb @@ -0,0 +1,37 @@ +require recipes-kernel/linux/linux-mainline-common.inc + +SUMMARY = "Allwinner D1 dev kernel recipe" +SRCREV_meta ?= "b7fc5d5cecaad5d97164bac8db5b5ee72f563bb0" +SRCREV_machine ?= "ca67838d84af4c9f85d06311c9e98e1adf46308f" +FORK ?= "smaeul" +BRANCH ?= "riscv/d1-wip" +KMETA = "kernel-meta" + +# It is necessary to add to SRC_URI link to the 'yocto-kernel-cache' due to +# override of the original SRC_URI: +# "do_kernel_metadata: Check the SRC_URI for meta-data repositories or +# directories that may be missing" +SRC_URI = "git://github.com/${FORK}/linux.git;name=machine;protocol=https;branch=${BRANCH} \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=master;destsuffix=${KMETA} \ + " + +SRC_URI:append:mangopi-mq-pro = " \ + file://mangopi-mq-pro.cfg \ + file://0001-Bluetooth-Add-new-quirk-for-broken-local-ext-feature.patch \ + file://0002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch \ + file://0003-drivers-net-bluetooth-Enable-quirk-for-broken-local-.patch \ + " +# +LINUX_VERSION ?= "6.1.0" +KERNEL_FEATURES += "features/cgroups/cgroups.cfg" +KERNEL_FEATURES += "ktypes/standard/standard.cfg" + +KERNEL_VERSION_SANITY_SKIP="1" + +COMPATIBLE_MACHINE = "(nezha-allwinner-d1|mangopi-mq-pro)" +LINUX_VERSION_EXTENSION:append:nezha-allwinner-d1 = "-nezha" +LINUX_VERSION_EXTENSION:append:mangopi-mq-pro = "-mangopi" + + +## Should be oveerriten in machine conf +KBUILD_DEFCONFIG ?= "allwinner_defconfig" diff --git a/recipes-kernel/linux/linux-mangopimqpro-dev/0001-Bluetooth-Add-new-quirk-for-broken-local-ext-feature.patch b/recipes-kernel/linux/linux-allwinnerd1-dev/0001-Bluetooth-Add-new-quirk-for-broken-local-ext-feature.patch similarity index 100% rename from recipes-kernel/linux/linux-mangopimqpro-dev/0001-Bluetooth-Add-new-quirk-for-broken-local-ext-feature.patch rename to recipes-kernel/linux/linux-allwinnerd1-dev/0001-Bluetooth-Add-new-quirk-for-broken-local-ext-feature.patch diff --git a/recipes-kernel/linux/linux-mangopimqpro-dev/0002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch b/recipes-kernel/linux/linux-allwinnerd1-dev/0002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch similarity index 100% rename from recipes-kernel/linux/linux-mangopimqpro-dev/0002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch rename to recipes-kernel/linux/linux-allwinnerd1-dev/0002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch diff --git a/recipes-kernel/linux/linux-mangopimqpro-dev/0003-drivers-net-bluetooth-Enable-quirk-for-broken-local-.patch b/recipes-kernel/linux/linux-allwinnerd1-dev/0003-drivers-net-bluetooth-Enable-quirk-for-broken-local-.patch similarity index 100% rename from recipes-kernel/linux/linux-mangopimqpro-dev/0003-drivers-net-bluetooth-Enable-quirk-for-broken-local-.patch rename to recipes-kernel/linux/linux-allwinnerd1-dev/0003-drivers-net-bluetooth-Enable-quirk-for-broken-local-.patch diff --git a/recipes-kernel/linux/linux-mangopimqpro-dev/mangopi-mq-pro.cfg b/recipes-kernel/linux/linux-allwinnerd1-dev/mangopi-mq-pro.cfg similarity index 100% rename from recipes-kernel/linux/linux-mangopimqpro-dev/mangopi-mq-pro.cfg rename to recipes-kernel/linux/linux-allwinnerd1-dev/mangopi-mq-pro.cfg diff --git a/recipes-kernel/linux/linux-mangopimqpro-dev.bb b/recipes-kernel/linux/linux-mangopimqpro-dev.bb deleted file mode 100644 index 79d9349..0000000 --- a/recipes-kernel/linux/linux-mangopimqpro-dev.bb +++ /dev/null @@ -1,20 +0,0 @@ -require linux-d1-dev.inc - -FILESEXTRAPATHS:prepend = "${FILE_DIRNAME}/linux-nezha:" -SUMMARY = "MangoPi MQ Pro dev kernel recipe" -## TODO Should be changed to -## https://github.com/smaeul/u-boot/commit/528ae9bc6c55edd3ffe642734b4132a8246ea777#diff-7a77df959a917850f0b29cd98afe6c3ca6de627a0c52dd9983cd42fede7a0e34 -## once it's is merged into kernel too -## mangopi_mq_pro_defconfig - -KBUILD_DEFCONFIG = "nezha_defconfig" -COMPATIBLE_MACHINE = "mangopi-mq-pro" - -SRC_URI:append = " \ - file://mangopi-mq-pro.cfg \ - file://0001-Bluetooth-Add-new-quirk-for-broken-local-ext-feature.patch \ - file://0002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch \ - file://0003-drivers-net-bluetooth-Enable-quirk-for-broken-local-.patch \ - " -## Fixme check if features enabled -KERNEL_MODULE_AUTOLOAD:append:mangopi-mq-pro = " hci_uart 8723ds " diff --git a/recipes-kernel/linux/linux-nezha-dev.bb b/recipes-kernel/linux/linux-nezha-dev.bb deleted file mode 100644 index 86c25f2..0000000 --- a/recipes-kernel/linux/linux-nezha-dev.bb +++ /dev/null @@ -1,32 +0,0 @@ -require recipes-kernel/linux/linux-mainline-common.inc -FILESEXTRAPATHS:prepend = "${FILE_DIRNAME}/linux-nezha:" -SUMMARY = "Nezha dev kernel recipe" - -SRCREV_meta ?= "b7fc5d5cecaad5d97164bac8db5b5ee72f563bb0" -SRCREV_machine ?= "ca67838d84af4c9f85d06311c9e98e1adf46308f" -FORK ?= "smaeul" -BRANCH ?= "riscv/d1-wip" -KMETA = "kernel-meta" -KBUILD_DEFCONFIG = "nezha_defconfig" - -# It is necessary to add to SRC_URI link to the 'yocto-kernel-cache' due to -# override of the original SRC_URI: -# "do_kernel_metadata: Check the SRC_URI for meta-data repositories or -# directories that may be missing" -SRC_URI = " \ - git://github.com/${FORK}/linux.git;name=machine;protocol=https;branch=${BRANCH} \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=master;destsuffix=${KMETA} \ - " - -LINUX_VERSION ?= "6.1.0" -LINUX_VERSION_EXTENSION:append = "-nezha" - -KERNEL_FEATURES += "features/cgroups/cgroups.cfg" -KERNEL_FEATURES += "ktypes/standard/standard.cfg" - -# using out-of-tree -#KBUILD_DEFCONFIG = "nezha_defconfig" - -COMPATIBLE_MACHINE = "(nezha-allwinner-d1|mangopi-mq-pro)" - -KERNEL_VERSION_SANITY_SKIP="1"