diff mbox series

[kirkstone] meta-arago-distro: Add Jailhouse support for am62xx

Message ID 20230425104241.31410-1-p-bhagat@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series [kirkstone] meta-arago-distro: Add Jailhouse support for am62xx | expand

Commit Message

Paresh Bhagat April 25, 2023, 10:42 a.m. UTC
- Update arago conf to add support for jailhouse in am62xx.
- Update package group to add support for jailhouse for am62xx.

Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
Signed-off-by: paresh-ti <p-bhagat@ti.com>
---
 meta-arago-distro/conf/distro/arago.conf                       | 3 +++
 meta-arago-distro/conf/distro/include/arago-prefs.inc          | 3 +++
 .../packagegroups/packagegroup-arago-tisdk-addons.bb           | 2 ++
 3 files changed, 8 insertions(+)

Comments

Ryan Eatmon April 25, 2023, 2:18 p.m. UTC | #1
On 4/25/2023 5:42, paresh-ti wrote:
> - Update arago conf to add support for jailhouse in am62xx.
> - Update package group to add support for jailhouse for am62xx.
> 
> Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
> Signed-off-by: paresh-ti <p-bhagat@ti.com>
> ---
>   meta-arago-distro/conf/distro/arago.conf                       | 3 +++
>   meta-arago-distro/conf/distro/include/arago-prefs.inc          | 3 +++
>   .../packagegroups/packagegroup-arago-tisdk-addons.bb           | 2 ++
>   3 files changed, 8 insertions(+)
> 
> diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
> index 094e67da..3e4c4644 100644
> --- a/meta-arago-distro/conf/distro/arago.conf
> +++ b/meta-arago-distro/conf/distro/arago.conf
> @@ -121,6 +121,9 @@ PACKAGECONFIG:append:pn-cairo = " egl glesv2"
>   PACKAGECONFIG:remove:pn-alsa-plugins = "pulseaudio"
>   RDEPENDS:pulseaudio-server:remove = "alsa-plugins-pulseaudio-conf"
>   
> +# Configure RAMFS for jailhouse linux-demo
> +JH_RAMFS_IMAGE = "tisdk-tiny-image"
> +
>   # Enable UI and scripting for perf
>   PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui"
>   
> diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
> index 34c3c539..c632e111 100644
> --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
> +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
> @@ -19,3 +19,6 @@ PREFERRED_PROVIDER_wpa-supplicant = "wpa-supplicant"
>   #PREFERRED_PROVIDER_wpa-supplicant:ti33x = "wpa-supplicant-wl18xx"
>   #PREFERRED_PROVIDER_wpa-supplicant:ti43x = "wpa-supplicant-wl18xx"
>   #PREFERRED_PROVIDER_wpa-supplicant:omap-a15 = "wpa-supplicant-wl18xx"
> +
> +CREATE_SRCIPK:pn-jailhouse ?= "1"
> +SRCIPK_INSTALL_DIR:pn-jailhouse ?= "board-support/extra-drivers/${PN}-${PV}"
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> index 8d8a36f6..271c05ab 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> @@ -52,6 +52,7 @@ UTILS:append:omap-a15 = " mmc-utils \
>   UTILS:append:k3 = " mmc-utils \
>                       switch-config \
>                       irqbalance \
> +                    jailhouse \

You appear to the be adding jailhouse to ALL k3 ...

>                       ti-rpmsg-char \
>                       ti-rpmsg-char-examples \
>                       statcol \
> @@ -59,6 +60,7 @@ UTILS:append:k3 = " mmc-utils \
>   
>   UTILS:append:k3 = " ti-rtos-firmware"
>   UTILS:append:am64xx = " pru-icss"
> +UTILS:append:am62xx = " pru-icss jailhouse"

... and then adding it again for just am62xx.

One of those two lines should be removed.  Either it's for all 
platforms, or it is just am62xx.  Based on the commit message, I think 
the first one is what you want to remove.


>   UTILS:append:am65xx = " pru-icss"
>   UTILS:append:j721e = " pru-icss"
>
diff mbox series

Patch

diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 094e67da..3e4c4644 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -121,6 +121,9 @@  PACKAGECONFIG:append:pn-cairo = " egl glesv2"
 PACKAGECONFIG:remove:pn-alsa-plugins = "pulseaudio"
 RDEPENDS:pulseaudio-server:remove = "alsa-plugins-pulseaudio-conf"
 
+# Configure RAMFS for jailhouse linux-demo
+JH_RAMFS_IMAGE = "tisdk-tiny-image"
+
 # Enable UI and scripting for perf
 PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui"
 
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index 34c3c539..c632e111 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -19,3 +19,6 @@  PREFERRED_PROVIDER_wpa-supplicant = "wpa-supplicant"
 #PREFERRED_PROVIDER_wpa-supplicant:ti33x = "wpa-supplicant-wl18xx"
 #PREFERRED_PROVIDER_wpa-supplicant:ti43x = "wpa-supplicant-wl18xx"
 #PREFERRED_PROVIDER_wpa-supplicant:omap-a15 = "wpa-supplicant-wl18xx"
+
+CREATE_SRCIPK:pn-jailhouse ?= "1"
+SRCIPK_INSTALL_DIR:pn-jailhouse ?= "board-support/extra-drivers/${PN}-${PV}"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 8d8a36f6..271c05ab 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -52,6 +52,7 @@  UTILS:append:omap-a15 = " mmc-utils \
 UTILS:append:k3 = " mmc-utils \
                     switch-config \
                     irqbalance \
+                    jailhouse \
                     ti-rpmsg-char \
                     ti-rpmsg-char-examples \
                     statcol \
@@ -59,6 +60,7 @@  UTILS:append:k3 = " mmc-utils \
 
 UTILS:append:k3 = " ti-rtos-firmware"
 UTILS:append:am64xx = " pru-icss"
+UTILS:append:am62xx = " pru-icss jailhouse"
 UTILS:append:am65xx = " pru-icss"
 UTILS:append:j721e = " pru-icss"