[meta-ti][zeus PATCH v1 1/2] recipes-bsp: jailhouse: Update tty for j7-evm jailhouse

[meta-ti][zeus PATCH v1 1/2] recipes-bsp: jailhouse: Update tty for j7-evm jailhouse

[Nikhil Devshatwar]

From: Nikhil Devshatwar <nikhil.nd@ti.com>

Latest upstream jailhouse uses ttyS3 as the console for
inmate cell. Update the recipe to pass the correct cmdline.

Override only for j7-evm

Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
---
 recipes-kernel/jailhouse/jailhouse_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
index a4ee2fc7..1273c57d 100644
--- a/recipes-kernel/jailhouse/jailhouse_git.bb
+++ b/recipes-kernel/jailhouse/jailhouse_git.bb
@@ -59,7 +59,8 @@ INITRAMFS_IMAGE ?= ""
 JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"
 
 JH_CMDLINE ?= ""
-JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
+JH_CMDLINE_am65xx ?= "console=ttyS1,115200n8"
+JH_CMDLINE_j7-evm ?= "console=ttyS3,115200n8"
 
 do_configure() {
 	if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; 
-- 
2.17.1

[meta-ti][zeus PATCH v1 2/2] conf: j7-evm: Update the secondary console for jailhouse

[Nikhil Devshatwar]

From: Nikhil Devshatwar <nikhil.nd@ti.com>

Latest upstream jailhouse uses ttyS3 as console.
Update the conf file so that this reflects correctly in the
tiny rootfs.

Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
---
 conf/machine/j7-evm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf
index e73c75bd..9e910067 100644
--- a/conf/machine/j7-evm.conf
+++ b/conf/machine/j7-evm.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/k3.inc
 
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
+SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 KERNEL_DEVICETREE = " \
-- 
2.17.1

Re: [meta-ti][zeus PATCH v1 1/2] recipes-bsp: jailhouse: Update tty for j7-evm jailhouse

[Denys Dmytriyenko]

Thanks.

On Thu, Mar 05, 2020 at 01:03:46AM +0530, nikhil.nd@ti.com wrote:
> From: Nikhil Devshatwar <nikhil.nd@ti.com>
> 
> Latest upstream jailhouse uses ttyS3 as the console for
> inmate cell. Update the recipe to pass the correct cmdline.
> 
> Override only for j7-evm
> 
> Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
> ---
>  recipes-kernel/jailhouse/jailhouse_git.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> index a4ee2fc7..1273c57d 100644
> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> @@ -59,7 +59,8 @@ INITRAMFS_IMAGE ?= ""
>  JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"
>  
>  JH_CMDLINE ?= ""
> -JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
> +JH_CMDLINE_am65xx ?= "console=ttyS1,115200n8"
> +JH_CMDLINE_j7-evm ?= "console=ttyS3,115200n8"

Will this break am65?


>  do_configure() {
>  	if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; 
> -- 
> 2.17.1
>