From a44233c1a776ac4abaeef05a24735c8169708c14 Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Fri, 11 Aug 2023 09:29:42 +0200
Subject: [PATCH] legacy-bsp/conf/machine: Fix fitimage support for armada

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

id:413752
---
 .../meta-netmodule-legacy-bsp/conf/machine/include/armada.inc | 4 ++++
 .../conf/machine/netmodule-hw14.conf                          | 3 +++
 .../conf/machine/netmodule-hw17.conf                          | 2 ++
 .../conf/machine/netmodule-hw18.conf                          | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/include/armada.inc b/layers/meta-netmodule-legacy-bsp/conf/machine/include/armada.inc
index bc00768..4da4f13 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/include/armada.inc
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/include/armada.inc
@@ -16,3 +16,7 @@ FILE_INODE_SIZE = "0"
 MACHINE_FEATURES:remove = "bluetooth"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-nrsw"
+
+UBOOT_MACHINE = "${MACHINE}_defconfig"
+UBOOT_ENTRYPOINT = "0x13000000"
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw14.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw14.conf
index abdd2c1..4df7f58 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw14.conf
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw14.conf
@@ -15,3 +15,6 @@ KERNEL_DEVICETREE = "\
 	openwrt-nbhw14-sgmii.dtb \
 "
 
+# May be an external console on some devices
+DEBUG_SERIAL_CONSOLE ?= "115200;ttyS0"
+SERIAL_CONSOLES = "${DEBUG_SERIAL_CONSOLE}"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw17.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw17.conf
index 6dd2709..c26911a 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw17.conf
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw17.conf
@@ -12,3 +12,5 @@ MAX_FS_SIZE = "279542"
 # printenv fdt_image
 KERNEL_DEVICETREE = "openwrt-nbhw17.dtb"
 
+EXT_SERIAL_CONSOLE ?= "115200;ttyS1"
+SERIAL_CONSOLES = "${EXT_SERIAL_CONSOLE}"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw18.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw18.conf
index 607d8b2..708adae 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw18.conf
+++ b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw18.conf
@@ -15,3 +15,6 @@ KERNEL_DEVICETREE = " \
     armada-385-nbhw18-prod1.dtb \
 "
 
+DEBUG_SERIAL_CONSOLE ?= "115200;ttyS0"
+EXT_SERIAL_CONSOLE ?= "115200;ttyS1"
+SERIAL_CONSOLES = "${EXT_SERIAL_CONSOLE} ${DEBUG_SERIAL_CONSOLE}"