* [master/kirkstone][PATCH 1/5] conf: beaglebone-ai64: trim down the DTB list
@ 2023-10-20 20:44 Denys Dmytriyenko
2023-10-20 20:44 ` [master/kirkstone][PATCH 2/5] conf: beagleplay: " Denys Dmytriyenko
` (3 more replies)
0 siblings, 4 replies; 14+ messages in thread
From: Denys Dmytriyenko @ 2023-10-20 20:44 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
Update DTB/DTBO list to only upstreamed devicetrees and overlays. This
help with migration to kernel 6.1, which doesn't have BB.org specific
overlays.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 61 +++----------------
1 file changed, 8 insertions(+), 53 deletions(-)
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
index bd5f541f..2f9c7288 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -10,62 +10,17 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
KERNEL_DEVICETREE = " \
ti/k3-j721e-beagleboneai64.dtb \
-ti/k3-j721e-beagleboneai64-no-shared-mem.dtb \
ti/k3-j721e-common-proc-board.dtb \
-ti/k3-j721e-common-proc-board-infotainment.dtbo \
-ti/k3-j721e-common-proc-board-uarts.dtbo \
-ti/k3-j721e-cpb-csi2-ov5640.dtbo \
-ti/k3-j721e-fpdlink-cpb-fusion.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \
-ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \
-ti/k3-j721e-fpdlink-sk-fusion.dtbo \
-ti/k3-j721e-gesi-exp-board.dtbo \
-ti/k3-j721e-proc-board-tps65917.dtb \
-ti/k3-j721e-quad-port-eth-exp.dtbo \
+ti/k3-j721e-evm-csi2-ov5640.dtbo \
+ti/k3-j721e-evm-fusion.dtbo \
+ti/k3-j721e-evm-gesi-exp-board.dtbo \
+ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
+ti/k3-j721e-evm-virt-mac-client.dtbo \
ti/k3-j721e-sk-csi2-ov5640.dtbo \
-ti/k3-j721e-sk.dtb \
-ti/k3-j721e-sk-rpi-cam-imx219.dtbo \
+ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \
+ti/k3-j721e-sk-fusion.dtbo \
ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
-ti/overlays/BBAI64-CSI0-imx219.dtbo \
-ti/overlays/BBAI64-CSI1-imx219.dtbo \
-ti/overlays/BBAI64-DSI-RPi-7inch-panel.dtbo \
-ti/overlays/BBAI64-P8_37-ehrpwm5_a.dtbo \
-ti/overlays/BBAI64-P9_25-ehrpwm4_b.dtbo \
-ti/overlays/BB-I2C2-MPU6050.dtbo \
-ti/overlays/BBORG_LOAD-00A2.dtbo \
-ti/overlays/BBORG_RELAY-00A2.dtbo \
-ti/overlays/BBORG_SERVO-00A2.dtbo \
-ti/overlays/BONE-FAN.dtbo \
-ti/overlays/BONE-I2C1.dtbo \
-ti/overlays/BONE-I2C2.dtbo \
-ti/overlays/BONE-I2C3.dtbo \
-ti/overlays/BONE-LED_P8_03.dtbo \
-ti/overlays/BONE-LED_P9_11.dtbo \
-ti/overlays/BONE-PWM0.dtbo \
-ti/overlays/BONE-PWM1.dtbo \
-ti/overlays/BONE-PWM2.dtbo \
-ti/overlays/BONE-SPI0_0.dtbo \
-ti/overlays/BONE-SPI0_1.dtbo \
-ti/overlays/BONE-SPI1_0.dtbo \
-ti/overlays/BONE-UART1.dtbo \
-ti/overlays/BONE-USB0-host.dtbo \
-ti/overlays/J721E-PRU-UIO-00A0.dtbo \
-ti/overlays/k3-j721e-beagleboneai64-RPi-7inch-panel.dtbo \
-ti/overlays/robotics-cape.dtbo \
+ti/k3-j721e-sk.dtb \
"
MACHINE_GUI_CLASS = "bigscreen"
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [master/kirkstone][PATCH 2/5] conf: beagleplay: trim down the DTB list
2023-10-20 20:44 [master/kirkstone][PATCH 1/5] conf: beaglebone-ai64: trim down the DTB list Denys Dmytriyenko
@ 2023-10-20 20:44 ` Denys Dmytriyenko
2023-10-20 20:44 ` [master/kirkstone][PATCH 3/5] linux-bb.org: update kernel to 6.1 for Beagle devices Denys Dmytriyenko
` (2 subsequent siblings)
3 siblings, 0 replies; 14+ messages in thread
From: Denys Dmytriyenko @ 2023-10-20 20:44 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
Update DTB/DTBO list to only upstreamed devicetrees and overlays. This
help with migration to kernel 6.1, which doesn't have BB.org specific
overlays.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/beagleplay.conf | 40 +++++-------------------
1 file changed, 7 insertions(+), 33 deletions(-)
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
index 23f44c3f..106019c4 100644
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -24,45 +24,19 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
KERNEL_DEVICETREE = " \
ti/k3-am625-beagleplay.dtb \
+ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+ti/k3-am625-sk.dtb \
ti/k3-am625-sk-csi2-ov5640.dtbo \
ti/k3-am625-sk-csi2-tevi-ov5640.dtbo \
-ti/k3-am625-sk.dtb \
+ti/k3-am625-sk-dmtimer-pwm.dtbo \
ti/k3-am625-sk-ecap-capture.dtbo \
-ti/k3-am625-skeleton.dtb \
ti/k3-am625-sk-hdmi-audio.dtbo \
-ti/k3-am625-sk-lpmdemo.dtb \
ti/k3-am625-sk-mcan.dtbo \
-ti/k3-am625-sk-oldi-panel.dtbo \
-ti/k3-am625-sk-qspi-flash.dtbo \
+ti/k3-am625-sk-mcspi-loopback.dtbo \
+ti/k3-am625-sk-mcu-gpio-wakeup.dtbo \
+ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
-ti/k3-am625-sk-rpi-hdr-spi.dtbo \
-ti/overlays/BBAI64-CSI0-imx219.dtbo \
-ti/overlays/BBAI64-CSI1-imx219.dtbo \
-ti/overlays/BBAI64-DSI-RPi-7inch-panel.dtbo \
-ti/overlays/BBAI64-P8_37-ehrpwm5_a.dtbo \
-ti/overlays/BBAI64-P9_25-ehrpwm4_b.dtbo \
-ti/overlays/BB-I2C2-MPU6050.dtbo \
-ti/overlays/BBORG_LOAD-00A2.dtbo \
-ti/overlays/BBORG_RELAY-00A2.dtbo \
-ti/overlays/BBORG_SERVO-00A2.dtbo \
-ti/overlays/BONE-FAN.dtbo \
-ti/overlays/BONE-I2C1.dtbo \
-ti/overlays/BONE-I2C2.dtbo \
-ti/overlays/BONE-I2C3.dtbo \
-ti/overlays/BONE-LED_P8_03.dtbo \
-ti/overlays/BONE-LED_P9_11.dtbo \
-ti/overlays/BONE-PWM0.dtbo \
-ti/overlays/BONE-PWM1.dtbo \
-ti/overlays/BONE-PWM2.dtbo \
-ti/overlays/BONE-SPI0_0.dtbo \
-ti/overlays/BONE-SPI0_1.dtbo \
-ti/overlays/BONE-SPI1_0.dtbo \
-ti/overlays/BONE-UART1.dtbo \
-ti/overlays/BONE-USB0-host.dtbo \
-ti/overlays/k3-am625-beagleplay-bcfserial-no-firmware.dtbo \
-ti/overlays/k3-am625-beagleplay-csi2-ov5640.dtbo \
-ti/overlays/k3-am625-beagleplay-lt-lcd185.dtbo \
-ti/overlays/robotics-cape.dtbo \
"
MACHINE_GUI_CLASS = "bigscreen"
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [master/kirkstone][PATCH 3/5] linux-bb.org: update kernel to 6.1 for Beagle devices
2023-10-20 20:44 [master/kirkstone][PATCH 1/5] conf: beaglebone-ai64: trim down the DTB list Denys Dmytriyenko
2023-10-20 20:44 ` [master/kirkstone][PATCH 2/5] conf: beagleplay: " Denys Dmytriyenko
@ 2023-10-20 20:44 ` Denys Dmytriyenko
2023-10-23 15:53 ` [meta-ti] " Ryan Eatmon
2023-10-20 20:44 ` [master/kirkstone][PATCH 4/5] u-boot-bb.org: add back Beagle-specific U-boot 2023.04 Denys Dmytriyenko
2023-10-20 20:44 ` [master/kirkstone][PATCH 5/5] conf: beagle*: recommend essential FW images for Beagle devices Denys Dmytriyenko
3 siblings, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2023-10-20 20:44 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
Update both 32-bit and 64-bit configs to use the latest 6.1 Linux kernel
from beagleboard.org repository, which is based on ti-linux-kernel repo
used in linux-ti-staging, but with extra Beagle-specific features on top.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
.../recipes-kernel/linux/linux-bb.org_git.bb | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
index f4c1775d..4048e106 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
@@ -10,21 +10,24 @@ inherit kernel
require recipes-kernel/linux/setup-defconfig.inc
require recipes-kernel/linux/ti-kernel.inc
+# BB.org hasn't switched to "vendored" DTB layout by default yet
+KERNEL_DTBVENDORED = "0"
+
DEPENDS += "gmp-native libmpc-native"
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
S = "${WORKDIR}/git"
-# 5.10.168 version for 32-bit
-SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a"
-PV:armv7a = "5.10.168+git${SRCPV}"
-BRANCH:armv7a = "v5.10.168-ti-r70"
+# 6.1.33 version for 32-bit
+SRCREV:armv7a = "feb1c153a9693d44dec5772d134bd2c7986ff95d"
+PV:armv7a = "6.1.33+git${SRCPV}"
+BRANCH:armv7a = "v6.1.33-ti-r7"
-# 5.10.162 version for 64-bit
-SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
-PV:aarch64 = "5.10.162+git${SRCPV}"
-BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
+# 6.1.46 version for 64-bit
+SRCREV:aarch64 = "0a1e93a38c699fdd3c629d57f5cd015f90ab0d36"
+PV:aarch64 = "6.1.46+git${SRCPV}"
+BRANCH:aarch64 = "v6.1.46-ti-arm64-r9"
SRC_URI = " \
git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [master/kirkstone][PATCH 4/5] u-boot-bb.org: add back Beagle-specific U-boot 2023.04
2023-10-20 20:44 [master/kirkstone][PATCH 1/5] conf: beaglebone-ai64: trim down the DTB list Denys Dmytriyenko
2023-10-20 20:44 ` [master/kirkstone][PATCH 2/5] conf: beagleplay: " Denys Dmytriyenko
2023-10-20 20:44 ` [master/kirkstone][PATCH 3/5] linux-bb.org: update kernel to 6.1 for Beagle devices Denys Dmytriyenko
@ 2023-10-20 20:44 ` Denys Dmytriyenko
2023-10-20 20:44 ` [master/kirkstone][PATCH 5/5] conf: beagle*: recommend essential FW images for Beagle devices Denys Dmytriyenko
3 siblings, 0 replies; 14+ messages in thread
From: Denys Dmytriyenko @ 2023-10-20 20:44 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
Majority of Beagle devices use ti-u-boot repo from u-boot-ti-staging directly.
But some latest devices may need to point to own tree with additional support
added that is not yet upstream, e.g. BeaglePlay.
Add the Beagle-specific recipe and point beagleplay to use it. Other devices
can switch to using it as well, if desired, but right now the code base is the
same for other Beagle devices.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 3 +++
meta-ti-bsp/conf/machine/beagleplay.conf | 2 ++
.../recipes-bsp/u-boot/u-boot-bb.org_git.bb | 17 +++++++++++++++++
3 files changed, 22 insertions(+)
create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
index f8f08d63..c40615c9 100644
--- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
@@ -4,6 +4,9 @@
require conf/machine/include/k3r5.inc
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
+PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
+
SYSFW_SOC = "am62x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
index 106019c4..6a0f697f 100644
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -21,6 +21,8 @@ OPTEEMACHINE = "k3-am62x"
UBOOT_MACHINE = "am62x_evm_a53_defconfig"
PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
+PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
KERNEL_DEVICETREE = " \
ti/k3-am625-beagleplay.dtb \
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
new file mode 100644
index 00000000..5bb20213
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
@@ -0,0 +1,17 @@
+require u-boot-ti.inc
+
+SUMMARY = "BeagleBoard.org U-Boot"
+
+COMPATIBLE_MACHINE = "beagle.*"
+
+PV = "2023.04"
+
+UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
+UBOOT_GIT_PROTOCOL = "https"
+BRANCH = "v2023.04-ti-09.00.00.011"
+SRCREV = "4b8f8be8870f03d92a2b01d0d30ab912118adc82"
+
+BRANCH:beagleplay = "v2023.04-ti-09.00.00.011-BeaglePlay"
+BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.00.00.011-BeaglePlay"
+SRCREV:beagleplay = "10afea462ea1113701f6f0f8853fdff985aa275d"
+SRCREV:beagleplay-k3r5 = "10afea462ea1113701f6f0f8853fdff985aa275d"
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [master/kirkstone][PATCH 5/5] conf: beagle*: recommend essential FW images for Beagle devices
2023-10-20 20:44 [master/kirkstone][PATCH 1/5] conf: beaglebone-ai64: trim down the DTB list Denys Dmytriyenko
` (2 preceding siblings ...)
2023-10-20 20:44 ` [master/kirkstone][PATCH 4/5] u-boot-bb.org: add back Beagle-specific U-boot 2023.04 Denys Dmytriyenko
@ 2023-10-20 20:44 ` Denys Dmytriyenko
2023-10-23 15:50 ` [meta-ti] " Andrew Davis
3 siblings, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2023-10-20 20:44 UTC (permalink / raw)
To: meta-ti; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@konsulko.com>
Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
essential FW images to be added to rootfs by default.
Correct beagle-x15 to pull devicetrees and kernel image as well.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
meta-ti-bsp/conf/machine/beagle-x15.conf | 2 ++
meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
meta-ti-bsp/conf/machine/beaglebone.conf | 2 ++
meta-ti-bsp/conf/machine/beagleplay.conf | 3 +++
4 files changed, 10 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
index be27705c..3b857165 100644
--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
@@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
SERIAL_CONSOLES = "115200;ttyS2"
UBOOT_MACHINE = "am57xx_evm_config"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
index 2f9c7288..3f5a027e 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
"
MACHINE_GUI_CLASS = "bigscreen"
+
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
index 2d811d0d..45944ce8 100644
--- a/meta-ti-bsp/conf/machine/beaglebone.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
@@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
SERIAL_CONSOLES = "115200;ttyS0"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
index 6a0f697f..4dd550a1 100644
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
"
MACHINE_GUI_CLASS = "bigscreen"
+
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [meta-ti] [master/kirkstone][PATCH 5/5] conf: beagle*: recommend essential FW images for Beagle devices
2023-10-20 20:44 ` [master/kirkstone][PATCH 5/5] conf: beagle*: recommend essential FW images for Beagle devices Denys Dmytriyenko
@ 2023-10-23 15:50 ` Andrew Davis
2023-10-23 15:52 ` Ryan Eatmon
2023-10-23 16:56 ` Denys Dmytriyenko
0 siblings, 2 replies; 14+ messages in thread
From: Andrew Davis @ 2023-10-23 15:50 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-ti; +Cc: Denys Dmytriyenko
On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
>
> Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
> essential FW images to be added to rootfs by default.
>
> Correct beagle-x15 to pull devicetrees and kernel image as well.
>
Would it be better to have the bb.org kernel pull in `kernel-rdepends.inc` like
the other kernels and get all these RDEPENDS/RRECOMMENDS from that?
Andrew
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> meta-ti-bsp/conf/machine/beagle-x15.conf | 2 ++
> meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
> meta-ti-bsp/conf/machine/beaglebone.conf | 2 ++
> meta-ti-bsp/conf/machine/beagleplay.conf | 3 +++
> 4 files changed, 10 insertions(+)
>
> diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
> index be27705c..3b857165 100644
> --- a/meta-ti-bsp/conf/machine/beagle-x15.conf
> +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
> @@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
> SERIAL_CONSOLES = "115200;ttyS2"
>
> UBOOT_MACHINE = "am57xx_evm_config"
> +
> +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> index 2f9c7288..3f5a027e 100644
> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> @@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
> "
>
> MACHINE_GUI_CLASS = "bigscreen"
> +
> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> +
> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
> diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
> index 2d811d0d..45944ce8 100644
> --- a/meta-ti-bsp/conf/machine/beaglebone.conf
> +++ b/meta-ti-bsp/conf/machine/beaglebone.conf
> @@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
> SERIAL_CONSOLES = "115200;ttyS0"
>
> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> +
> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
> index 6a0f697f..4dd550a1 100644
> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> @@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
> "
>
> MACHINE_GUI_CLASS = "bigscreen"
> +
> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> +
> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17160): https://lists.yoctoproject.org/g/meta-ti/message/17160
> Mute This Topic: https://lists.yoctoproject.org/mt/102089684/3619733
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695306/3619733/2033773410/xyzzy [afd@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-ti] [master/kirkstone][PATCH 5/5] conf: beagle*: recommend essential FW images for Beagle devices
2023-10-23 15:50 ` [meta-ti] " Andrew Davis
@ 2023-10-23 15:52 ` Ryan Eatmon
2023-10-23 16:56 ` Denys Dmytriyenko
2023-10-23 16:56 ` Denys Dmytriyenko
1 sibling, 1 reply; 14+ messages in thread
From: Ryan Eatmon @ 2023-10-23 15:52 UTC (permalink / raw)
To: afd, Denys Dmytriyenko, meta-ti; +Cc: Denys Dmytriyenko
On 10/23/2023 10:50 AM, Andrew Davis via lists.yoctoproject.org wrote:
> On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
>> From: Denys Dmytriyenko <denys@konsulko.com>
>>
>> Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
>> essential FW images to be added to rootfs by default.
>>
>> Correct beagle-x15 to pull devicetrees and kernel image as well.
>>
>
> Would it be better to have the bb.org kernel pull in
> `kernel-rdepends.inc` like
> the other kernels and get all these RDEPENDS/RRECOMMENDS from that?
Someone submitted that patch earlier and I was hoping that Denys was
going to address it as part of this series.
> Andrew
>
>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
>> ---
>> meta-ti-bsp/conf/machine/beagle-x15.conf | 2 ++
>> meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
>> meta-ti-bsp/conf/machine/beaglebone.conf | 2 ++
>> meta-ti-bsp/conf/machine/beagleplay.conf | 3 +++
>> 4 files changed, 10 insertions(+)
>>
>> diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf
>> b/meta-ti-bsp/conf/machine/beagle-x15.conf
>> index be27705c..3b857165 100644
>> --- a/meta-ti-bsp/conf/machine/beagle-x15.conf
>> +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
>> @@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
>> SERIAL_CONSOLES = "115200;ttyS2"
>> UBOOT_MACHINE = "am57xx_evm_config"
>> +
>> +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
>> kernel-image-zimage"
>> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> index 2f9c7288..3f5a027e 100644
>> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>> @@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
>> "
>> MACHINE_GUI_CLASS = "bigscreen"
>> +
>> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
>> kernel-image-image"
>> +
>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
>> diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf
>> b/meta-ti-bsp/conf/machine/beaglebone.conf
>> index 2d811d0d..45944ce8 100644
>> --- a/meta-ti-bsp/conf/machine/beaglebone.conf
>> +++ b/meta-ti-bsp/conf/machine/beaglebone.conf
>> @@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
>> SERIAL_CONSOLES = "115200;ttyS0"
>> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
>> kernel-image-zimage"
>> +
>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
>> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf
>> b/meta-ti-bsp/conf/machine/beagleplay.conf
>> index 6a0f697f..4dd550a1 100644
>> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
>> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
>> @@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
>> "
>> MACHINE_GUI_CLASS = "bigscreen"
>> +
>> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
>> kernel-image-image"
>> +
>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
>>
>>
>>
>>
>>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17166): https://lists.yoctoproject.org/g/meta-ti/message/17166
> Mute This Topic: https://lists.yoctoproject.org/mt/102089684/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-ti] [master/kirkstone][PATCH 3/5] linux-bb.org: update kernel to 6.1 for Beagle devices
2023-10-20 20:44 ` [master/kirkstone][PATCH 3/5] linux-bb.org: update kernel to 6.1 for Beagle devices Denys Dmytriyenko
@ 2023-10-23 15:53 ` Ryan Eatmon
2023-10-23 19:19 ` Denys Dmytriyenko
0 siblings, 1 reply; 14+ messages in thread
From: Ryan Eatmon @ 2023-10-23 15:53 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-ti; +Cc: Denys Dmytriyenko
I just sent a patch for master only against this recipe that removes all
of the patches. Not sure if you want a v2 series that includes that
change, or just have a follow on patch.
On 10/20/2023 3:44 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
>
> Update both 32-bit and 64-bit configs to use the latest 6.1 Linux kernel
> from beagleboard.org repository, which is based on ti-linux-kernel repo
> used in linux-ti-staging, but with extra Beagle-specific features on top.
>
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> .../recipes-kernel/linux/linux-bb.org_git.bb | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> index f4c1775d..4048e106 100644
> --- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> @@ -10,21 +10,24 @@ inherit kernel
> require recipes-kernel/linux/setup-defconfig.inc
> require recipes-kernel/linux/ti-kernel.inc
>
> +# BB.org hasn't switched to "vendored" DTB layout by default yet
> +KERNEL_DTBVENDORED = "0"
> +
> DEPENDS += "gmp-native libmpc-native"
>
> KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
>
> S = "${WORKDIR}/git"
>
> -# 5.10.168 version for 32-bit
> -SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a"
> -PV:armv7a = "5.10.168+git${SRCPV}"
> -BRANCH:armv7a = "v5.10.168-ti-r70"
> +# 6.1.33 version for 32-bit
> +SRCREV:armv7a = "feb1c153a9693d44dec5772d134bd2c7986ff95d"
> +PV:armv7a = "6.1.33+git${SRCPV}"
> +BRANCH:armv7a = "v6.1.33-ti-r7"
>
> -# 5.10.162 version for 64-bit
> -SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
> -PV:aarch64 = "5.10.162+git${SRCPV}"
> -BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
> +# 6.1.46 version for 64-bit
> +SRCREV:aarch64 = "0a1e93a38c699fdd3c629d57f5cd015f90ab0d36"
> +PV:aarch64 = "6.1.46+git${SRCPV}"
> +BRANCH:aarch64 = "v6.1.46-ti-arm64-r9"
>
> SRC_URI = " \
> git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17158): https://lists.yoctoproject.org/g/meta-ti/message/17158
> Mute This Topic: https://lists.yoctoproject.org/mt/102089682/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/10828724/6551054/1815494134/xyzzy [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-ti] [master/kirkstone][PATCH 5/5] conf: beagle*: recommend essential FW images for Beagle devices
2023-10-23 15:50 ` [meta-ti] " Andrew Davis
2023-10-23 15:52 ` Ryan Eatmon
@ 2023-10-23 16:56 ` Denys Dmytriyenko
2023-10-23 17:18 ` Andrew Davis
1 sibling, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2023-10-23 16:56 UTC (permalink / raw)
To: Andrew Davis; +Cc: meta-ti, Denys Dmytriyenko
On Mon, Oct 23, 2023 at 10:50:43AM -0500, Andrew Davis wrote:
> On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@konsulko.com>
> >
> >Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
> >essential FW images to be added to rootfs by default.
> >
> >Correct beagle-x15 to pull devicetrees and kernel image as well.
> >
>
> Would it be better to have the bb.org kernel pull in `kernel-rdepends.inc` like
> the other kernels and get all these RDEPENDS/RRECOMMENDS from that?
No, I was actually working on the opposite - moving those to corresponding
machine/SoC configs and removing kernel-rdepends.inc
MACHINE_ESSENTIAL_EXTRA_RDEPENDS and MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS are
a proper way to express such dependencies for things like FW images to be
pulled into an image, instead of making kernel RDEPENDS on them. And it is
not specific to a particular kernel, so you don't need to keep including that
kernel-rdepends.inc from every kernel recipe.
> >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >---
> > meta-ti-bsp/conf/machine/beagle-x15.conf | 2 ++
> > meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
> > meta-ti-bsp/conf/machine/beaglebone.conf | 2 ++
> > meta-ti-bsp/conf/machine/beagleplay.conf | 3 +++
> > 4 files changed, 10 insertions(+)
> >
> >diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >index be27705c..3b857165 100644
> >--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
> >+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >@@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
> > SERIAL_CONSOLES = "115200;ttyS2"
> > UBOOT_MACHINE = "am57xx_evm_config"
> >+
> >+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> >diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >index 2f9c7288..3f5a027e 100644
> >--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >@@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
> > "
> > MACHINE_GUI_CLASS = "bigscreen"
> >+
> > MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> >+
> >+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
> >diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
> >index 2d811d0d..45944ce8 100644
> >--- a/meta-ti-bsp/conf/machine/beaglebone.conf
> >+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
> >@@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
> > SERIAL_CONSOLES = "115200;ttyS0"
> > MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> >+
> >+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
> >diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
> >index 6a0f697f..4dd550a1 100644
> >--- a/meta-ti-bsp/conf/machine/beagleplay.conf
> >+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> >@@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
> > "
> > MACHINE_GUI_CLASS = "bigscreen"
> >+
> > MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> >+
> >+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-ti] [master/kirkstone][PATCH 5/5] conf: beagle*: recommend essential FW images for Beagle devices
2023-10-23 15:52 ` Ryan Eatmon
@ 2023-10-23 16:56 ` Denys Dmytriyenko
0 siblings, 0 replies; 14+ messages in thread
From: Denys Dmytriyenko @ 2023-10-23 16:56 UTC (permalink / raw)
To: Ryan Eatmon; +Cc: afd, meta-ti, Denys Dmytriyenko
On Mon, Oct 23, 2023 at 10:52:49AM -0500, Ryan Eatmon wrote:
>
>
> On 10/23/2023 10:50 AM, Andrew Davis via lists.yoctoproject.org wrote:
> >On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
> >>From: Denys Dmytriyenko <denys@konsulko.com>
> >>
> >>Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
> >>essential FW images to be added to rootfs by default.
> >>
> >>Correct beagle-x15 to pull devicetrees and kernel image as well.
> >>
> >
> >Would it be better to have the bb.org kernel pull in
> >`kernel-rdepends.inc` like
> >the other kernels and get all these RDEPENDS/RRECOMMENDS from that?
>
> Someone submitted that patch earlier and I was hoping that Denys was
> going to address it as part of this series.
Yes, this patch does address it.
> >>Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >>---
> >> meta-ti-bsp/conf/machine/beagle-x15.conf | 2 ++
> >> meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
> >> meta-ti-bsp/conf/machine/beaglebone.conf | 2 ++
> >> meta-ti-bsp/conf/machine/beagleplay.conf | 3 +++
> >> 4 files changed, 10 insertions(+)
> >>
> >>diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>index be27705c..3b857165 100644
> >>--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>@@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
> >> SERIAL_CONSOLES = "115200;ttyS2"
> >> UBOOT_MACHINE = "am57xx_evm_config"
> >>+
> >>+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
> >>kernel-image-zimage"
> >>diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>index 2f9c7288..3f5a027e 100644
> >>--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>@@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
> >> "
> >> MACHINE_GUI_CLASS = "bigscreen"
> >>+
> >> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
> >>kernel-image-image"
> >>+
> >>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
> >>diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf
> >>b/meta-ti-bsp/conf/machine/beaglebone.conf
> >>index 2d811d0d..45944ce8 100644
> >>--- a/meta-ti-bsp/conf/machine/beaglebone.conf
> >>+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
> >>@@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
> >> SERIAL_CONSOLES = "115200;ttyS0"
> >> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
> >>kernel-image-zimage"
> >>+
> >>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
> >>diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf
> >>b/meta-ti-bsp/conf/machine/beagleplay.conf
> >>index 6a0f697f..4dd550a1 100644
> >>--- a/meta-ti-bsp/conf/machine/beagleplay.conf
> >>+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> >>@@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
> >> "
> >> MACHINE_GUI_CLASS = "bigscreen"
> >>+
> >> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree
> >>kernel-image-image"
> >>+
> >>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-ti] [master/kirkstone][PATCH 5/5] conf: beagle*: recommend essential FW images for Beagle devices
2023-10-23 16:56 ` Denys Dmytriyenko
@ 2023-10-23 17:18 ` Andrew Davis
2023-10-23 19:03 ` Denys Dmytriyenko
0 siblings, 1 reply; 14+ messages in thread
From: Andrew Davis @ 2023-10-23 17:18 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, Denys Dmytriyenko
On 10/23/23 11:56 AM, Denys Dmytriyenko wrote:
> On Mon, Oct 23, 2023 at 10:50:43AM -0500, Andrew Davis wrote:
>> On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
>>> From: Denys Dmytriyenko <denys@konsulko.com>
>>>
>>> Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
>>> essential FW images to be added to rootfs by default.
>>>
>>> Correct beagle-x15 to pull devicetrees and kernel image as well.
>>>
>>
>> Would it be better to have the bb.org kernel pull in `kernel-rdepends.inc` like
>> the other kernels and get all these RDEPENDS/RRECOMMENDS from that?
>
> No, I was actually working on the opposite - moving those to corresponding
> machine/SoC configs and removing kernel-rdepends.inc
>
> MACHINE_ESSENTIAL_EXTRA_RDEPENDS and MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS are
> a proper way to express such dependencies for things like FW images to be
> pulled into an image, instead of making kernel RDEPENDS on them. And it is
> not specific to a particular kernel, so you don't need to keep including that
> kernel-rdepends.inc from every kernel recipe.
>
If you are going to do it this way for all platforms, then you should
be able to do this in the machine/include/*.inc files vs out here
in each and every machine. So my question would be, if this is the right
direction, why only the Beagle plats in this patch?
Andrew
>
>>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
>>> ---
>>> meta-ti-bsp/conf/machine/beagle-x15.conf | 2 ++
>>> meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
>>> meta-ti-bsp/conf/machine/beaglebone.conf | 2 ++
>>> meta-ti-bsp/conf/machine/beagleplay.conf | 3 +++
>>> 4 files changed, 10 insertions(+)
>>>
>>> diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
>>> index be27705c..3b857165 100644
>>> --- a/meta-ti-bsp/conf/machine/beagle-x15.conf
>>> +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
>>> @@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
>>> SERIAL_CONSOLES = "115200;ttyS2"
>>> UBOOT_MACHINE = "am57xx_evm_config"
>>> +
>>> +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
>>> diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>>> index 2f9c7288..3f5a027e 100644
>>> --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>>> +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
>>> @@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
>>> "
>>> MACHINE_GUI_CLASS = "bigscreen"
>>> +
>>> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
>>> +
>>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
>>> diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
>>> index 2d811d0d..45944ce8 100644
>>> --- a/meta-ti-bsp/conf/machine/beaglebone.conf
>>> +++ b/meta-ti-bsp/conf/machine/beaglebone.conf
>>> @@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
>>> SERIAL_CONSOLES = "115200;ttyS0"
>>> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
>>> +
>>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
>>> diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
>>> index 6a0f697f..4dd550a1 100644
>>> --- a/meta-ti-bsp/conf/machine/beagleplay.conf
>>> +++ b/meta-ti-bsp/conf/machine/beagleplay.conf
>>> @@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
>>> "
>>> MACHINE_GUI_CLASS = "bigscreen"
>>> +
>>> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
>>> +
>>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-ti] [master/kirkstone][PATCH 5/5] conf: beagle*: recommend essential FW images for Beagle devices
2023-10-23 17:18 ` Andrew Davis
@ 2023-10-23 19:03 ` Denys Dmytriyenko
0 siblings, 0 replies; 14+ messages in thread
From: Denys Dmytriyenko @ 2023-10-23 19:03 UTC (permalink / raw)
To: Andrew Davis; +Cc: meta-ti, Denys Dmytriyenko
On Mon, Oct 23, 2023 at 12:18:18PM -0500, Andrew Davis wrote:
> On 10/23/23 11:56 AM, Denys Dmytriyenko wrote:
> >On Mon, Oct 23, 2023 at 10:50:43AM -0500, Andrew Davis wrote:
> >>On 10/20/23 3:44 PM, Denys Dmytriyenko wrote:
> >>>From: Denys Dmytriyenko <denys@konsulko.com>
> >>>
> >>>Set MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS per platform to list recommended
> >>>essential FW images to be added to rootfs by default.
> >>>
> >>>Correct beagle-x15 to pull devicetrees and kernel image as well.
> >>>
> >>
> >>Would it be better to have the bb.org kernel pull in `kernel-rdepends.inc` like
> >>the other kernels and get all these RDEPENDS/RRECOMMENDS from that?
> >
> >No, I was actually working on the opposite - moving those to corresponding
> >machine/SoC configs and removing kernel-rdepends.inc
> >
> >MACHINE_ESSENTIAL_EXTRA_RDEPENDS and MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS are
> >a proper way to express such dependencies for things like FW images to be
> >pulled into an image, instead of making kernel RDEPENDS on them. And it is
> >not specific to a particular kernel, so you don't need to keep including that
> >kernel-rdepends.inc from every kernel recipe.
> >
>
> If you are going to do it this way for all platforms, then you should
> be able to do this in the machine/include/*.inc files vs out here
> in each and every machine.
Yes, that's what I said above - "corresponding machine/SoC configs".
See the RFC patch I just sent to the list a bit earlier.
> So my question would be, if this is the right
> direction, why only the Beagle plats in this patch?
The main reason was Ravi's multiple revisions trying to remove PRU Eth
firmware images from kernel-rdepends.inc - didn't want to step over that and
require even more iterations... Now that it is dropped, this is no longer a
blocker.
> >>>Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >>>---
> >>> meta-ti-bsp/conf/machine/beagle-x15.conf | 2 ++
> >>> meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 +++
> >>> meta-ti-bsp/conf/machine/beaglebone.conf | 2 ++
> >>> meta-ti-bsp/conf/machine/beagleplay.conf | 3 +++
> >>> 4 files changed, 10 insertions(+)
> >>>
> >>>diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>>index be27705c..3b857165 100644
> >>>--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>>+++ b/meta-ti-bsp/conf/machine/beagle-x15.conf
> >>>@@ -19,3 +19,5 @@ MACHINE_GUI_CLASS = "bigscreen"
> >>> SERIAL_CONSOLES = "115200;ttyS2"
> >>> UBOOT_MACHINE = "am57xx_evm_config"
> >>>+
> >>>+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> >>>diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>>index 2f9c7288..3f5a027e 100644
> >>>--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>>+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
> >>>@@ -24,4 +24,7 @@ ti/k3-j721e-sk.dtb \
> >>> "
> >>> MACHINE_GUI_CLASS = "bigscreen"
> >>>+
> >>> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> >>>+
> >>>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw"
> >>>diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
> >>>index 2d811d0d..45944ce8 100644
> >>>--- a/meta-ti-bsp/conf/machine/beaglebone.conf
> >>>+++ b/meta-ti-bsp/conf/machine/beaglebone.conf
> >>>@@ -23,3 +23,5 @@ MACHINE_FEATURES += "screen"
> >>> SERIAL_CONSOLES = "115200;ttyS0"
> >>> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage"
> >>>+
> >>>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3"
> >>>diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
> >>>index 6a0f697f..4dd550a1 100644
> >>>--- a/meta-ti-bsp/conf/machine/beagleplay.conf
> >>>+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
> >>>@@ -42,4 +42,7 @@ ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
> >>> "
> >>> MACHINE_GUI_CLASS = "bigscreen"
> >>>+
> >>> MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-image"
> >>>+
> >>>+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += ""
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-ti] [master/kirkstone][PATCH 3/5] linux-bb.org: update kernel to 6.1 for Beagle devices
2023-10-23 15:53 ` [meta-ti] " Ryan Eatmon
@ 2023-10-23 19:19 ` Denys Dmytriyenko
2023-10-23 20:24 ` Ryan Eatmon
0 siblings, 1 reply; 14+ messages in thread
From: Denys Dmytriyenko @ 2023-10-23 19:19 UTC (permalink / raw)
To: reatmon; +Cc: meta-ti, Denys Dmytriyenko
On Mon, Oct 23, 2023 at 10:53:55AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>
> I just sent a patch for master only against this recipe that removes
> all of the patches. Not sure if you want a v2 series that includes
> that change, or just have a follow on patch.
Unless you explicitly want a v2 with master patch removal and possibly
kernel-rdepends.inc rework all squashed in, I'm fine with follow on patches.
> On 10/20/2023 3:44 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@konsulko.com>
> >
> >Update both 32-bit and 64-bit configs to use the latest 6.1 Linux kernel
> >from beagleboard.org repository, which is based on ti-linux-kernel repo
> >used in linux-ti-staging, but with extra Beagle-specific features on top.
> >
> >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >---
> > .../recipes-kernel/linux/linux-bb.org_git.bb | 19 +++++++++++--------
> > 1 file changed, 11 insertions(+), 8 deletions(-)
> >
> >diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> >index f4c1775d..4048e106 100644
> >--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> >+++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> >@@ -10,21 +10,24 @@ inherit kernel
> > require recipes-kernel/linux/setup-defconfig.inc
> > require recipes-kernel/linux/ti-kernel.inc
> >+# BB.org hasn't switched to "vendored" DTB layout by default yet
> >+KERNEL_DTBVENDORED = "0"
> >+
> > DEPENDS += "gmp-native libmpc-native"
> > KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
> > S = "${WORKDIR}/git"
> >-# 5.10.168 version for 32-bit
> >-SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a"
> >-PV:armv7a = "5.10.168+git${SRCPV}"
> >-BRANCH:armv7a = "v5.10.168-ti-r70"
> >+# 6.1.33 version for 32-bit
> >+SRCREV:armv7a = "feb1c153a9693d44dec5772d134bd2c7986ff95d"
> >+PV:armv7a = "6.1.33+git${SRCPV}"
> >+BRANCH:armv7a = "v6.1.33-ti-r7"
> >-# 5.10.162 version for 64-bit
> >-SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
> >-PV:aarch64 = "5.10.162+git${SRCPV}"
> >-BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
> >+# 6.1.46 version for 64-bit
> >+SRCREV:aarch64 = "0a1e93a38c699fdd3c629d57f5cd015f90ab0d36"
> >+PV:aarch64 = "6.1.46+git${SRCPV}"
> >+BRANCH:aarch64 = "v6.1.46-ti-arm64-r9"
> > SRC_URI = " \
> > git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-ti] [master/kirkstone][PATCH 3/5] linux-bb.org: update kernel to 6.1 for Beagle devices
2023-10-23 19:19 ` Denys Dmytriyenko
@ 2023-10-23 20:24 ` Ryan Eatmon
0 siblings, 0 replies; 14+ messages in thread
From: Ryan Eatmon @ 2023-10-23 20:24 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, Denys Dmytriyenko
On 10/23/2023 2:19 PM, Denys Dmytriyenko wrote:
> On Mon, Oct 23, 2023 at 10:53:55AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>>
>> I just sent a patch for master only against this recipe that removes
>> all of the patches. Not sure if you want a v2 series that includes
>> that change, or just have a follow on patch.
>
> Unless you explicitly want a v2 with master patch removal and possibly
> kernel-rdepends.inc rework all squashed in, I'm fine with follow on patches.
>
nah.. follow on patches are fine.
>> On 10/20/2023 3:44 PM, Denys Dmytriyenko wrote:
>>> From: Denys Dmytriyenko <denys@konsulko.com>
>>>
>>> Update both 32-bit and 64-bit configs to use the latest 6.1 Linux kernel
>> >from beagleboard.org repository, which is based on ti-linux-kernel repo
>>> used in linux-ti-staging, but with extra Beagle-specific features on top.
>>>
>>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
>>> ---
>>> .../recipes-kernel/linux/linux-bb.org_git.bb | 19 +++++++++++--------
>>> 1 file changed, 11 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
>>> index f4c1775d..4048e106 100644
>>> --- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
>>> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
>>> @@ -10,21 +10,24 @@ inherit kernel
>>> require recipes-kernel/linux/setup-defconfig.inc
>>> require recipes-kernel/linux/ti-kernel.inc
>>> +# BB.org hasn't switched to "vendored" DTB layout by default yet
>>> +KERNEL_DTBVENDORED = "0"
>>> +
>>> DEPENDS += "gmp-native libmpc-native"
>>> KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
>>> S = "${WORKDIR}/git"
>>> -# 5.10.168 version for 32-bit
>>> -SRCREV:armv7a = "a943fc1987e1b8057b0b5219ecd3c5a85285d62a"
>>> -PV:armv7a = "5.10.168+git${SRCPV}"
>>> -BRANCH:armv7a = "v5.10.168-ti-r70"
>>> +# 6.1.33 version for 32-bit
>>> +SRCREV:armv7a = "feb1c153a9693d44dec5772d134bd2c7986ff95d"
>>> +PV:armv7a = "6.1.33+git${SRCPV}"
>>> +BRANCH:armv7a = "v6.1.33-ti-r7"
>>> -# 5.10.162 version for 64-bit
>>> -SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
>>> -PV:aarch64 = "5.10.162+git${SRCPV}"
>>> -BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
>>> +# 6.1.46 version for 64-bit
>>> +SRCREV:aarch64 = "0a1e93a38c699fdd3c629d57f5cd015f90ab0d36"
>>> +PV:aarch64 = "6.1.46+git${SRCPV}"
>>> +BRANCH:aarch64 = "v6.1.46-ti-arm64-r9"
>>> SRC_URI = " \
>>> git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2023-10-23 20:25 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-20 20:44 [master/kirkstone][PATCH 1/5] conf: beaglebone-ai64: trim down the DTB list Denys Dmytriyenko
2023-10-20 20:44 ` [master/kirkstone][PATCH 2/5] conf: beagleplay: " Denys Dmytriyenko
2023-10-20 20:44 ` [master/kirkstone][PATCH 3/5] linux-bb.org: update kernel to 6.1 for Beagle devices Denys Dmytriyenko
2023-10-23 15:53 ` [meta-ti] " Ryan Eatmon
2023-10-23 19:19 ` Denys Dmytriyenko
2023-10-23 20:24 ` Ryan Eatmon
2023-10-20 20:44 ` [master/kirkstone][PATCH 4/5] u-boot-bb.org: add back Beagle-specific U-boot 2023.04 Denys Dmytriyenko
2023-10-20 20:44 ` [master/kirkstone][PATCH 5/5] conf: beagle*: recommend essential FW images for Beagle devices Denys Dmytriyenko
2023-10-23 15:50 ` [meta-ti] " Andrew Davis
2023-10-23 15:52 ` Ryan Eatmon
2023-10-23 16:56 ` Denys Dmytriyenko
2023-10-23 16:56 ` Denys Dmytriyenko
2023-10-23 17:18 ` Andrew Davis
2023-10-23 19:03 ` Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.