[meta-ti][master/kirkstone][PATCH v3 1/2] recipes-bsp: u-boot: Add u-boot-mergeconfig.inc to handle fragment u-boot config

[meta-ti][master/kirkstone][PATCH v3 1/2] recipes-bsp: u-boot: Add u-boot-mergeconfig.inc to handle fragment u-boot config

[Chirag Shilwant]

- U-boot recipe in OE-Core supports out-of-tree config fragments that are passed via SRC_URI and automatically merges all *.cfg files as fragments.
This makes specifying config fragments in the machine configuration a bit difficult. Hence, add a logic which will ensure we handle u-boot config fragments
using a new variable UBOOT_CONFIG_FRAGMENTS.

- The u-boot-mergeconfig.inc will allow us to build u-boot with list of config fragments specified in UBOOT_CONFIG_FRAGMENTS along with the base defconfig mentioned in UBOOT_MACHINE.

- Include u-boot-mergeconfig.inc in u-boot-ti.inc

Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc | 7 +++++++
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc          | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
new file mode 100644
index 00000000..e2ae5894
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
@@ -0,0 +1,7 @@
+do_configure:append () {
+   if [ -n "${UBOOT_CONFIG_FRAGMENTS}" ]
+   then
+       oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} ${UBOOT_CONFIG_FRAGMENTS}
+       oe_runmake -C ${S} O=${B} olddefconfig
+   fi
+}
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 f3285c23..5292517b 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
@@ -7,6 +7,7 @@ SPL_BINARY ?= "MLO"
 
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
+require u-boot-mergeconfig.inc
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"
 
-- 
2.34.1

[meta-ti][master/kirkstone][PATCH v3 2/2] conf: machine: Add am62xxsip-evm configuration

[Chirag Shilwant]

- Add A53 and R5 machine configurations for am62xxsip-evm.
- Use UBOOT_CONFIG_FRAGMENTS as am62xsip_sk_r5.config in R5 machine configuration. This will ensure we 
build u-boot-r5 with baseconfig as am62x_evm_r5_defconfig and config fragment as am62xsip_sk_r5.config.

Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
Reviewed-by: Praneeth Bajjuri <praneeth@ti.com>
---
 meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 12 ++++++++++++
 meta-ti-bsp/conf/machine/am62xxsip-evm.conf      | 13 +++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
 create mode 100644 meta-ti-bsp/conf/machine/am62xxsip-evm.conf

diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
new file mode 100644
index 00000000..381eed1a
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: AM62XX SIP EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG_FRAGMENTS = "am62xsip_sk_r5.config"
diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
new file mode 100644
index 00000000..dc4f3b77
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: AM62XX SIP EVM
+#@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM
+
+require conf/machine/include/am62xx.inc
+
+KERNEL_DEVICETREE_PREFIX = "ti/k3-am625"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am625-sk.dtb \
+"
+
+UBOOT_MACHINE = "am62x_evm_a53_defconfig"
-- 
2.34.1

Re: [meta-ti][master/kirkstone][PATCH v3 1/2] recipes-bsp: u-boot: Add u-boot-mergeconfig.inc to handle fragment u-boot config

[Denys Dmytriyenko]

On Thu, Sep 14, 2023 at 05:28:12PM +0530, Chirag Shilwant wrote:

> - U-boot recipe in OE-Core supports out-of-tree config fragments that are 
> passed via SRC_URI and automatically merges all *.cfg files as fragments. 
> This makes specifying config fragments in the machine configuration a bit 
> difficult. Hence, add a logic which will ensure we handle u-boot config 
> fragments using a new variable UBOOT_CONFIG_FRAGMENTS.
> 
> - The u-boot-mergeconfig.inc will allow us to build u-boot with list of 
> config fragments specified in UBOOT_CONFIG_FRAGMENTS along with the base 
> defconfig mentioned in UBOOT_MACHINE.
> 
> - Include u-boot-mergeconfig.inc in u-boot-ti.inc

Thanks for addressing majority of my comments!
Would be nice to keep the standard formatting for the text and line wrap under 
80 characters, instead of writing long paragraphs as a single line.


> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> ---

Also, patch revision logs here are useful to keep track of what's changed 
between revisions.


>  meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc | 7 +++++++
>  meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc          | 1 +
>  2 files changed, 8 insertions(+)
>  create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
> 
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
> new file mode 100644
> index 00000000..e2ae5894
> --- /dev/null
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
> @@ -0,0 +1,7 @@
> +do_configure:append () {
> +   if [ -n "${UBOOT_CONFIG_FRAGMENTS}" ]

Since we are going with the minimal approach for now, would be nice to also 
check that UBOOT_MACHINE is set before using fragments.


> +   then
> +       oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} ${UBOOT_CONFIG_FRAGMENTS}
> +       oe_runmake -C ${S} O=${B} olddefconfig
> +   fi
> +}
> 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 f3285c23..5292517b 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
> @@ -7,6 +7,7 @@ SPL_BINARY ?= "MLO"
>  
>  require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc
>  require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
> +require u-boot-mergeconfig.inc
>  
>  FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"
>  
> -- 
> 2.34.1