Re: [yocto] Adding device tree overlay #kirkstone
Hi Daniel,
adding it to IMAGE_BOOT_FILES should do the trick.
Greetz,
Josef
On Sun, Oct 1, 2023 at 10:35 PM wrote:
> Hi,
>
> I am struggling to add a device tree overlay to the linux kernel.
>
> I am on the kirkstone branch and my recipe (linux-raspberrypi_%.bbappend)
> looks like this:
>
>
>
> SRC_URI += "file://my_gpio.dts;subdir=git/arch/${ARCH}/boot/dts/overlays"
>
> FILESEXTRAPATHS:prepend := "${THISDIR}/deviceTree:"
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
>
> KERNEL_DEVICETREE:append = " overlays/my_gpio.dtbo"
>
> In the build/deploy/images folder I can see the generated dtbo file but it
> not copied into /boot/overlays
>
> Does anyone know what I am doing wrong ? Thanks..
>
>
>
>
>
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61185): https://lists.yoctoproject.org/g/yocto/message/61185
Mute This Topic: https://lists.yoctoproject.org/mt/101699891/21656
Mute #kirkstone:https://lists.yoctoproject.org/g/yocto/mutehashtag/kirkstone
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [yocto] [qa-build-notification] QA notification for completed autobuilder build (yocto-4.3_M3.rc9)
Hi all, Intel and WR YP QA is planning for QA execution for YP build yocto-4.3_M3.rc9. We are planning to execute following tests for this cycle: OEQA-manual tests for following module: 1. OE-Core 2. BSP-hw Runtime auto test for following platforms: 1. MinnowBoard Turbot - 32bit 2. Kaby Lake (7th Generation Intel(r) Core(tm) Processors) 3. Tiger Lake (11th Generation Intel(r) Core(tm) Processors) 4. Alder Lake-S (12th Generation Intel(r) Core(tm) Processors) 5. Raptor Lake-P (13th Generation Intel(r) Core(tm) Processors) 6. Beaglebone ETA for completion Friday, October 9th. Please do expect some delay due to holiday in China, will proceed to submit test report once completed. Sorry for any inconvenience caused. Best regards, Jing Hui > -Original Message- > From: qa-build-notificat...@lists.yoctoproject.org notificat...@lists.yoctoproject.org> On Behalf Of Pokybuild User > Sent: Thursday, September 28, 2023 12:01 AM > To: yocto@lists.yoctoproject.org > Cc: qa-build-notificat...@lists.yoctoproject.org > Subject: [qa-build-notification] QA notification for completed autobuilder > build (yocto-4.3_M3.rc9) > > > A build flagged for QA (yocto-4.3_M3.rc9) was completed on the > autobuilder and is available at: > > > https://autobuilder.yocto.io/pub/releases/yocto-4.3_M3.rc9 > > > Build URL: > https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5949 > > Build hash information: > > bitbake: 612bdf09416ff96d08b22cf92b077516d23d0963 > meta-agl: 4a14356a535dcd47f16f788ac830d0d03457c9da > meta-arm: be9bbaa16ed0d60490fb8f915fc48e40d14478a5 > meta-aws: ba6a653f0b5a4fa55e71646f0fe1fd0673d2c947 > meta-intel: cc04677a2717be485bf9cecf4a3d48f8a1e601cc > meta-mingw: 65ef95a74f6ae815f63f636ed53e140a26a014ce > meta-openembedded: c40aebd422e60126c3b18e35c20a1cb38a795a52 > meta-virtualization: b65fe24b8cbcf8797f31d058a79f8a21985e955d > oecore: 1adf70729dafc9729e665986ad2e2250cbd25c5b > poky: 6cb490713ed30f1f13d25978aa0d377ce66b1861 > > > > This is an automated message from the Yocto Project Autobuilder > Git: git://git.yoctoproject.org/yocto-autobuilder2 > Email: richard.pur...@linuxfoundation.org > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61186): https://lists.yoctoproject.org/g/yocto/message/61186 Mute This Topic: https://lists.yoctoproject.org/mt/101708429/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [yocto] [qa-build-notification] QA notification for completed autobuilder build (yocto-4.3_M3.rc9)
On Mon, 2023-10-02 at 09:41 +, Jing Hui Tham wrote: > Hi all, > > Intel and WR YP QA is planning for QA execution for YP build > yocto-4.3_M3.rc9. We are planning to execute following tests for this cycle: > > OEQA-manual tests for following module: > 1. OE-Core > 2. BSP-hw > > Runtime auto test for following platforms: > 1. MinnowBoard Turbot - 32bit > 2. Kaby Lake (7th Generation Intel(r) Core(tm) Processors) > 3. Tiger Lake (11th Generation Intel(r) Core(tm) Processors) > 4. Alder Lake-S (12th Generation Intel(r) Core(tm) Processors) > 5. Raptor Lake-P (13th Generation Intel(r) Core(tm) Processors) > 6. Beaglebone > > > ETA for completion Friday, October 9th. Please do expect some delay due to > holiday in China, will proceed to submit test report once completed. > Sorry for any inconvenience caused. Sorry, I thought I'd made it clear: M3 rc9 is a test build as we've already tested and shipped M3. The rc9 is just to test the url additions and QA reports fixes so we're ready for M4. There is therefore no need to QA this. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61187): https://lists.yoctoproject.org/g/yocto/message/61187 Mute This Topic: https://lists.yoctoproject.org/mt/101708429/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/leave/6691583/21656/737036229/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[yocto] cmake backporting
Hi all, We have a customer using hardknott & kirkstone who needs a newer cmake version. Looking at mickledore, it has a version of cmake that has the features they require. Would it be acceptable to submit a patch to backport this version of cmake to these older YP releases? I'm not sure on the policy so I just want to check before proceeding. Thanks Rich signature.asc Description: This is a digitally signed message part -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61188): https://lists.yoctoproject.org/g/yocto/message/61188 Mute This Topic: https://lists.yoctoproject.org/mt/101708990/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [yocto] cmake backporting
Hi, On Mon, Oct 02, 2023 at 10:41:37AM +, Danter, Richard via lists.yoctoproject.org wrote: > Hi all, > > We have a customer using hardknott & kirkstone who needs a newer cmake > version. Looking at mickledore, it has a version of cmake that has the > features they require. > > Would it be acceptable to submit a patch to backport this version of > cmake to these older YP releases? I'm not sure on the policy so I just > want to check before proceeding. CMake version update would be against stable and LTS rules: https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS#Stable.2FLTS_Patch_Acceptance_Policies I have done similar updates on a private poky fork though. Cherry-picking the needed patches can be doable, but all this depends on the details... Cheers, -Mikko -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61189): https://lists.yoctoproject.org/g/yocto/message/61189 Mute This Topic: https://lists.yoctoproject.org/mt/101708990/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [yocto] cmake backporting
On Mon, 2023-10-02 at 14:02 +0300, Mikko Rapeli wrote: > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the > sender and know the content is safe. > > Hi, > > On Mon, Oct 02, 2023 at 10:41:37AM +, Danter, Richard via > lists.yoctoproject.org wrote: > > Hi all, > > > > We have a customer using hardknott & kirkstone who needs a newer > > cmake > > version. Looking at mickledore, it has a version of cmake that has > > the > > features they require. > > > > Would it be acceptable to submit a patch to backport this version > > of > > cmake to these older YP releases? I'm not sure on the policy so I > > just > > want to check before proceeding. > > CMake version update would be against stable and LTS rules: > > https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS#Stable.2FLTS_Patch_Acceptance_Policies Thank you, that is just what I was looking for 🙂 > > I have done similar updates on a private poky fork though. Cherry- > picking the needed > patches can be doable, but all this depends on the details... I have a private layer with this version of cmake and it seems to be working fine. Was just wondering if it could be more official. Many thanks! Rich > > Cheers, > > -Mikko signature.asc Description: This is a digitally signed message part -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61190): https://lists.yoctoproject.org/g/yocto/message/61190 Mute This Topic: https://lists.yoctoproject.org/mt/101708990/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[yocto] [meta-rockchip][PATCH] nanopi-r2s: add
The NanoPi R2S is a mini router with edge computing and dual GbE ports by FriendlyElec. It is based on the Rockchip RK3328 - a quad A53 core, 64-bit SoC running at 1.2GHz with at least 1GB of DDR4 RAM. It has one USB 2.0 host and is powered via a USB type-C connector (5V/2A). https://www.friendlyelec.com/index.php?route=product/product&product_id=282 Signed-off-by: Trevor Woerner --- README | 1 + conf/machine/nanopi-r2s.conf| 11 +++ recipes-kernel/linux/linux-yocto_%.bbappend | 1 + 3 files changed, 13 insertions(+) create mode 100644 conf/machine/nanopi-r2s.conf diff --git a/README b/README index e815fb47ff5f..8451b4778c37 100644 --- a/README +++ b/README @@ -32,6 +32,7 @@ Status of supported boards: nanopi-r4s rock-5b rock-pi-s + nanopi-r2s builds: marsboard-rk3066 radxarock diff --git a/conf/machine/nanopi-r2s.conf b/conf/machine/nanopi-r2s.conf new file mode 100644 index ..4472c21f0217 --- /dev/null +++ b/conf/machine/nanopi-r2s.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: NanoPi R2S +#@DESCRIPTION: The NanoPi R2S is a mini router with edge computing and dual GbE ports by FriendlyElec +#https://www.friendlyelec.com/index.php?route=product/product&product_id=282 + +require conf/machine/include/rk3328.inc + +KERNEL_DEVICETREE = "rockchip/rk3328-nanopi-r2s.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "nanopi-r2s-rk3328_defconfig" diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index 61c89f70d8dc..456182ee473d 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -14,6 +14,7 @@ COMPATIBLE_MACHINE:rock64 = "rock64" COMPATIBLE_MACHINE:rock-pi-e = "rock-pi-e" COMPATIBLE_MACHINE:nanopi-r4s = "nanopi-r4s" COMPATIBLE_MACHINE:rock-pi-s = "rock-pi-s" +COMPATIBLE_MACHINE:nanopi-r2s = "nanopi-r2s" SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" SRC_URI:append:nanopi-r4s = " file://nanopi-r4s.scc" -- 2.41.0.327.gaa9166bcc0ba -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61191): https://lists.yoctoproject.org/g/yocto/message/61191 Mute This Topic: https://lists.yoctoproject.org/mt/101712596/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [yocto] [meta-rockchip][PATCH] nanopi-r2s: add
Hi Trevor, On 10/2/23 16:11, Trevor Woerner via lists.yoctoproject.org wrote: The NanoPi R2S is a mini router with edge computing and dual GbE ports by FriendlyElec. It is based on the Rockchip RK3328 - a quad A53 core, 64-bit SoC running at 1.2GHz with at least 1GB of DDR4 RAM. It has one USB 2.0 host and is powered via a USB type-C connector (5V/2A). https://www.friendlyelec.com/index.php?route=product/product&product_id=282 Signed-off-by: Trevor Woerner --- README | 1 + conf/machine/nanopi-r2s.conf| 11 +++ recipes-kernel/linux/linux-yocto_%.bbappend | 1 + 3 files changed, 13 insertions(+) create mode 100644 conf/machine/nanopi-r2s.conf diff --git a/README b/README index e815fb47ff5f..8451b4778c37 100644 --- a/README +++ b/README @@ -32,6 +32,7 @@ Status of supported boards: nanopi-r4s rock-5b rock-pi-s + nanopi-r2s Was about to "complain" that this was not alphabetically sorted anymore... but it's already the case above the git context :) Looking good :) Reviewed-by: Quentin Schulz Cheers, Quentin builds: marsboard-rk3066 radxarock diff --git a/conf/machine/nanopi-r2s.conf b/conf/machine/nanopi-r2s.conf new file mode 100644 index ..4472c21f0217 --- /dev/null +++ b/conf/machine/nanopi-r2s.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: NanoPi R2S +#@DESCRIPTION: The NanoPi R2S is a mini router with edge computing and dual GbE ports by FriendlyElec +#https://www.friendlyelec.com/index.php?route=product/product&product_id=282 + +require conf/machine/include/rk3328.inc + +KERNEL_DEVICETREE = "rockchip/rk3328-nanopi-r2s.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "nanopi-r2s-rk3328_defconfig" diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index 61c89f70d8dc..456182ee473d 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -14,6 +14,7 @@ COMPATIBLE_MACHINE:rock64 = "rock64" COMPATIBLE_MACHINE:rock-pi-e = "rock-pi-e" COMPATIBLE_MACHINE:nanopi-r4s = "nanopi-r4s" COMPATIBLE_MACHINE:rock-pi-s = "rock-pi-s" +COMPATIBLE_MACHINE:nanopi-r2s = "nanopi-r2s" SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" SRC_URI:append:nanopi-r4s = " file://nanopi-r4s.scc" -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61192): https://lists.yoctoproject.org/g/yocto/message/61192 Mute This Topic: https://lists.yoctoproject.org/mt/101712596/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[yocto] [yocto-autobuilder-helper][PATCH v2] config.json: add reproducible-openembedded build
The purpose of this new builder is to report the reproducibility status
of all meta-openembedded recipes layer by layer. It use the same
reproducible selftest than OE-Core but setting only world as target,
and excluding all oecore and other openembedded layer recipes.
Also, the report output directory is split by layers.
Signed-off-by: Fabien Thomas
Reviewed-by: Yoann Congal
---
Changes v1->v2 :
* Split builder into multiple steps, one for each openembedded layers.
* Split reports output in the same way, one for each layers.
* For each step, only to be tested layer and its dependancies are added.
* Every other layers than the one that is tested is excluded from world.
config.json | 133
1 file changed, 133 insertions(+)
diff --git a/config.json b/config.json
index 05c6794..90762f9 100644
--- a/config.json
+++ b/config.json
@@ -264,6 +264,136 @@
}
},
+"reproducible-meta-openembedded" : {
+"MACHINE" : "qemux86-64",
+"SDKMACHINE" : "x86_64",
+"DISTRO" : "None",
+"NEEDREPOS" : ["oecore", "bitbake", "meta-openembedded"],
+"ADDLAYER" : [
+"${BUILDDIR}/../meta-selftest"
+],
+"extravars" : [
+"EXCLUDE_FROM_WORLD:layer-core = '1'",
+"EXCLUDE_FROM_WORLD:layer-selftest = '1'",
+"OEQA_REPRODUCIBLE_TEST_TARGET = 'world'"
+],
+"step1" : {
+"shortname" : "Reproducible Selftest for openembedded
meta-filesystems layer",
+"EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc;
OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail-openembedded-meta-filesystems/
DISPLAY=:1 oe-selftest -r reproducible"],
+"ADDLAYER" : [
+"${BUILDDIR}/../meta-openembedded/meta-filesystems",
+"${BUILDDIR}/../meta-openembedded/meta-oe"
+],
+"extravars" : [
+"EXCLUDE_FROM_WORLD:layer-openembedded-layer = '1'"
+]
+},
+"step2" : {
+"shortname" : "Reproducible Selftest for openembedded
meta-gnome layer",
+"EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc;
OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail-openembedded-meta-gnome/
DISPLAY=:1 oe-selftest -r reproducible"],
+"ADDLAYER" : [
+"${BUILDDIR}/../meta-openembedded/meta-gnome",
+"${BUILDDIR}/../meta-openembedded/meta-oe",
+"${BUILDDIR}/../meta-openembedded/meta-networking",
+"${BUILDDIR}/../meta-openembedded/meta-python"
+],
+"extravars" : [
+"EXCLUDE_FROM_WORLD:layer-openembedded-layer = '1'",
+"EXCLUDE_FROM_WORLD:layer-networking-layer = '1'",
+"EXCLUDE_FROM_WORLD:layer-meta-python = '1'"
+]
+},
+"step3" : {
+"shortname" : "Reproducible Selftest for openembedded
meta-initramfs layer",
+"EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc;
OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail-openembedded-meta-initramfs/
DISPLAY=:1 oe-selftest -r reproducible"],
+"ADDLAYER" : [
+"${BUILDDIR}/../meta-openembedded/meta-initramfs"
+]
+},
+"step4" : {
+"shortname" : "Reproducible Selftest for openembedded
meta-multimedia layer",
+"EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc;
OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail-openembedded-meta-multimedia/
DISPLAY=:1 oe-selftest -r reproducible"],
+"ADDLAYER" : [
+"${BUILDDIR}/../meta-openembedded/meta-multimedia",
+"${BUILDDIR}/../meta-openembedded/meta-oe",
+"${BUILDDIR}/../meta-openembedded/meta-python"
+],
+"extravars" : [
+"EXCLUDE_FROM_WORLD:layer-openembedded-layer = '1'",
+"EXCLUDE_FROM_WORLD:layer-meta-python = '1'"
+]
+},
+"step5" : {
+"shortname" : "Reproducible Selftest for openembedded
meta-networking layer",
+"EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc;
OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail-openembedded-meta-networking/
DISPLAY=:1 oe-selftest -r reproducible"],
+"ADDLAYER" : [
+"${BUILDDIR}/../meta-openembedded/meta-networking",
+"${BUILDDIR}/../meta-openembedded/meta-oe"
+],
+"extravars" : [
+"EXCLUDE_FROM_WORLD:layer-openembedded-layer = '1'"
+]
+},
+"step6" : {
+"shortname" : "Reproducible Selftest for openem
Re: [yocto] [meta-rockchip][PATCH 1/3] u-boot: cleanup
Hi Trevor,
On 10/1/23 15:08, Trevor Woerner via lists.yoctoproject.org wrote:
Clean up the u-boot bbappend recipe: group items together and re-order as per
the Yocto recipe style guide.
Signed-off-by: Trevor Woerner
---
recipes-bsp/u-boot/u-boot%.bbappend | 32 ++---
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/recipes-bsp/u-boot/u-boot%.bbappend
b/recipes-bsp/u-boot/u-boot%.bbappend
index f7800625aaf1..e79c471cf5ce 100644
--- a/recipes-bsp/u-boot/u-boot%.bbappend
+++ b/recipes-bsp/u-boot/u-boot%.bbappend
@@ -1,27 +1,25 @@
-do_compile:append:rock2-square () {
- # copy to default search path
- if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then
- cp ${B}/spl/${SPL_BINARY} ${B}
- fi
-}
-
-DEPENDS:append:rock-pi-4 = " gnutls-native"
# various machines require the pyelftools library for parsing dtb files
DEPENDS:append = " python3-pyelftools-native"
+DEPENDS:append:rock-pi-4 = " gnutls-native"
-INIT_FIRMWARE_DEPENDS ??= ""
-
+EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf"
+EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf"
+EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
EXTRA_OEMAKE:append:rk3588s = " \
BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \
ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \
"
-INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy"
-EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
-INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy"
-EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf"
-INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy"
-EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf"
+INIT_FIRMWARE_DEPENDS ??= ""
INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy"
-
+INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy"
+INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy"
+INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy"
do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}"
+
+do_compile:append:rock2-square () {
+ # copy to default search path
+ if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then
+ cp ${B}/spl/${SPL_BINARY} ${B}
+ fi
+}
A bit too many things done at once which makes it difficult to check
that no mistake happened. I could suggest to split into multiple commits:
1) move of do_compile override for rock2-square
2) move INIT_FIRMWARE_DEPENDS together
3) move EXTRA_OEMAKE together
4) move rock-pi-4 override
But I think there's nothing that sneaked in, so:
Reviewed-by: Quentin Schulz
Cheers,
Quentin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61194): https://lists.yoctoproject.org/g/yocto/message/61194
Mute This Topic: https://lists.yoctoproject.org/mt/101691819/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [yocto] [meta-rockchip][PATCH 2/3] rock-pi-e.conf: remove redundant MACHINEOVERRIDES
Hi Trevor, On 10/1/23 15:08, Trevor Woerner via lists.yoctoproject.org wrote: The MACHINE name is already added to the MACHINEOVERRIDES implicitly, no need to add it explicitly. Signed-off-by: Trevor Woerner Reviewed-by: Quentin Schulz Cheers, Quentin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61195): https://lists.yoctoproject.org/g/yocto/message/61195 Mute This Topic: https://lists.yoctoproject.org/mt/101691821/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [yocto] [meta-rockchip][PATCH 3/3] rock-pi-s: add
Hi Trevor,
On 10/1/23 15:08, Trevor Woerner via lists.yoctoproject.org wrote:
ROCK Pi S is a Rockchip RK3308 based SBC from Radxa. It contains a 64-bit
quad core processor, USB, ethernet, wireless connectivity, and voice
detection engine in 1.7-inches square. The ROCK Pi S comes in two RAM sizes
256MB or 512MB DDR3, and uses sdmmc card for OS and storage. Optionally, some
versions of the ROCK Pi S provide on-board storage via 1Gb/2Gb/4Gb/8Gb of
SLC NAND flash.
"S" stands for "small square" since the total board size of the rock-pi-s is
1.7-inches square.
This BSP assumes booting from sdmmc, and using ttyS0 for the serial console
(similar to Raspberry Pi).
Signed-off-by: Trevor Woerner
---
README | 1 +
conf/machine/include/rk3308.inc | 18 ++
conf/machine/rock-pi-s.conf | 11 +++
recipes-bsp/rkbin/rockchip-rkbin_git.bb | 17 +
recipes-bsp/u-boot/u-boot%.bbappend | 11 +++
recipes-kernel/linux/linux-yocto_%.bbappend | 1 +
6 files changed, 59 insertions(+)
create mode 100644 conf/machine/include/rk3308.inc
create mode 100644 conf/machine/rock-pi-s.conf
diff --git a/README b/README
index d4576d73c636..e815fb47ff5f 100644
--- a/README
+++ b/README
@@ -31,6 +31,7 @@ Status of supported boards:
firefly-rk3288
nanopi-r4s
rock-5b
+ rock-pi-s
builds:
marsboard-rk3066
radxarock
diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc
new file mode 100644
index ..19cabafdfac0
--- /dev/null
+++ b/conf/machine/include/rk3308.inc
@@ -0,0 +1,18 @@
+SOC_FAMILY = "rk3308"
+
+DEFAULTTUNE ?= "cortexa35-crypto"
+
+require conf/machine/include/soc-family.inc
+require conf/machine/include/arm/armv8a/tune-cortexa35.inc
+require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/rockchip-wic.inc
+
+SERIAL_CONSOLES = "150;ttyS0"
+
+KBUILD_DEFCONFIG ?= "defconfig"
+KERNEL_FEATURES:append:rk3308 = "
bsp/rockchip/remove-non-rockchip-arch-arm64.scc"
I'm starting to wonder if we shouldn't make this a pn-linux-yocto (and
other flavors) override as well because we would make it difficult for
other people to NOT include this. e.g. if they have their own recipe
where KERNEL_FEATURES is used for example. Anyway, not specific to this
SoC include file so not a blocker.
+KERNEL_CLASSES = "kernel-fitimage"
+KERNEL_IMAGETYPE = "fitImage"
+
+UBOOT_SUFFIX ?= "itb"
+UBOOT_ENTRYPOINT ?= "0x0600"
diff --git a/conf/machine/rock-pi-s.conf b/conf/machine/rock-pi-s.conf
new file mode 100644
index ..79ea73c6b47e
--- /dev/null
+++ b/conf/machine/rock-pi-s.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: Radxa Rock Pi S
+#@DESCRIPTION: ROCK Pi S is a Rockchip RK3308 based SBC by Radxa. "S" stands for
"small square"
+#https://wiki.radxa.com/RockpiS
+
+require conf/machine/include/rk3308.inc
+
+KERNEL_DEVICETREE = "rockchip/rk3308-rock-pi-s.dtb"
+MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
+
+UBOOT_MACHINE = "rock-pi-s-rk3308_defconfig"
diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb
b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
index 7fefb017053b..49e1e682eb7d 100644
--- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb
+++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
@@ -1,9 +1,12 @@
DESCRIPTION = "Rockchip Firmware and Tool Binaries"
LICENSE = "Proprietary"
+LICENSE:rk3308 = "CLOSED"
LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62"
+LIC_FILES_CHKSUM:rk3308 = "file://README;md5=39cc9df955478b8df26158d489fdcc95"
SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master"
SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23"
+SRCREV:rk3308 = "e65b97b511f1349156702db40694454c141d8fe2"
Could you please say a few words about this change? It seems that there
are still binaries for it in the SRCREV we already point to. I assume
newer should be better (though it's not always the case), so wondering
what's prompted this change?
Oooh, there is no TPL with uart0m0 support anymore... honestly not
sure it's a good idea to stay on a old blob version just for that? I
assume you should only be missing the uart in TPL but the moment you
reach the SPL the console should appear, doesn't it?
PROVIDES += "trusted-firmware-a"
PROVIDES += "optee-os"
@@ -14,6 +17,7 @@ S = "${WORKDIR}/git"
COMPATIBLE_MACHINE = ""
COMPATIBLE_MACHINE:rk3588s = "rk3588s"
+COMPATIBLE_MACHINE:rk3308 = "rk3308"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -26,6 +30,19 @@ PACKAGES = "${PN}"
ALLOW_EMPTY:${PN} = "1"
do_deploy() {
+ :
+}
+
+do_deploy:append:rk3308() {
+ # Prebuilt TF-A
+ install -m 644 ${S}/bin/rk33/rk3308_bl31_v*.elf
${DEPLOYDIR}/bl31-rk3308.elf
+ # Prebuilt OPTEE-OS
+ install -m 644 ${S}/bin/rk33/rk3308_bl32_v*.bin
${DEPLOYDIR}/tee-rk3308.bi
Re: [yocto] [yocto-autobuilder-helper][PATCH v2] config.json: add reproducible-openembedded build
looks fine to me Thanks
On Mon, Oct 2, 2023 at 7:56 AM Fabien Thomas wrote:
>
> The purpose of this new builder is to report the reproducibility status
> of all meta-openembedded recipes layer by layer. It use the same
> reproducible selftest than OE-Core but setting only world as target,
> and excluding all oecore and other openembedded layer recipes.
> Also, the report output directory is split by layers.
>
> Signed-off-by: Fabien Thomas
> Reviewed-by: Yoann Congal
> ---
>
> Changes v1->v2 :
> * Split builder into multiple steps, one for each openembedded layers.
> * Split reports output in the same way, one for each layers.
> * For each step, only to be tested layer and its dependancies are added.
> * Every other layers than the one that is tested is excluded from world.
>
> config.json | 133
> 1 file changed, 133 insertions(+)
>
> diff --git a/config.json b/config.json
> index 05c6794..90762f9 100644
> --- a/config.json
> +++ b/config.json
> @@ -264,6 +264,136 @@
>
> }
> },
> +"reproducible-meta-openembedded" : {
> +"MACHINE" : "qemux86-64",
> +"SDKMACHINE" : "x86_64",
> +"DISTRO" : "None",
> +"NEEDREPOS" : ["oecore", "bitbake", "meta-openembedded"],
> +"ADDLAYER" : [
> +"${BUILDDIR}/../meta-selftest"
> +],
> +"extravars" : [
> +"EXCLUDE_FROM_WORLD:layer-core = '1'",
> +"EXCLUDE_FROM_WORLD:layer-selftest = '1'",
> +"OEQA_REPRODUCIBLE_TEST_TARGET = 'world'"
> +],
> +"step1" : {
> +"shortname" : "Reproducible Selftest for openembedded
> meta-filesystems layer",
> +"EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc;
> OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail-openembedded-meta-filesystems/
> DISPLAY=:1 oe-selftest -r reproducible"],
> +"ADDLAYER" : [
> +"${BUILDDIR}/../meta-openembedded/meta-filesystems",
> +"${BUILDDIR}/../meta-openembedded/meta-oe"
> +],
> +"extravars" : [
> +"EXCLUDE_FROM_WORLD:layer-openembedded-layer = '1'"
> +]
> +},
> +"step2" : {
> +"shortname" : "Reproducible Selftest for openembedded
> meta-gnome layer",
> +"EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc;
> OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail-openembedded-meta-gnome/
> DISPLAY=:1 oe-selftest -r reproducible"],
> +"ADDLAYER" : [
> +"${BUILDDIR}/../meta-openembedded/meta-gnome",
> +"${BUILDDIR}/../meta-openembedded/meta-oe",
> +"${BUILDDIR}/../meta-openembedded/meta-networking",
> +"${BUILDDIR}/../meta-openembedded/meta-python"
> +],
> +"extravars" : [
> +"EXCLUDE_FROM_WORLD:layer-openembedded-layer = '1'",
> +"EXCLUDE_FROM_WORLD:layer-networking-layer = '1'",
> +"EXCLUDE_FROM_WORLD:layer-meta-python = '1'"
> +]
> +},
> +"step3" : {
> +"shortname" : "Reproducible Selftest for openembedded
> meta-initramfs layer",
> +"EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc;
> OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail-openembedded-meta-initramfs/
> DISPLAY=:1 oe-selftest -r reproducible"],
> +"ADDLAYER" : [
> +"${BUILDDIR}/../meta-openembedded/meta-initramfs"
> +]
> +},
> +"step4" : {
> +"shortname" : "Reproducible Selftest for openembedded
> meta-multimedia layer",
> +"EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc;
> OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail-openembedded-meta-multimedia/
> DISPLAY=:1 oe-selftest -r reproducible"],
> +"ADDLAYER" : [
> +"${BUILDDIR}/../meta-openembedded/meta-multimedia",
> +"${BUILDDIR}/../meta-openembedded/meta-oe",
> +"${BUILDDIR}/../meta-openembedded/meta-python"
> +],
> +"extravars" : [
> +"EXCLUDE_FROM_WORLD:layer-openembedded-layer = '1'",
> +"EXCLUDE_FROM_WORLD:layer-meta-python = '1'"
> +]
> +},
> +"step5" : {
> +"shortname" : "Reproducible Selftest for openembedded
> meta-networking layer",
> +"EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc;
> OEQA_DEBUGGING_SAVED_OUTPUT=${BASE_SHAREDDIR}/pub/repro-fail-openembedded-meta-networking/
> DISPLAY=:1 oe-selftest -r reproducible"],
> +"ADDLAYER" : [
> +"${BUILDDIR}/../meta-openembedded/meta-networking",
> +"${BU
Re: [yocto] [meta-rockchip][PATCH 2/3] rock-pi-e.conf: remove redundant MACHINEOVERRIDES
On Sun 2023-10-01 @ 09:08:02 AM, Trevor Woerner wrote: > The MACHINE name is already added to the MACHINEOVERRIDES implicitly, no need > to add it explicitly. > > Signed-off-by: Trevor Woerner > --- > conf/machine/rock-pi-e.conf | 2 -- > 1 file changed, 2 deletions(-) Applied to meta-rockchip, master branch. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61198): https://lists.yoctoproject.org/g/yocto/message/61198 Mute This Topic: https://lists.yoctoproject.org/mt/101691821/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [yocto] [meta-rockchip][PATCH] nanopi-r2s: add
On Mon 2023-10-02 @ 10:11:46 AM, Trevor Woerner wrote: > The NanoPi R2S is a mini router with edge computing and dual GbE ports by > FriendlyElec. It is based on the Rockchip RK3328 - a quad A53 core, 64-bit SoC > running at 1.2GHz with at least 1GB of DDR4 RAM. It has one USB 2.0 host and > is powered via a USB type-C connector (5V/2A). > > https://www.friendlyelec.com/index.php?route=product/product&product_id=282 > > Signed-off-by: Trevor Woerner > --- > README | 1 + > conf/machine/nanopi-r2s.conf| 11 +++ > recipes-kernel/linux/linux-yocto_%.bbappend | 1 + > 3 files changed, 13 insertions(+) > create mode 100644 conf/machine/nanopi-r2s.conf Applied to meta-rockchip, master branch. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61199): https://lists.yoctoproject.org/g/yocto/message/61199 Mute This Topic: https://lists.yoctoproject.org/mt/101712596/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[yocto] [meta-rockchip][PATCH] virtual/tpl: add
Be more obvious regarding the roles of TF-A vs rkbin: both provide a TPL for Rockchip SoCs, but only one should be used. Signed-off-by: Trevor Woerner --- conf/machine/include/px30.inc| 1 + conf/machine/include/rk3328.inc | 1 + conf/machine/include/rk3399.inc | 1 + conf/machine/include/rk3588s.inc | 2 +- recipes-bsp/rkbin/rockchip-rkbin_git.bb | 2 +- recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 2 ++ 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/px30.inc b/conf/machine/include/px30.inc index a3727fbfca66..04cbd092a00d 100644 --- a/conf/machine/include/px30.inc +++ b/conf/machine/include/px30.inc @@ -14,6 +14,7 @@ KBUILD_DEFCONFIG ?= "defconfig" KERNEL_CLASSES = "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" +PREFERRED_PROVIDER_virtual/tpl = "trusted-firmware-a" TFA_PLATFORM = "px30" TFA_BUILD_TARGET = "bl31" diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc index f9f8792ca521..7f8673f062d1 100644 --- a/conf/machine/include/rk3328.inc +++ b/conf/machine/include/rk3328.inc @@ -15,6 +15,7 @@ KERNEL_FEATURES:append:rk3328 = " bsp/rockchip/remove-non-rockchip-arch-arm64.sc KERNEL_CLASSES = "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" +PREFERRED_PROVIDER_virtual/tpl = "trusted-firmware-a" TFA_PLATFORM = "rk3328" TFA_BUILD_TARGET = "bl31" diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc index 88c87af3a03e..09be584468b8 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -15,6 +15,7 @@ KERNEL_FEATURES:append:rk3399 = " bsp/rockchip/remove-non-rockchip-arch-arm64.sc KERNEL_CLASSES = "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" +PREFERRED_PROVIDER_virtual/tpl = "trusted-firmware-a" TFA_PLATFORM = "rk3399" TFA_BUILD_TARGET = "bl31" diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc index 7bfc9474e96e..e66ad565585b 100644 --- a/conf/machine/include/rk3588s.inc +++ b/conf/machine/include/rk3588s.inc @@ -10,7 +10,7 @@ KERNEL_FEATURES:append:rk3588s = " bsp/rockchip/remove-non-rockchip-arch-arm64.s KERNEL_CLASSES = "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" -PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin" +PREFERRED_PROVIDER_virtual/tpl = "rockchip-rkbin" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin" UBOOT_SUFFIX ?= "itb" diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb index 7fefb017053b..887a7fb61853 100644 --- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb +++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62" SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master" SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23" -PROVIDES += "trusted-firmware-a" +PROVIDES += "virtual/tpl" PROVIDES += "optee-os" inherit bin_package deploy diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index c9ad84c24857..f6566212746e 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -2,6 +2,8 @@ # toolchain DEPENDS:append:rk3399 = " gcc-arm-none-eabi-native" +PROVIDES += "virtual/tpl" + COMPATIBLE_MACHINE:append:rk3399 = "|rk3399" COMPATIBLE_MACHINE:append:rk3328 = "|rk3328" COMPATIBLE_MACHINE:append:px30 = "|px30" -- 2.41.0.327.gaa9166bcc0ba -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61200): https://lists.yoctoproject.org/g/yocto/message/61200 Mute This Topic: https://lists.yoctoproject.org/mt/101725325/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[yocto] [meta-rockchip][PATCH] nanopi-m4b: add
NanoPi M4B is a RK3399-based (dual-core A72, quad-core A53 with NEON) board in the same form factor as the RPi B3+ (including compatible connectors) with onboard 2.4/5.0 dual-band WiFi + Bluetooth 5.0 with USB type-C power from FriendlyElec. https://www.friendlyelec.com/index.php?route=product/product&product_id=275 Signed-off-by: Trevor Woerner --- README | 1 + conf/machine/nanopi-m4b.conf| 11 +++ recipes-kernel/linux/linux-yocto_%.bbappend | 1 + 3 files changed, 13 insertions(+) create mode 100644 conf/machine/nanopi-m4b.conf diff --git a/README b/README index 81044748880a..bcf1e0bba361 100644 --- a/README +++ b/README @@ -32,6 +32,7 @@ Status of supported boards: nanopi-r4s rock-5b nanopi-r2s + nanopi-m4b builds: marsboard-rk3066 radxarock diff --git a/conf/machine/nanopi-m4b.conf b/conf/machine/nanopi-m4b.conf new file mode 100644 index ..35cd8f68e82e --- /dev/null +++ b/conf/machine/nanopi-m4b.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: NanoPi M4B +#@DESCRIPTION: NanoPi M4B RK3399-based board which has the same form factor as the RPi B3+. +#https://www.friendlyelec.com/index.php?route=product/product&product_id=275 + +require conf/machine/include/rk3399.inc + +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +KERNEL_DEVICETREE = "rockchip/rk3399-nanopi-m4b.dtb" +UBOOT_MACHINE = "nanopi-m4b-rk3399_defconfig" diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index d627a063a2d0..7da92dbab508 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -14,6 +14,7 @@ COMPATIBLE_MACHINE:rock64 = "rock64" COMPATIBLE_MACHINE:rock-pi-e = "rock-pi-e" COMPATIBLE_MACHINE:nanopi-r4s = "nanopi-r4s" COMPATIBLE_MACHINE:nanopi-r2s = "nanopi-r2s" +COMPATIBLE_MACHINE:nanopi-m4b = "nanopi-m4b" SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" SRC_URI:append:nanopi-r4s = " file://nanopi-r4s.scc" -- 2.41.0.327.gaa9166bcc0ba -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61201): https://lists.yoctoproject.org/g/yocto/message/61201 Mute This Topic: https://lists.yoctoproject.org/mt/101725364/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[yocto] [meta-rockchip] [PATCH] Allow KERNEL_IMAGETYPE override v3
From: Anthony Davies Updated inc files to allow overriding KERNEL_IMAGETYPE in local.conf Signed-off-by: Anthony Davies --- conf/machine/include/px30.inc | 2 +- conf/machine/include/rk3066.inc | 2 +- conf/machine/include/rk3188.inc | 2 +- conf/machine/include/rk3288.inc | 2 +- conf/machine/include/rk3328.inc | 2 +- conf/machine/include/rk3399.inc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/px30.inc b/conf/machine/include/px30.inc index a3727fb..badcbcd 100644 --- a/conf/machine/include/px30.inc +++ b/conf/machine/include/px30.inc @@ -12,7 +12,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE = "fitImage" +KERNEL_IMAGETYPE ?= "fitImage" TFA_PLATFORM = "px30" TFA_BUILD_TARGET = "bl31" diff --git a/conf/machine/include/rk3066.inc b/conf/machine/include/rk3066.inc index fa97906..3510df2 100644 --- a/conf/machine/include/rk3066.inc +++ b/conf/machine/include/rk3066.inc @@ -11,4 +11,4 @@ SERIAL_CONSOLES = "115200;ttyS2" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3066 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" -KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE ?= "zImage" diff --git a/conf/machine/include/rk3188.inc b/conf/machine/include/rk3188.inc index bc96a0c..830f908 100644 --- a/conf/machine/include/rk3188.inc +++ b/conf/machine/include/rk3188.inc @@ -11,4 +11,4 @@ SERIAL_CONSOLES = "115200;ttyFIQ0" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3188 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" -KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE ?= "zImage" diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc index b4c559d..e682c0b 100644 --- a/conf/machine/include/rk3288.inc +++ b/conf/machine/include/rk3288.inc @@ -11,6 +11,6 @@ SERIAL_CONSOLES = "115200;ttyS2" KBUILD_DEFCONFIG ?= "multi_v7_defconfig" KERNEL_FEATURES:append:rk3288 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" -KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE ?= "zImage" UBOOT_SUFFIX ?= "bin" diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc index f9f8792..6be777c 100644 --- a/conf/machine/include/rk3328.inc +++ b/conf/machine/include/rk3328.inc @@ -13,7 +13,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3328 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE = "fitImage" +KERNEL_IMAGETYPE ?= "fitImage" TFA_PLATFORM = "rk3328" TFA_BUILD_TARGET = "bl31" diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc index 88c87af..5a3f439 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -13,7 +13,7 @@ require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" KERNEL_FEATURES:append:rk3399 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" KERNEL_CLASSES = "kernel-fitimage" -KERNEL_IMAGETYPE = "fitImage" +KERNEL_IMAGETYPE ?= "fitImage" TFA_PLATFORM = "rk3399" TFA_BUILD_TARGET = "bl31" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61202): https://lists.yoctoproject.org/g/yocto/message/61202 Mute This Topic: https://lists.yoctoproject.org/mt/101725871/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[yocto] [meta-rockchip][PATCH v2 0/4] u-boot cleanup
The U-Boot bbappend recipe was in need of some cleanups. v2: - breakup the original 1 patch into 4 to make the steps easier to audit/verify. Trevor Woerner (4): u-boot cleanup: move task u-boot cleanup: group dependencies u-boot cleanup: group EXTRA_OEMAKE u-boot cleanup: organize DEPENDS recipes-bsp/u-boot/u-boot%.bbappend | 32 ++--- 1 file changed, 15 insertions(+), 17 deletions(-) -- 2.41.0.327.gaa9166bcc0ba -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61203): https://lists.yoctoproject.org/g/yocto/message/61203 Mute This Topic: https://lists.yoctoproject.org/mt/101725918/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[yocto] [meta-rockchip][PATCH v2 1/4] u-boot cleanup: move task
According to the Yocto Recipe Style Guide[1] the tasks should be at the end.
[1] https://docs.yoctoproject.org/dev/contributor-guide/recipe-style-guide.html
Signed-off-by: Trevor Woerner
---
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 f7800625aaf1..c8444aacad89 100644
--- a/recipes-bsp/u-boot/u-boot%.bbappend
+++ b/recipes-bsp/u-boot/u-boot%.bbappend
@@ -1,10 +1,3 @@
-do_compile:append:rock2-square () {
- # copy to default search path
- if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then
- cp ${B}/spl/${SPL_BINARY} ${B}
- fi
-}
-
DEPENDS:append:rock-pi-4 = " gnutls-native"
# various machines require the pyelftools library for parsing dtb files
DEPENDS:append = " python3-pyelftools-native"
@@ -25,3 +18,10 @@ EXTRA_OEMAKE:append:px30 = "
BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf"
INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy"
do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}"
+
+do_compile:append:rock2-square () {
+ # copy to default search path
+ if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then
+ cp ${B}/spl/${SPL_BINARY} ${B}
+ fi
+}
--
2.41.0.327.gaa9166bcc0ba
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61204): https://lists.yoctoproject.org/g/yocto/message/61204
Mute This Topic: https://lists.yoctoproject.org/mt/101725919/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[yocto] [meta-rockchip][PATCH v2 2/4] u-boot cleanup: group dependencies
Group the INIT_FIRMWARE_DEPENDS together and sort.
Signed-off-by: Trevor Woerner
---
recipes-bsp/u-boot/u-boot%.bbappend | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/recipes-bsp/u-boot/u-boot%.bbappend
b/recipes-bsp/u-boot/u-boot%.bbappend
index c8444aacad89..8c6ac8627efa 100644
--- a/recipes-bsp/u-boot/u-boot%.bbappend
+++ b/recipes-bsp/u-boot/u-boot%.bbappend
@@ -2,21 +2,20 @@ DEPENDS:append:rock-pi-4 = " gnutls-native"
# various machines require the pyelftools library for parsing dtb files
DEPENDS:append = " python3-pyelftools-native"
-INIT_FIRMWARE_DEPENDS ??= ""
-
EXTRA_OEMAKE:append:rk3588s = " \
BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \
ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \
"
-INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy"
EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
-INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy"
EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf"
-INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy"
EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf"
-INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy"
+INIT_FIRMWARE_DEPENDS ??= ""
+INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy"
+INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy"
+INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy"
+INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy"
do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}"
do_compile:append:rock2-square () {
--
2.41.0.327.gaa9166bcc0ba
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61205): https://lists.yoctoproject.org/g/yocto/message/61205
Mute This Topic: https://lists.yoctoproject.org/mt/101725920/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[yocto] [meta-rockchip][PATCH v2 3/4] u-boot cleanup: group EXTRA_OEMAKE
Group the EXTRA_OEMAKE items together and sort.
Signed-off-by: Trevor Woerner
---
recipes-bsp/u-boot/u-boot%.bbappend | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/recipes-bsp/u-boot/u-boot%.bbappend
b/recipes-bsp/u-boot/u-boot%.bbappend
index 8c6ac8627efa..951e82af7743 100644
--- a/recipes-bsp/u-boot/u-boot%.bbappend
+++ b/recipes-bsp/u-boot/u-boot%.bbappend
@@ -2,15 +2,14 @@ DEPENDS:append:rock-pi-4 = " gnutls-native"
# various machines require the pyelftools library for parsing dtb files
DEPENDS:append = " python3-pyelftools-native"
+EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf"
+EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf"
+EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
EXTRA_OEMAKE:append:rk3588s = " \
BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \
ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \
"
-EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
-EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf"
-EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf"
-
INIT_FIRMWARE_DEPENDS ??= ""
INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy"
INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy"
--
2.41.0.327.gaa9166bcc0ba
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61206): https://lists.yoctoproject.org/g/yocto/message/61206
Mute This Topic: https://lists.yoctoproject.org/mt/101725923/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[yocto] [meta-rockchip][PATCH v2 4/4] u-boot cleanup: organize DEPENDS
Group and sort the DEPENDS.
Signed-off-by: Trevor Woerner
---
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 951e82af7743..e79c471cf5ce 100644
--- a/recipes-bsp/u-boot/u-boot%.bbappend
+++ b/recipes-bsp/u-boot/u-boot%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS:append:rock-pi-4 = " gnutls-native"
# various machines require the pyelftools library for parsing dtb files
DEPENDS:append = " python3-pyelftools-native"
+DEPENDS:append:rock-pi-4 = " gnutls-native"
EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf"
EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf"
--
2.41.0.327.gaa9166bcc0ba
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61207): https://lists.yoctoproject.org/g/yocto/message/61207
Mute This Topic: https://lists.yoctoproject.org/mt/101725925/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[yocto] [meta-rockchip] [PATCH] Stop u-boot sections partition table
From: Anthony Davies
When checking the partition table of builds using this layer you get
numerous extra partitions due to each bootloader entry creating a
partition. --no-table on these entries should stop this from happening.
Signed-off-by: Anthony Davies
---
wic/rockchip.wks | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/wic/rockchip.wks b/wic/rockchip.wks
index 1cc30ae..eb50d8c 100644
--- a/wic/rockchip.wks
+++ b/wic/rockchip.wks
@@ -15,11 +15,11 @@
# boot32768 229376
# root262144 - (suggested)
-part loader1--offset 32 --fixed-size 4000K--source rawcopy
--sourceparams="file=${SPL_BINARY}"
-part reserved1 --offset 4032 --fixed-size 64K
-part reserved2 --offset 4096 --fixed-size 4096K
-part loader2--offset 8192 --fixed-size 4096K--source rawcopy
--sourceparams="file=u-boot.${UBOOT_SUFFIX}"
-part atf--offset 12288 --fixed-size 4096K
+part loader1--offset 32 --fixed-size 4000K--source rawcopy
--no-table
--sourceparams="file=${SPL_BINARY}"
+part reserved1 --offset 4032 --fixed-size 64K
--no-table
+part reserved2 --offset 4096 --fixed-size 4096K
--no-table
+part loader2--offset 8192 --fixed-size 4096K--source rawcopy
--no-table
--sourceparams="file=u-boot.${UBOOT_SUFFIX}"
+part atf--offset 12288 --fixed-size 4096K
--no-table
part /boot --offset 16384 --size 114688K --active --source
bootimg-partition --fstype=vfat --label boot --use-uuid
--sourceparams="loader=u-boot"
part /--source rootfs
--fstype=ext4 --label root --use-uuid
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61208): https://lists.yoctoproject.org/g/yocto/message/61208
Mute This Topic: https://lists.yoctoproject.org/mt/101726546/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[yocto] [meta-rockchip] [PATCH] machine include files use weak defaults
From: Anthony Davies This allows defaults to be set per machine.conf but also allows overrides in local.conf. Signed-off-by: Anthony Davies --- conf/machine/include/px30.inc | 8 conf/machine/include/rk3288.inc| 4 ++-- conf/machine/include/rk3328.inc| 8 conf/machine/include/rk3399.inc| 8 conf/machine/include/rk3588s.inc | 8 conf/machine/include/rockchip-defaults.inc | 6 +++--- conf/machine/include/rockchip-wic.inc | 8 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/conf/machine/include/px30.inc b/conf/machine/include/px30.inc index a3727fb..8b94c9d 100644 --- a/conf/machine/include/px30.inc +++ b/conf/machine/include/px30.inc @@ -3,19 +3,19 @@ SOC_FAMILY = "px30" -DEFAULTTUNE ?= "cortexa35-crypto" +DEFAULTTUNE ??= "cortexa35-crypto" require conf/machine/include/soc-family.inc require conf/machine/include/arm/armv8a/tune-cortexa35.inc require conf/machine/include/rockchip-defaults.inc require conf/machine/include/rockchip-wic.inc -KBUILD_DEFCONFIG ?= "defconfig" +KBUILD_DEFCONFIG ??= "defconfig" KERNEL_CLASSES = "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" TFA_PLATFORM = "px30" TFA_BUILD_TARGET = "bl31" -UBOOT_SUFFIX ?= "itb" -UBOOT_ENTRYPOINT ?= "0x0600" +UBOOT_SUFFIX ??= "itb" +UBOOT_ENTRYPOINT ??= "0x0600" diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc index b4c559d..978a2ab 100644 --- a/conf/machine/include/rk3288.inc +++ b/conf/machine/include/rk3288.inc @@ -9,8 +9,8 @@ require conf/machine/include/rockchip-defaults.inc SERIAL_CONSOLES = "115200;ttyS2" -KBUILD_DEFCONFIG ?= "multi_v7_defconfig" +KBUILD_DEFCONFIG ??= "multi_v7_defconfig" KERNEL_FEATURES:append:rk3288 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE = "zImage" -UBOOT_SUFFIX ?= "bin" +UBOOT_SUFFIX ??= "bin" diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc index f9f8792..69ec7bc 100644 --- a/conf/machine/include/rk3328.inc +++ b/conf/machine/include/rk3328.inc @@ -3,14 +3,14 @@ SOC_FAMILY = "rk3328" -DEFAULTTUNE ?= "cortexa53-crypto" +DEFAULTTUNE ??= "cortexa53-crypto" require conf/machine/include/soc-family.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc require conf/machine/include/rockchip-defaults.inc require conf/machine/include/rockchip-wic.inc -KBUILD_DEFCONFIG ?= "defconfig" +KBUILD_DEFCONFIG ??= "defconfig" KERNEL_FEATURES:append:rk3328 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" KERNEL_CLASSES = "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" @@ -18,5 +18,5 @@ KERNEL_IMAGETYPE = "fitImage" TFA_PLATFORM = "rk3328" TFA_BUILD_TARGET = "bl31" -UBOOT_SUFFIX ?= "itb" -UBOOT_ENTRYPOINT ?= "0x0600" +UBOOT_SUFFIX ??= "itb" +UBOOT_ENTRYPOINT ??= "0x0600" diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc index 88c87af..491bc3d 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -3,14 +3,14 @@ SOC_FAMILY = "rk3399" -DEFAULTTUNE ?= "cortexa72-cortexa53-crypto" +DEFAULTTUNE ??= "cortexa72-cortexa53-crypto" require conf/machine/include/soc-family.inc require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc require conf/machine/include/rockchip-defaults.inc require conf/machine/include/rockchip-wic.inc -KBUILD_DEFCONFIG ?= "defconfig" +KBUILD_DEFCONFIG ??= "defconfig" KERNEL_FEATURES:append:rk3399 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" KERNEL_CLASSES = "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" @@ -18,5 +18,5 @@ KERNEL_IMAGETYPE = "fitImage" TFA_PLATFORM = "rk3399" TFA_BUILD_TARGET = "bl31" -UBOOT_SUFFIX ?= "itb" -UBOOT_ENTRYPOINT ?= "0x0600" +UBOOT_SUFFIX ??= "itb" +UBOOT_ENTRYPOINT ??= "0x0600" diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc index 7bfc947..f8292aa 100644 --- a/conf/machine/include/rk3588s.inc +++ b/conf/machine/include/rk3588s.inc @@ -1,11 +1,11 @@ MACHINEOVERRIDES =. "rk3588s:" -DEFAULTTUNE ?= "cortexa76-cortexa55-crypto" +DEFAULTTUNE ??= "cortexa76-cortexa55-crypto" require conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc require conf/machine/include/rockchip-defaults.inc require conf/machine/include/rockchip-wic.inc -KBUILD_DEFCONFIG ?= "defconfig" +KBUILD_DEFCONFIG ??= "defconfig" KERNEL_FEATURES:append:rk3588s = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" KERNEL_CLASSES = "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" @@ -13,5 +13,5 @@ KERNEL_IMAGETYPE = "fitImage" PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin" -UBOOT_SUFFIX ?= "itb" -UBOOT_ENTRYPOINT ?= "0x0600" +UBOOT_SUFFIX ??= "itb" +UBOOT_ENTRYPOINT ??= "0x0600" diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc index 3ce2e24..11d0fc7 100644 --- a/conf/mac
[yocto] [meta-rockchip][PATCH] KERNEL_DEVICETREE: 32-bit re-org
The upstream kernel reorganized the 32-bit arch/arm device-tree directory structure to separate out the device-trees by manufacturer (similar to the organization of the arch/arm64 device-trees). Update the references to 32-bit arm device-trees to match. Signed-off-by: Trevor Woerner --- conf/machine/firefly-rk3288.conf | 2 +- conf/machine/marsboard-rk3066.conf | 2 +- conf/machine/radxarock.conf| 2 +- conf/machine/rock2-square.conf | 2 +- conf/machine/tinker-board-s.conf | 2 +- conf/machine/tinker-board.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/firefly-rk3288.conf b/conf/machine/firefly-rk3288.conf index 3270bb9f1657..6ff1be822008 100644 --- a/conf/machine/firefly-rk3288.conf +++ b/conf/machine/firefly-rk3288.conf @@ -9,5 +9,5 @@ require conf/machine/include/rk3288.inc require conf/machine/include/rockchip-wic.inc -KERNEL_DEVICETREE = "rk3288-firefly.dtb" +KERNEL_DEVICETREE = "rockchip/rk3288-firefly.dtb" UBOOT_MACHINE = "firefly-rk3288_defconfig" diff --git a/conf/machine/marsboard-rk3066.conf b/conf/machine/marsboard-rk3066.conf index 52fd256a3445..36945e8e407b 100644 --- a/conf/machine/marsboard-rk3066.conf +++ b/conf/machine/marsboard-rk3066.conf @@ -8,4 +8,4 @@ require conf/machine/include/rk3066.inc -KERNEL_DEVICETREE = "rk3066a-marsboard.dtb" +KERNEL_DEVICETREE = "rockchip/rk3066a-marsboard.dtb" diff --git a/conf/machine/radxarock.conf b/conf/machine/radxarock.conf index 42d8848e1d09..6ad8474669d0 100644 --- a/conf/machine/radxarock.conf +++ b/conf/machine/radxarock.conf @@ -9,4 +9,4 @@ require conf/machine/include/rk3188.inc -KERNEL_DEVICETREE = "rk3188-radxarock.dtb" +KERNEL_DEVICETREE = "rockchip/rk3188-radxarock.dtb" diff --git a/conf/machine/rock2-square.conf b/conf/machine/rock2-square.conf index 46064eebcc67..9468b9a6b559 100644 --- a/conf/machine/rock2-square.conf +++ b/conf/machine/rock2-square.conf @@ -9,7 +9,7 @@ require conf/machine/include/rk3288.inc SPL_BINARY = "u-boot-spl-dtb.bin" -KERNEL_DEVICETREE = "rk3288-rock2-square.dtb" +KERNEL_DEVICETREE = "rockchip/rk3288-rock2-square.dtb" UBOOT_MACHINE = "rock2_defconfig" # This board doesn't support the combined idbloader, so resort to the older diff --git a/conf/machine/tinker-board-s.conf b/conf/machine/tinker-board-s.conf index 870b9bcdf8c7..3a656136c554 100644 --- a/conf/machine/tinker-board-s.conf +++ b/conf/machine/tinker-board-s.conf @@ -7,5 +7,5 @@ require conf/machine/include/tinker.inc -KERNEL_DEVICETREE = "rk3288-tinker-s.dtb" +KERNEL_DEVICETREE = "rockchip/rk3288-tinker-s.dtb" UBOOT_MACHINE = "tinker-s-rk3288_defconfig" diff --git a/conf/machine/tinker-board.conf b/conf/machine/tinker-board.conf index 8fe5f6305d70..ef1a1c1ac098 100644 --- a/conf/machine/tinker-board.conf +++ b/conf/machine/tinker-board.conf @@ -7,5 +7,5 @@ require conf/machine/include/tinker.inc -KERNEL_DEVICETREE = "rk3288-tinker.dtb" +KERNEL_DEVICETREE = "rockchip/rk3288-tinker.dtb" UBOOT_MACHINE = "tinker-rk3288_defconfig" -- 2.41.0.327.gaa9166bcc0ba -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61210): https://lists.yoctoproject.org/g/yocto/message/61210 Mute This Topic: https://lists.yoctoproject.org/mt/101728482/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
