* [meta-ti][master/scarthgap][PATCH v2] conf: machine: Update am62xxsip-evm for multi-BSP support
@ 2024-06-17 13:55 Chirag Shilwant
2024-06-17 16:11 ` Denys Dmytriyenko
0 siblings, 1 reply; 3+ messages in thread
From: Chirag Shilwant @ 2024-06-17 13:55 UTC (permalink / raw)
To: meta-ti; +Cc: Ryan Eatmon, Gyan Gupta
Update am62xxsip-evm machine configuration to support
TI kernel 6.1 & ti-u-boot-2023.04
Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
---
v2: In commit message, s/ti-u-boot-2024.04/ti-u-boot-2023.04
meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 4 ++++
meta-ti-bsp/conf/machine/am62xxsip-evm.conf | 2 ++
meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb | 1 +
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 6 ++++++
4 files changed, 13 insertions(+)
diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
index c35edc6e..55bc530b 100644
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
@@ -9,3 +9,7 @@ SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "hs-fs"
UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
+
+UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config"
diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
index 38fe04c9..8104329e 100644
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
@@ -14,3 +14,5 @@ KERNEL_DEVICETREE = " \
"
UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
+
+UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
diff --git a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
index 1ad236ce..3453725e 100644
--- a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
@@ -37,6 +37,7 @@ DM_FW_DIR = "ti-dm/${PLAT_SFX}"
INSTALL_DM_FW_DIR = "${nonarch_base_libdir}/firmware/${DM_FW_DIR}"
DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
+DM_FIRMWARE:am62pxx = "${@oe.utils.conditional("DISPLAY_CLUSTER_ENABLE", "1", "dss_display_share.wkup-r5f0_0.release.strip.out", "ipc_echo_testb_mcu1_0_release_strip.xer5f", d)}"
DM_FW_LIST = ""
DM_FW_LIST:j721e = "${DM_FIRMWARE}"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
index bad8371f..0a52eded 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -37,6 +37,7 @@ DEPENDS:append:k3 = " ti-sci-fw"
DEPENDS:append:k3r5 = " ti-sci-fw"
DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
+DM_FIRMWARE:am62pxx = "${@oe.utils.conditional("DISPLAY_CLUSTER_ENABLE", "1", "dss_display_share.wkup-r5f0_0.release.strip.out", "ipc_echo_testb_mcu1_0_release_strip.xer5f", d)}"
PLAT_SFX = ""
PLAT_SFX:j721e = "j721e"
@@ -68,8 +69,13 @@ COMPATIBLE_MACHINE = "(ti-soc)"
BINMAN_INDIRS="${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware"
+TI_DM="${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE}"
+
EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS} BINMAN_INDIRS=${BINMAN_INDIRS}"
+# Use TI_DM argument only for am62pxx which has two DM firmwares in ti-linux-firmware
+EXTRA_OEMAKE:append:am62pxx = " TI_DM=${TI_DM}"
+
PROVIDES += "u-boot"
PKG:${PN} = "u-boot"
PKG:${PN}-dev = "u-boot-dev"
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [meta-ti][master/scarthgap][PATCH v2] conf: machine: Update am62xxsip-evm for multi-BSP support
2024-06-17 13:55 [meta-ti][master/scarthgap][PATCH v2] conf: machine: Update am62xxsip-evm for multi-BSP support Chirag Shilwant
@ 2024-06-17 16:11 ` Denys Dmytriyenko
2024-06-17 16:12 ` Ryan Eatmon
0 siblings, 1 reply; 3+ messages in thread
From: Denys Dmytriyenko @ 2024-06-17 16:11 UTC (permalink / raw)
To: c-shilwant; +Cc: meta-ti, Ryan Eatmon, Gyan Gupta
On Mon, Jun 17, 2024 at 07:25:32PM +0530, Chirag Shilwant via lists.yoctoproject.org wrote:
> Update am62xxsip-evm machine configuration to support
> TI kernel 6.1 & ti-u-boot-2023.04
>
> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> ---
> v2: In commit message, s/ti-u-boot-2024.04/ti-u-boot-2023.04
Were am62p DM firmware changes supposed to be included here?
> meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 4 ++++
> meta-ti-bsp/conf/machine/am62xxsip-evm.conf | 2 ++
> meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb | 1 +
> meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 6 ++++++
> 4 files changed, 13 insertions(+)
>
> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> index c35edc6e..55bc530b 100644
> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
> @@ -9,3 +9,7 @@ SYSFW_CONFIG = "evm"
> SYSFW_SUFFIX = "hs-fs"
>
> UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
> +
> +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
> +
> +UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config"
> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> index 38fe04c9..8104329e 100644
> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
> @@ -14,3 +14,5 @@ KERNEL_DEVICETREE = " \
> "
>
> UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
> +
> +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
> diff --git a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
> index 1ad236ce..3453725e 100644
> --- a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
> +++ b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
> @@ -37,6 +37,7 @@ DM_FW_DIR = "ti-dm/${PLAT_SFX}"
> INSTALL_DM_FW_DIR = "${nonarch_base_libdir}/firmware/${DM_FW_DIR}"
>
> DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
> +DM_FIRMWARE:am62pxx = "${@oe.utils.conditional("DISPLAY_CLUSTER_ENABLE", "1", "dss_display_share.wkup-r5f0_0.release.strip.out", "ipc_echo_testb_mcu1_0_release_strip.xer5f", d)}"
>
> DM_FW_LIST = ""
> DM_FW_LIST:j721e = "${DM_FIRMWARE}"
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> index bad8371f..0a52eded 100644
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> @@ -37,6 +37,7 @@ DEPENDS:append:k3 = " ti-sci-fw"
> DEPENDS:append:k3r5 = " ti-sci-fw"
>
> DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
> +DM_FIRMWARE:am62pxx = "${@oe.utils.conditional("DISPLAY_CLUSTER_ENABLE", "1", "dss_display_share.wkup-r5f0_0.release.strip.out", "ipc_echo_testb_mcu1_0_release_strip.xer5f", d)}"
>
> PLAT_SFX = ""
> PLAT_SFX:j721e = "j721e"
> @@ -68,8 +69,13 @@ COMPATIBLE_MACHINE = "(ti-soc)"
>
> BINMAN_INDIRS="${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware"
>
> +TI_DM="${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE}"
> +
> EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS} BINMAN_INDIRS=${BINMAN_INDIRS}"
>
> +# Use TI_DM argument only for am62pxx which has two DM firmwares in ti-linux-firmware
> +EXTRA_OEMAKE:append:am62pxx = " TI_DM=${TI_DM}"
> +
> PROVIDES += "u-boot"
> PKG:${PN} = "u-boot"
> PKG:${PN}-dev = "u-boot-dev"
> --
> 2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [meta-ti][master/scarthgap][PATCH v2] conf: machine: Update am62xxsip-evm for multi-BSP support
2024-06-17 16:11 ` Denys Dmytriyenko
@ 2024-06-17 16:12 ` Ryan Eatmon
0 siblings, 0 replies; 3+ messages in thread
From: Ryan Eatmon @ 2024-06-17 16:12 UTC (permalink / raw)
To: Denys Dmytriyenko, c-shilwant; +Cc: meta-ti, Gyan Gupta
On 6/17/2024 11:11 AM, Denys Dmytriyenko wrote:
> On Mon, Jun 17, 2024 at 07:25:32PM +0530, Chirag Shilwant via lists.yoctoproject.org wrote:
>> Update am62xxsip-evm machine configuration to support
>> TI kernel 6.1 & ti-u-boot-2023.04
>>
>> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
>> ---
>> v2: In commit message, s/ti-u-boot-2024.04/ti-u-boot-2023.04
>
> Were am62p DM firmware changes supposed to be included here?
He already sent a v3 that removed those.
>
>> meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 4 ++++
>> meta-ti-bsp/conf/machine/am62xxsip-evm.conf | 2 ++
>> meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb | 1 +
>> meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 6 ++++++
>> 4 files changed, 13 insertions(+)
>>
>> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
>> index c35edc6e..55bc530b 100644
>> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
>> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
>> @@ -9,3 +9,7 @@ SYSFW_CONFIG = "evm"
>> SYSFW_SUFFIX = "hs-fs"
>>
>> UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
>> +
>> +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
>> +
>> +UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config"
>> diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
>> index 38fe04c9..8104329e 100644
>> --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
>> +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
>> @@ -14,3 +14,5 @@ KERNEL_DEVICETREE = " \
>> "
>>
>> UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
>> +
>> +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
>> diff --git a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
>> index 1ad236ce..3453725e 100644
>> --- a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
>> +++ b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
>> @@ -37,6 +37,7 @@ DM_FW_DIR = "ti-dm/${PLAT_SFX}"
>> INSTALL_DM_FW_DIR = "${nonarch_base_libdir}/firmware/${DM_FW_DIR}"
>>
>> DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
>> +DM_FIRMWARE:am62pxx = "${@oe.utils.conditional("DISPLAY_CLUSTER_ENABLE", "1", "dss_display_share.wkup-r5f0_0.release.strip.out", "ipc_echo_testb_mcu1_0_release_strip.xer5f", d)}"
>>
>> DM_FW_LIST = ""
>> DM_FW_LIST:j721e = "${DM_FIRMWARE}"
>> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
>> index bad8371f..0a52eded 100644
>> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
>> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
>> @@ -37,6 +37,7 @@ DEPENDS:append:k3 = " ti-sci-fw"
>> DEPENDS:append:k3r5 = " ti-sci-fw"
>>
>> DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
>> +DM_FIRMWARE:am62pxx = "${@oe.utils.conditional("DISPLAY_CLUSTER_ENABLE", "1", "dss_display_share.wkup-r5f0_0.release.strip.out", "ipc_echo_testb_mcu1_0_release_strip.xer5f", d)}"
>>
>> PLAT_SFX = ""
>> PLAT_SFX:j721e = "j721e"
>> @@ -68,8 +69,13 @@ COMPATIBLE_MACHINE = "(ti-soc)"
>>
>> BINMAN_INDIRS="${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware"
>>
>> +TI_DM="${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE}"
>> +
>> EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS} BINMAN_INDIRS=${BINMAN_INDIRS}"
>>
>> +# Use TI_DM argument only for am62pxx which has two DM firmwares in ti-linux-firmware
>> +EXTRA_OEMAKE:append:am62pxx = " TI_DM=${TI_DM}"
>> +
>> PROVIDES += "u-boot"
>> PKG:${PN} = "u-boot"
>> PKG:${PN}-dev = "u-boot-dev"
>> --
>> 2.34.1
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-17 16:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-17 13:55 [meta-ti][master/scarthgap][PATCH v2] conf: machine: Update am62xxsip-evm for multi-BSP support Chirag Shilwant
2024-06-17 16:11 ` Denys Dmytriyenko
2024-06-17 16:12 ` Ryan Eatmon
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.