From 8f281e17e6a584979efa413d95e007957ac9cf48 Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Mon, 7 Aug 2023 10:15:57 +0200
Subject: [PATCH] legacy-bsp/conf/machine: Fix sitara machine to boot ramdisk
 images

UBOOT_MACHINE is required by the fitimage recipe.
SERIAL_CONSOLES is required to open the login shell on the right
interfaces.

id:413752
---
 .../conf/machine/include/am335x-nrhw16-nrhw24.inc             | 3 +++
 .../meta-netmodule-legacy-bsp/conf/machine/include/ti33x.inc  | 1 +
 .../conf/machine/netmodule-hw20.conf                          | 3 +++
 .../conf/machine/netmodule-hw22.conf                          | 3 +++
 .../conf/machine/netmodule-hw25.conf                          | 4 ++++
 .../conf/machine/netmodule-hw26.conf                          | 2 ++
 6 files changed, 16 insertions(+)

diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/include/am335x-nrhw16-nrhw24.inc b/layers/meta-netmodule-legacy-bsp/conf/machine/include/am335x-nrhw16-nrhw24.inc
index 6d4cb86..1c5e8e8 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/include/am335x-nrhw16-nrhw24.inc
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/include/am335x-nrhw16-nrhw24.inc
@@ -9,3 +9,6 @@ KERNEL_DEVICETREE = "\
 	am335x-nmhw24-prod1.dtb \
 	"
 
+DEBUG_SERIAL_CONSOLE ?= "115200;ttyS1"
+COMIO_SERIAL_CONSOLE ?= "115200;ttyS0"
+SERIAL_CONSOLES = "${DEBUG_SERIAL_CONSOLE} ${COMIO_SERIAL_CONSOLE}"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/include/ti33x.inc b/layers/meta-netmodule-legacy-bsp/conf/machine/include/ti33x.inc
index dc4a057..7054cde 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/include/ti33x.inc
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/include/ti33x.inc
@@ -29,6 +29,7 @@ include conf/machine/include/arm/armv7a/tune-cortexa8.inc
 
 KERNEL_IMAGETYPE = "zImage"
 
+UBOOT_MACHINE = "${MACHINE}_defconfig"
 # SPL_BINARY = "MLO"
 UBOOT_SUFFIX = "img"
 UBOOT_ENTRYPOINT = "0x80008000"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf
index 48bbe5e..f3429de 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf
@@ -12,3 +12,6 @@ KERNEL_DEVICETREE = "\
 	am335x-nrhw20-prod1.dtb \
 	"
 
+EXT_SERIAL_CONSOLE ?= "115200;ttyS1"
+COMIO_SERIAL_CONSOLE ?= "115200;ttyS0"
+SERIAL_CONSOLES = "${EXT_SERIAL_CONSOLE} ${COMIO_SERIAL_CONSOLE}"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw22.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw22.conf
index 21aa354..0472b70 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw22.conf
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw22.conf
@@ -11,3 +11,6 @@ MAX_FS_SIZE = "279542"
 KERNEL_DEVICETREE = "\
 	am335x-nrhw22-prod1.dtb \
 	"
+
+DEBUG_SERIAL_CONSOLE ?= "115200;ttyS0"
+SERIAL_CONSOLES = "${DEBUG_SERIAL_CONSOLE}"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw25.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw25.conf
index 82e002e..58fa0eb 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw25.conf
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw25.conf
@@ -12,3 +12,7 @@ KERNEL_DEVICETREE = "\
 	am335x-hw25-prod1.dtb \
 	"
 
+# ext serial only on Sc models
+EXT_SERIAL_CONSOLE ?= "115200;ttyS5"
+DEBUG_SERIAL_CONSOLE ?= "115200;ttyS0"
+SERIAL_CONSOLES = "${EXT_SERIAL_CONSOLE} ${DEBUG_SERIAL_CONSOLE}"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf
index 61336e2..c98cc67 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf
@@ -12,3 +12,5 @@ KERNEL_DEVICETREE = "\
 	am335x-hw26-prod1.dtb \
 	"
 
+EXT_SERIAL_CONSOLE ?= "115200;ttyS2"
+SERIAL_CONSOLES = "${EXT_SERIAL_CONSOLE}"