[DistroKit] [PATCH 1/3] MIPS(EL): barebox: add /chosen/stdout-path properties for all boards

[DistroKit] [PATCH 1/3] MIPS(EL): barebox: add /chosen/stdout-path properties for all boards

[Ahmad Fatoum]

A lot of MIPS boards lack a /chosen/stdout-path property, instead
relying on the options CONFIG_CONSOLE_ACTIVATE_ALL/FIRST to select an
appropriate console. To allow usage of the barebox console with
CONFIG_CONSOLE_ACTIVATE_NONE, let's add explicit console activation.

The patches have already been submitted for upstream inclusion[1].

[1]: https://lore.barebox.org/barebox/20240822115701.1184099-1-a.fatoum@pengutronix.de

Fixes: 4c0d7cecdd75 ("mips/mipsel: barebox: use CONSOLE_ACTIVATE_NONE")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 ...osen-stdout-path-where-it-is-missing.patch | 99 +++++++++++++++++++
 ...emu-malta-explicitly-set-stdout-path.patch | 35 +++++++
 .../patches/barebox-2021.02.0/series          |  2 +
 ...osen-stdout-path-where-it-is-missing.patch | 99 +++++++++++++++++++
 ...emu-malta-explicitly-set-stdout-path.patch | 35 +++++++
 .../patches/barebox-2021.06.0/series          |  2 +
 6 files changed, 272 insertions(+)
 create mode 100644 configs/platform-mips/patches/barebox-2021.02.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
 create mode 100644 configs/platform-mips/patches/barebox-2021.02.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
 create mode 100644 configs/platform-mips/patches/barebox-2021.02.0/series
 create mode 100644 configs/platform-mipsel/patches/barebox-2021.06.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
 create mode 100644 configs/platform-mipsel/patches/barebox-2021.06.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
 create mode 100644 configs/platform-mipsel/patches/barebox-2021.06.0/series

diff --git a/configs/platform-mips/patches/barebox-2021.02.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch b/configs/platform-mips/patches/barebox-2021.02.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
new file mode 100644
index 000000000000..fbe71b59f523
--- /dev/null
+++ b/configs/platform-mips/patches/barebox-2021.02.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
@@ -0,0 +1,99 @@
+From 9af92b9cd64cb4a2df8ad03685e38fedf4ca78b4 Mon Sep 17 00:00:00 2001
+From: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Date: Wed, 21 Aug 2024 15:02:02 +0200
+Subject: [PATCH 1/2] MIPS: dts: add /chosen/stdout-path where it is missing
+
+A number of MIPS boards don't have a stdout-path set and instead rely on
+CONFIG_CONSOLE_ACTIVATE_ALL/FIRST to enable a console.
+
+This can get problematic if more consoles are added in future, or
+CONFIG_CONSOLE_ACTIVATE_NONE is to be used. So on systems that currently
+have a single console, let's have /chosen/stdout-path point at it.
+
+Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
+---
+ arch/mips/dts/black-swift.dts   | 4 ++++
+ arch/mips/dts/dlink-dir-320.dts | 4 ++++
+ arch/mips/dts/img-ci20.dts      | 4 ++++
+ arch/mips/dts/loongson-ls1b.dts | 4 ++++
+ arch/mips/dts/rzx50.dts         | 4 ++++
+ 5 files changed, 20 insertions(+)
+
+diff --git a/arch/mips/dts/black-swift.dts b/arch/mips/dts/black-swift.dts
+index af817dbfc7e1..6bb26d427f2d 100644
+--- a/arch/mips/dts/black-swift.dts
++++ b/arch/mips/dts/black-swift.dts
+@@ -13,6 +13,10 @@ aliases {
+ 		spiflash = &spiflash;
+ 	};
+ 
++	chosen {
++		stdout-path = &uart;
++	};
++
+ 	memory@0 {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x4000000>;
+diff --git a/arch/mips/dts/dlink-dir-320.dts b/arch/mips/dts/dlink-dir-320.dts
+index d19c3087d017..beec40f3dcc5 100644
+--- a/arch/mips/dts/dlink-dir-320.dts
++++ b/arch/mips/dts/dlink-dir-320.dts
+@@ -7,6 +7,10 @@ / {
+ 	#address-cells = <1>;
+ 	#size-cells = <1>;
+ 
++	chosen {
++		stdout-path = &serial0;
++	};
++
+ 	memory@0 {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x2000000>;
+diff --git a/arch/mips/dts/img-ci20.dts b/arch/mips/dts/img-ci20.dts
+index e1d3280c4e11..71038890d977 100644
+--- a/arch/mips/dts/img-ci20.dts
++++ b/arch/mips/dts/img-ci20.dts
+@@ -14,6 +14,10 @@ / {
+ 	model = "MIPS Creator CI20";
+ 	compatible = "img,ci20";
+ 
++	chosen {
++		stdout-path = &uart0;
++	};
++
+ 	memory@0 {
+ 		device_type = "memory";
+ 		reg = <0x0 0x10000000>;
+diff --git a/arch/mips/dts/loongson-ls1b.dts b/arch/mips/dts/loongson-ls1b.dts
+index 89cce5636bcf..30520a34f53b 100644
+--- a/arch/mips/dts/loongson-ls1b.dts
++++ b/arch/mips/dts/loongson-ls1b.dts
+@@ -6,6 +6,10 @@ / {
+ 	model = "Loongson Tech LS1B Demo Board";
+ 	compatible = "loongson,ls1b";
+ 
++	chosen {
++		stdout-path = &serial2;
++	};
++
+ 	oscillator: oscillator {
+ 			#clock-cells = <0>;
+ 			compatible = "fixed-clock";
+diff --git a/arch/mips/dts/rzx50.dts b/arch/mips/dts/rzx50.dts
+index bd3631f7c451..93211a97a59f 100644
+--- a/arch/mips/dts/rzx50.dts
++++ b/arch/mips/dts/rzx50.dts
+@@ -6,6 +6,10 @@ / {
+ 	model = "Ritmix RZX-50";
+ 	compatible = "ritmix,rzx50";
+ 
++	chosen {
++		stdout-path = &serial1;
++	};
++
+ 	memory@0 {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x4000000>;
+-- 
+2.39.2
+
diff --git a/configs/platform-mips/patches/barebox-2021.02.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch b/configs/platform-mips/patches/barebox-2021.02.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
new file mode 100644
index 000000000000..074b8c70036a
--- /dev/null
+++ b/configs/platform-mips/patches/barebox-2021.02.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
@@ -0,0 +1,35 @@
+From 0da08cd25a0bacfa22cde380d5ead90077b6c7b3 Mon Sep 17 00:00:00 2001
+From: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Date: Wed, 21 Aug 2024 15:12:02 +0200
+Subject: [PATCH 2/2] MIPS: qemu-malta: explicitly set stdout-path
+
+The Malta device tree describes and enables two consoles, but doesn't
+specify which one to use for barebox console.
+
+In configurations with CONFIG_CONSOLE_ACTIVATE_FIRST, it's thus
+dependent on device tree probe order, which console ends up being used
+by barebox.
+
+Fix this by explicitly pointing stdout-path at the first console.
+
+Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
+---
+ arch/mips/dts/qemu-malta.dts | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/mips/dts/qemu-malta.dts b/arch/mips/dts/qemu-malta.dts
+index c2bc03dd4631..6cf7513ff5fa 100644
+--- a/arch/mips/dts/qemu-malta.dts
++++ b/arch/mips/dts/qemu-malta.dts
+@@ -8,6 +8,8 @@ / {
+ 	#size-cells = <1>;
+ 
+ 	chosen {
++		stdout-path = &uart0;
++
+ 		environment {
+ 			compatible = "barebox,environment";
+ 			device-path = &env_nor;
+-- 
+2.39.2
+
diff --git a/configs/platform-mips/patches/barebox-2021.02.0/series b/configs/platform-mips/patches/barebox-2021.02.0/series
new file mode 100644
index 000000000000..b9b6f404fa41
--- /dev/null
+++ b/configs/platform-mips/patches/barebox-2021.02.0/series
@@ -0,0 +1,2 @@
+0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
+0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
diff --git a/configs/platform-mipsel/patches/barebox-2021.06.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch b/configs/platform-mipsel/patches/barebox-2021.06.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
new file mode 100644
index 000000000000..fbe71b59f523
--- /dev/null
+++ b/configs/platform-mipsel/patches/barebox-2021.06.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
@@ -0,0 +1,99 @@
+From 9af92b9cd64cb4a2df8ad03685e38fedf4ca78b4 Mon Sep 17 00:00:00 2001
+From: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Date: Wed, 21 Aug 2024 15:02:02 +0200
+Subject: [PATCH 1/2] MIPS: dts: add /chosen/stdout-path where it is missing
+
+A number of MIPS boards don't have a stdout-path set and instead rely on
+CONFIG_CONSOLE_ACTIVATE_ALL/FIRST to enable a console.
+
+This can get problematic if more consoles are added in future, or
+CONFIG_CONSOLE_ACTIVATE_NONE is to be used. So on systems that currently
+have a single console, let's have /chosen/stdout-path point at it.
+
+Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
+---
+ arch/mips/dts/black-swift.dts   | 4 ++++
+ arch/mips/dts/dlink-dir-320.dts | 4 ++++
+ arch/mips/dts/img-ci20.dts      | 4 ++++
+ arch/mips/dts/loongson-ls1b.dts | 4 ++++
+ arch/mips/dts/rzx50.dts         | 4 ++++
+ 5 files changed, 20 insertions(+)
+
+diff --git a/arch/mips/dts/black-swift.dts b/arch/mips/dts/black-swift.dts
+index af817dbfc7e1..6bb26d427f2d 100644
+--- a/arch/mips/dts/black-swift.dts
++++ b/arch/mips/dts/black-swift.dts
+@@ -13,6 +13,10 @@ aliases {
+ 		spiflash = &spiflash;
+ 	};
+ 
++	chosen {
++		stdout-path = &uart;
++	};
++
+ 	memory@0 {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x4000000>;
+diff --git a/arch/mips/dts/dlink-dir-320.dts b/arch/mips/dts/dlink-dir-320.dts
+index d19c3087d017..beec40f3dcc5 100644
+--- a/arch/mips/dts/dlink-dir-320.dts
++++ b/arch/mips/dts/dlink-dir-320.dts
+@@ -7,6 +7,10 @@ / {
+ 	#address-cells = <1>;
+ 	#size-cells = <1>;
+ 
++	chosen {
++		stdout-path = &serial0;
++	};
++
+ 	memory@0 {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x2000000>;
+diff --git a/arch/mips/dts/img-ci20.dts b/arch/mips/dts/img-ci20.dts
+index e1d3280c4e11..71038890d977 100644
+--- a/arch/mips/dts/img-ci20.dts
++++ b/arch/mips/dts/img-ci20.dts
+@@ -14,6 +14,10 @@ / {
+ 	model = "MIPS Creator CI20";
+ 	compatible = "img,ci20";
+ 
++	chosen {
++		stdout-path = &uart0;
++	};
++
+ 	memory@0 {
+ 		device_type = "memory";
+ 		reg = <0x0 0x10000000>;
+diff --git a/arch/mips/dts/loongson-ls1b.dts b/arch/mips/dts/loongson-ls1b.dts
+index 89cce5636bcf..30520a34f53b 100644
+--- a/arch/mips/dts/loongson-ls1b.dts
++++ b/arch/mips/dts/loongson-ls1b.dts
+@@ -6,6 +6,10 @@ / {
+ 	model = "Loongson Tech LS1B Demo Board";
+ 	compatible = "loongson,ls1b";
+ 
++	chosen {
++		stdout-path = &serial2;
++	};
++
+ 	oscillator: oscillator {
+ 			#clock-cells = <0>;
+ 			compatible = "fixed-clock";
+diff --git a/arch/mips/dts/rzx50.dts b/arch/mips/dts/rzx50.dts
+index bd3631f7c451..93211a97a59f 100644
+--- a/arch/mips/dts/rzx50.dts
++++ b/arch/mips/dts/rzx50.dts
+@@ -6,6 +6,10 @@ / {
+ 	model = "Ritmix RZX-50";
+ 	compatible = "ritmix,rzx50";
+ 
++	chosen {
++		stdout-path = &serial1;
++	};
++
+ 	memory@0 {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x4000000>;
+-- 
+2.39.2
+
diff --git a/configs/platform-mipsel/patches/barebox-2021.06.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch b/configs/platform-mipsel/patches/barebox-2021.06.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
new file mode 100644
index 000000000000..074b8c70036a
--- /dev/null
+++ b/configs/platform-mipsel/patches/barebox-2021.06.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
@@ -0,0 +1,35 @@
+From 0da08cd25a0bacfa22cde380d5ead90077b6c7b3 Mon Sep 17 00:00:00 2001
+From: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Date: Wed, 21 Aug 2024 15:12:02 +0200
+Subject: [PATCH 2/2] MIPS: qemu-malta: explicitly set stdout-path
+
+The Malta device tree describes and enables two consoles, but doesn't
+specify which one to use for barebox console.
+
+In configurations with CONFIG_CONSOLE_ACTIVATE_FIRST, it's thus
+dependent on device tree probe order, which console ends up being used
+by barebox.
+
+Fix this by explicitly pointing stdout-path at the first console.
+
+Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
+---
+ arch/mips/dts/qemu-malta.dts | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/mips/dts/qemu-malta.dts b/arch/mips/dts/qemu-malta.dts
+index c2bc03dd4631..6cf7513ff5fa 100644
+--- a/arch/mips/dts/qemu-malta.dts
++++ b/arch/mips/dts/qemu-malta.dts
+@@ -8,6 +8,8 @@ / {
+ 	#size-cells = <1>;
+ 
+ 	chosen {
++		stdout-path = &uart0;
++
+ 		environment {
+ 			compatible = "barebox,environment";
+ 			device-path = &env_nor;
+-- 
+2.39.2
+
diff --git a/configs/platform-mipsel/patches/barebox-2021.06.0/series b/configs/platform-mipsel/patches/barebox-2021.06.0/series
new file mode 100644
index 000000000000..b9b6f404fa41
--- /dev/null
+++ b/configs/platform-mipsel/patches/barebox-2021.06.0/series
@@ -0,0 +1,2 @@
+0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
+0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
-- 
2.39.2

[DistroKit] [PATCH 2/3] MIPS: qemu-run: fix barebox Malta image name

[Ahmad Fatoum]

The BSP appends the barebox image with a -malta suffix, but qemu-run
didn't know that.

Add it, so run configs/platform-mips/run barebox works as expected.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/platform-mips/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/platform-mips/run b/configs/platform-mips/run
index 6d6fca68c2cd..8b2d8d0612fe 100755
--- a/configs/platform-mips/run
+++ b/configs/platform-mips/run
@@ -72,7 +72,7 @@ QEMU_ARGS=( "${QEMU_ARGS[@]}" -rtc base=2000-01-01 )
 
 QEMU_LINUX_ARGS=( -kernel ${PTXDIST_PLATFORMDIR}/images/vmlinuz-malta -dtb ${PTXDIST_PLATFORMDIR}/images/qemu-malta.dtb-bb )
 # the barebox device tree has a state node for bootchooser
-QEMU_BAREBOX_ARGS=( -bios  ${PTXDIST_PLATFORMDIR}/images/barebox-qemu-malta.img )
+QEMU_BAREBOX_ARGS=( -bios  ${PTXDIST_PLATFORMDIR}/images/barebox-qemu-malta.img-malta )
 
 check_hd() {
 	if [ ! -e "${PTXDIST_PLATFORMDIR}/images/malta.hdimg" ]; then
-- 
2.39.2

[DistroKit] [PATCH 3/3] mipsel: qemu-run: enable emulation of little endian barebox

[Ahmad Fatoum]

qemu-system-mipsel unlike GXemul requires that the 32-bit words inside
the barebox binary are swapped when not using the default big-endian
mode. Recent barebox versions generate an additional swapped image
that can be used, so let's import the barebox patch that enables it.

We can drop this patch again, when update to a barebox version that
includes the stdout-path changes, probably v2024.10.0 or later.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 ...generate-swapped-image-as-part-of-mu.patch | 102 ++++++++++++++++++
 .../patches/barebox-2021.06.0/series          |   1 +
 .../platform-mipsel/rules/barebox-malta.make  |   2 +-
 configs/platform-mipsel/run                   |   2 +-
 4 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 configs/platform-mipsel/patches/barebox-2021.06.0/0003-MIPS-qemu-malta-generate-swapped-image-as-part-of-mu.patch

diff --git a/configs/platform-mipsel/patches/barebox-2021.06.0/0003-MIPS-qemu-malta-generate-swapped-image-as-part-of-mu.patch b/configs/platform-mipsel/patches/barebox-2021.06.0/0003-MIPS-qemu-malta-generate-swapped-image-as-part-of-mu.patch
new file mode 100644
index 000000000000..de704edffd40
--- /dev/null
+++ b/configs/platform-mipsel/patches/barebox-2021.06.0/0003-MIPS-qemu-malta-generate-swapped-image-as-part-of-mu.patch
@@ -0,0 +1,102 @@
+From 152bbdb7cfefab89132549ea83fb0b859c290e8a Mon Sep 17 00:00:00 2001
+From: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Date: Fri, 4 Jun 2021 10:46:55 +0200
+Subject: [PATCH] MIPS: qemu-malta: generate swapped image as part of
+ multi-image build
+
+Having to manually swap the words in the MIPS Malta image for QEMU
+little endian emulation is annoying.
+
+Have the multi-image build for Malta generate a second .swapped
+image that can be readily used if needed.
+
+Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Link: https://lore.barebox.org/20210604084704.17410-5-a.fatoum@pengutronix.de
+Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
+---
+ Documentation/boards/mips/qemu-malta.rst | 16 ++++------------
+ images/.gitignore                        |  1 +
+ images/Makefile                          |  2 +-
+ images/Makefile.malta                    | 10 +++++++++-
+ 4 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/Documentation/boards/mips/qemu-malta.rst b/Documentation/boards/mips/qemu-malta.rst
+index e188ae8c642a..fd37d5edb229 100644
+--- a/Documentation/boards/mips/qemu-malta.rst
++++ b/Documentation/boards/mips/qemu-malta.rst
+@@ -10,31 +10,23 @@ QEMU run string:
+ 
+   qemu-system-mips -nodefaults -M malta -m 256 \
+       -device VGA -serial stdio -monitor null \
+-      -bios barebox-flash-image
++      -bios ./images/barebox-qemu-malta.img
+ 
+ 
+ Little-endian mode
+ ------------------
+ 
+-Running little-endian Malta is a bit tricky.
+ In little-endian mode the 32bit words in the boot flash image are swapped,
+ a neat trick which allows bi-endian firmware.
+ 
+-You have to swap words of ``zbarebox.bin`` image, e.g.:
+-
+-.. code-block:: sh
+-
+-  echo arch/mips/pbl/zbarebox.bin \
+-      | cpio --create \
+-      | cpio --extract --swap --unconditional
+-
+-QEMU run string:
++The barebox build generates a second ``./images/barebox-qemu-malta.img.swapped``
++image that can be used in this case, e.g.:
+ 
+ .. code-block:: sh
+ 
+   qemu-system-mipsel -nodefaults -M malta -m 256 \
+       -device VGA -serial stdio -monitor null \
+-      -bios barebox-flash-image
++      -bios ./images/barebox-qemu-malta.img.swapped
+ 
+ 
+ Using GXemul
+diff --git a/images/.gitignore b/images/.gitignore
+index eafdb44b5bdd..3a9a77dad16e 100644
+--- a/images/.gitignore
++++ b/images/.gitignore
+@@ -32,3 +32,4 @@ barebox.sum
+ *.mvebu1img
+ *.stm32
+ *.nmon
++*.swapped
+diff --git a/images/Makefile b/images/Makefile
+index c185982c17ed..cc330d957597 100644
+--- a/images/Makefile
++++ b/images/Makefile
+@@ -218,5 +218,5 @@ $(flash-list): $(image-y-path)
+ clean-files := *.pbl *.pblb *.map start_*.imximg *.img barebox.z start_*.kwbimg \
+ 	start_*.kwbuartimg *.socfpgaimg *.mlo *.t20img *.t20img.cfg *.t30img \
+ 	*.t30img.cfg *.t124img *.t124img.cfg *.mlospi *.mlo *.mxsbs *.mxssd \
+-	start_*.simximg start_*.usimximg *.zynqimg *.image
++	start_*.simximg start_*.usimximg *.zynqimg *.image *.swapped
+ clean-files += pbl.lds
+diff --git a/images/Makefile.malta b/images/Makefile.malta
+index 5739ec464092..96d7b86b1187 100644
+--- a/images/Makefile.malta
++++ b/images/Makefile.malta
+@@ -1,3 +1,11 @@
++quiet_cmd_bswap32_image = BSWAP4  $@
++      cmd_bswap32_image = cp $< $@ && \
++			  truncate -s %4 $@ && \
++			  objcopy -I binary --reverse-byte=4 $@
++
++$(obj)/%.img.swapped: $(obj)/%.img FORCE
++	$(call if_changed,bswap32_image)
++
+ pblb-$(CONFIG_BOARD_QEMU_MALTA) += start_qemu_malta
+ FILE_barebox-qemu-malta.img = start_qemu_malta.pblb
+-image-$(CONFIG_BOARD_QEMU_MALTA) += barebox-qemu-malta.img
++image-$(CONFIG_BOARD_QEMU_MALTA) += barebox-qemu-malta.img barebox-qemu-malta.img.swapped
+-- 
+2.39.2
+
diff --git a/configs/platform-mipsel/patches/barebox-2021.06.0/series b/configs/platform-mipsel/patches/barebox-2021.06.0/series
index b9b6f404fa41..4852ea3fdfaa 100644
--- a/configs/platform-mipsel/patches/barebox-2021.06.0/series
+++ b/configs/platform-mipsel/patches/barebox-2021.06.0/series
@@ -1,2 +1,3 @@
 0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
 0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
+0003-MIPS-qemu-malta-generate-swapped-image-as-part-of-mu.patch
diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make
index 9143d47433c8..8eb765609ffe 100644
--- a/configs/platform-mipsel/rules/barebox-malta.make
+++ b/configs/platform-mipsel/rules/barebox-malta.make
@@ -48,7 +48,7 @@ BAREBOX_MALTA_CONF_OPT	:= \
 
 BAREBOX_MALTA_MAKE_OPT	:= $(BAREBOX_MALTA_CONF_OPT)
 
-BAREBOX_MALTA_IMAGES := images/barebox-qemu-malta.img
+BAREBOX_MALTA_IMAGES := images/barebox-qemu-malta.img.swapped
 BAREBOX_MALTA_IMAGES := $(addprefix $(BAREBOX_MALTA_BUILD_DIR)/,$(BAREBOX_MALTA_IMAGES))
 
 ifdef PTXCONF_BAREBOX_MALTA
diff --git a/configs/platform-mipsel/run b/configs/platform-mipsel/run
index 9ecf65b2e429..b6126531d8a8 100755
--- a/configs/platform-mipsel/run
+++ b/configs/platform-mipsel/run
@@ -72,7 +72,7 @@ QEMU_ARGS=( "${QEMU_ARGS[@]}" -rtc base=2021-01-01 )
 
 QEMU_LINUX_ARGS=( -kernel ${PTXDIST_PLATFORMDIR}/images/vmlinuz-malta -dtb ${PTXDIST_PLATFORMDIR}/images/qemu-malta.dtb-bb )
 # the barebox device tree has a state node for bootchooser
-QEMU_BAREBOX_ARGS=( -bios  ${PTXDIST_PLATFORMDIR}/images/barebox-qemu-malta.img )
+QEMU_BAREBOX_ARGS=( -bios  ${PTXDIST_PLATFORMDIR}/images/barebox-qemu-malta.img.swapped-malta )
 
 check_hd() {
 	if [ ! -e "${PTXDIST_PLATFORMDIR}/images/malta.hdimg" ]; then
-- 
2.39.2

Re: [DistroKit] [PATCH 1/3] MIPS(EL): barebox: add /chosen/stdout-path properties for all boards

[Oleksij Rempel]

Hi Ahmad,

On Thu, Aug 22, 2024 at 03:45:49PM +0200, Ahmad Fatoum wrote:
> A lot of MIPS boards lack a /chosen/stdout-path property, instead
> relying on the options CONFIG_CONSOLE_ACTIVATE_ALL/FIRST to select an
> appropriate console. To allow usage of the barebox console with
> CONFIG_CONSOLE_ACTIVATE_NONE, let's add explicit console activation.
> 
> The patches have already been submitted for upstream inclusion[1].
> 
> [1]: https://lore.barebox.org/barebox/20240822115701.1184099-1-a.fatoum@pengutronix.de
> 
> Fixes: 4c0d7cecdd75 ("mips/mipsel: barebox: use CONSOLE_ACTIVATE_NONE")
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>

Thank you! :)

Regards,
Oleksij
-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [DistroKit] [PATCH 1/3] MIPS(EL): barebox: add /chosen/stdout-path properties for all boards

[Robert Schwebel]

Series applied to next.

On Thu, Aug 22, 2024 at 03:45:49PM +0200, Ahmad Fatoum wrote:
> A lot of MIPS boards lack a /chosen/stdout-path property, instead
> relying on the options CONFIG_CONSOLE_ACTIVATE_ALL/FIRST to select an
> appropriate console. To allow usage of the barebox console with
> CONFIG_CONSOLE_ACTIVATE_NONE, let's add explicit console activation.
> 
> The patches have already been submitted for upstream inclusion[1].
> 
> [1]: https://lore.barebox.org/barebox/20240822115701.1184099-1-a.fatoum@pengutronix.de
> 
> Fixes: 4c0d7cecdd75 ("mips/mipsel: barebox: use CONSOLE_ACTIVATE_NONE")
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  ...osen-stdout-path-where-it-is-missing.patch | 99 +++++++++++++++++++
>  ...emu-malta-explicitly-set-stdout-path.patch | 35 +++++++
>  .../patches/barebox-2021.02.0/series          |  2 +
>  ...osen-stdout-path-where-it-is-missing.patch | 99 +++++++++++++++++++
>  ...emu-malta-explicitly-set-stdout-path.patch | 35 +++++++
>  .../patches/barebox-2021.06.0/series          |  2 +
>  6 files changed, 272 insertions(+)
>  create mode 100644 configs/platform-mips/patches/barebox-2021.02.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
>  create mode 100644 configs/platform-mips/patches/barebox-2021.02.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
>  create mode 100644 configs/platform-mips/patches/barebox-2021.02.0/series
>  create mode 100644 configs/platform-mipsel/patches/barebox-2021.06.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
>  create mode 100644 configs/platform-mipsel/patches/barebox-2021.06.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
>  create mode 100644 configs/platform-mipsel/patches/barebox-2021.06.0/series
> 
> diff --git a/configs/platform-mips/patches/barebox-2021.02.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch b/configs/platform-mips/patches/barebox-2021.02.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
> new file mode 100644
> index 000000000000..fbe71b59f523
> --- /dev/null
> +++ b/configs/platform-mips/patches/barebox-2021.02.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
> @@ -0,0 +1,99 @@
> +From 9af92b9cd64cb4a2df8ad03685e38fedf4ca78b4 Mon Sep 17 00:00:00 2001
> +From: Ahmad Fatoum <a.fatoum@pengutronix.de>
> +Date: Wed, 21 Aug 2024 15:02:02 +0200
> +Subject: [PATCH 1/2] MIPS: dts: add /chosen/stdout-path where it is missing
> +
> +A number of MIPS boards don't have a stdout-path set and instead rely on
> +CONFIG_CONSOLE_ACTIVATE_ALL/FIRST to enable a console.
> +
> +This can get problematic if more consoles are added in future, or
> +CONFIG_CONSOLE_ACTIVATE_NONE is to be used. So on systems that currently
> +have a single console, let's have /chosen/stdout-path point at it.
> +
> +Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> +---
> + arch/mips/dts/black-swift.dts   | 4 ++++
> + arch/mips/dts/dlink-dir-320.dts | 4 ++++
> + arch/mips/dts/img-ci20.dts      | 4 ++++
> + arch/mips/dts/loongson-ls1b.dts | 4 ++++
> + arch/mips/dts/rzx50.dts         | 4 ++++
> + 5 files changed, 20 insertions(+)
> +
> +diff --git a/arch/mips/dts/black-swift.dts b/arch/mips/dts/black-swift.dts
> +index af817dbfc7e1..6bb26d427f2d 100644
> +--- a/arch/mips/dts/black-swift.dts
> ++++ b/arch/mips/dts/black-swift.dts
> +@@ -13,6 +13,10 @@ aliases {
> + 		spiflash = &spiflash;
> + 	};
> + 
> ++	chosen {
> ++		stdout-path = &uart;
> ++	};
> ++
> + 	memory@0 {
> + 		device_type = "memory";
> + 		reg = <0x00000000 0x4000000>;
> +diff --git a/arch/mips/dts/dlink-dir-320.dts b/arch/mips/dts/dlink-dir-320.dts
> +index d19c3087d017..beec40f3dcc5 100644
> +--- a/arch/mips/dts/dlink-dir-320.dts
> ++++ b/arch/mips/dts/dlink-dir-320.dts
> +@@ -7,6 +7,10 @@ / {
> + 	#address-cells = <1>;
> + 	#size-cells = <1>;
> + 
> ++	chosen {
> ++		stdout-path = &serial0;
> ++	};
> ++
> + 	memory@0 {
> + 		device_type = "memory";
> + 		reg = <0x00000000 0x2000000>;
> +diff --git a/arch/mips/dts/img-ci20.dts b/arch/mips/dts/img-ci20.dts
> +index e1d3280c4e11..71038890d977 100644
> +--- a/arch/mips/dts/img-ci20.dts
> ++++ b/arch/mips/dts/img-ci20.dts
> +@@ -14,6 +14,10 @@ / {
> + 	model = "MIPS Creator CI20";
> + 	compatible = "img,ci20";
> + 
> ++	chosen {
> ++		stdout-path = &uart0;
> ++	};
> ++
> + 	memory@0 {
> + 		device_type = "memory";
> + 		reg = <0x0 0x10000000>;
> +diff --git a/arch/mips/dts/loongson-ls1b.dts b/arch/mips/dts/loongson-ls1b.dts
> +index 89cce5636bcf..30520a34f53b 100644
> +--- a/arch/mips/dts/loongson-ls1b.dts
> ++++ b/arch/mips/dts/loongson-ls1b.dts
> +@@ -6,6 +6,10 @@ / {
> + 	model = "Loongson Tech LS1B Demo Board";
> + 	compatible = "loongson,ls1b";
> + 
> ++	chosen {
> ++		stdout-path = &serial2;
> ++	};
> ++
> + 	oscillator: oscillator {
> + 			#clock-cells = <0>;
> + 			compatible = "fixed-clock";
> +diff --git a/arch/mips/dts/rzx50.dts b/arch/mips/dts/rzx50.dts
> +index bd3631f7c451..93211a97a59f 100644
> +--- a/arch/mips/dts/rzx50.dts
> ++++ b/arch/mips/dts/rzx50.dts
> +@@ -6,6 +6,10 @@ / {
> + 	model = "Ritmix RZX-50";
> + 	compatible = "ritmix,rzx50";
> + 
> ++	chosen {
> ++		stdout-path = &serial1;
> ++	};
> ++
> + 	memory@0 {
> + 		device_type = "memory";
> + 		reg = <0x00000000 0x4000000>;
> +-- 
> +2.39.2
> +
> diff --git a/configs/platform-mips/patches/barebox-2021.02.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch b/configs/platform-mips/patches/barebox-2021.02.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
> new file mode 100644
> index 000000000000..074b8c70036a
> --- /dev/null
> +++ b/configs/platform-mips/patches/barebox-2021.02.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
> @@ -0,0 +1,35 @@
> +From 0da08cd25a0bacfa22cde380d5ead90077b6c7b3 Mon Sep 17 00:00:00 2001
> +From: Ahmad Fatoum <a.fatoum@pengutronix.de>
> +Date: Wed, 21 Aug 2024 15:12:02 +0200
> +Subject: [PATCH 2/2] MIPS: qemu-malta: explicitly set stdout-path
> +
> +The Malta device tree describes and enables two consoles, but doesn't
> +specify which one to use for barebox console.
> +
> +In configurations with CONFIG_CONSOLE_ACTIVATE_FIRST, it's thus
> +dependent on device tree probe order, which console ends up being used
> +by barebox.
> +
> +Fix this by explicitly pointing stdout-path at the first console.
> +
> +Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> +---
> + arch/mips/dts/qemu-malta.dts | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/arch/mips/dts/qemu-malta.dts b/arch/mips/dts/qemu-malta.dts
> +index c2bc03dd4631..6cf7513ff5fa 100644
> +--- a/arch/mips/dts/qemu-malta.dts
> ++++ b/arch/mips/dts/qemu-malta.dts
> +@@ -8,6 +8,8 @@ / {
> + 	#size-cells = <1>;
> + 
> + 	chosen {
> ++		stdout-path = &uart0;
> ++
> + 		environment {
> + 			compatible = "barebox,environment";
> + 			device-path = &env_nor;
> +-- 
> +2.39.2
> +
> diff --git a/configs/platform-mips/patches/barebox-2021.02.0/series b/configs/platform-mips/patches/barebox-2021.02.0/series
> new file mode 100644
> index 000000000000..b9b6f404fa41
> --- /dev/null
> +++ b/configs/platform-mips/patches/barebox-2021.02.0/series
> @@ -0,0 +1,2 @@
> +0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
> +0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
> diff --git a/configs/platform-mipsel/patches/barebox-2021.06.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch b/configs/platform-mipsel/patches/barebox-2021.06.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
> new file mode 100644
> index 000000000000..fbe71b59f523
> --- /dev/null
> +++ b/configs/platform-mipsel/patches/barebox-2021.06.0/0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
> @@ -0,0 +1,99 @@
> +From 9af92b9cd64cb4a2df8ad03685e38fedf4ca78b4 Mon Sep 17 00:00:00 2001
> +From: Ahmad Fatoum <a.fatoum@pengutronix.de>
> +Date: Wed, 21 Aug 2024 15:02:02 +0200
> +Subject: [PATCH 1/2] MIPS: dts: add /chosen/stdout-path where it is missing
> +
> +A number of MIPS boards don't have a stdout-path set and instead rely on
> +CONFIG_CONSOLE_ACTIVATE_ALL/FIRST to enable a console.
> +
> +This can get problematic if more consoles are added in future, or
> +CONFIG_CONSOLE_ACTIVATE_NONE is to be used. So on systems that currently
> +have a single console, let's have /chosen/stdout-path point at it.
> +
> +Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> +---
> + arch/mips/dts/black-swift.dts   | 4 ++++
> + arch/mips/dts/dlink-dir-320.dts | 4 ++++
> + arch/mips/dts/img-ci20.dts      | 4 ++++
> + arch/mips/dts/loongson-ls1b.dts | 4 ++++
> + arch/mips/dts/rzx50.dts         | 4 ++++
> + 5 files changed, 20 insertions(+)
> +
> +diff --git a/arch/mips/dts/black-swift.dts b/arch/mips/dts/black-swift.dts
> +index af817dbfc7e1..6bb26d427f2d 100644
> +--- a/arch/mips/dts/black-swift.dts
> ++++ b/arch/mips/dts/black-swift.dts
> +@@ -13,6 +13,10 @@ aliases {
> + 		spiflash = &spiflash;
> + 	};
> + 
> ++	chosen {
> ++		stdout-path = &uart;
> ++	};
> ++
> + 	memory@0 {
> + 		device_type = "memory";
> + 		reg = <0x00000000 0x4000000>;
> +diff --git a/arch/mips/dts/dlink-dir-320.dts b/arch/mips/dts/dlink-dir-320.dts
> +index d19c3087d017..beec40f3dcc5 100644
> +--- a/arch/mips/dts/dlink-dir-320.dts
> ++++ b/arch/mips/dts/dlink-dir-320.dts
> +@@ -7,6 +7,10 @@ / {
> + 	#address-cells = <1>;
> + 	#size-cells = <1>;
> + 
> ++	chosen {
> ++		stdout-path = &serial0;
> ++	};
> ++
> + 	memory@0 {
> + 		device_type = "memory";
> + 		reg = <0x00000000 0x2000000>;
> +diff --git a/arch/mips/dts/img-ci20.dts b/arch/mips/dts/img-ci20.dts
> +index e1d3280c4e11..71038890d977 100644
> +--- a/arch/mips/dts/img-ci20.dts
> ++++ b/arch/mips/dts/img-ci20.dts
> +@@ -14,6 +14,10 @@ / {
> + 	model = "MIPS Creator CI20";
> + 	compatible = "img,ci20";
> + 
> ++	chosen {
> ++		stdout-path = &uart0;
> ++	};
> ++
> + 	memory@0 {
> + 		device_type = "memory";
> + 		reg = <0x0 0x10000000>;
> +diff --git a/arch/mips/dts/loongson-ls1b.dts b/arch/mips/dts/loongson-ls1b.dts
> +index 89cce5636bcf..30520a34f53b 100644
> +--- a/arch/mips/dts/loongson-ls1b.dts
> ++++ b/arch/mips/dts/loongson-ls1b.dts
> +@@ -6,6 +6,10 @@ / {
> + 	model = "Loongson Tech LS1B Demo Board";
> + 	compatible = "loongson,ls1b";
> + 
> ++	chosen {
> ++		stdout-path = &serial2;
> ++	};
> ++
> + 	oscillator: oscillator {
> + 			#clock-cells = <0>;
> + 			compatible = "fixed-clock";
> +diff --git a/arch/mips/dts/rzx50.dts b/arch/mips/dts/rzx50.dts
> +index bd3631f7c451..93211a97a59f 100644
> +--- a/arch/mips/dts/rzx50.dts
> ++++ b/arch/mips/dts/rzx50.dts
> +@@ -6,6 +6,10 @@ / {
> + 	model = "Ritmix RZX-50";
> + 	compatible = "ritmix,rzx50";
> + 
> ++	chosen {
> ++		stdout-path = &serial1;
> ++	};
> ++
> + 	memory@0 {
> + 		device_type = "memory";
> + 		reg = <0x00000000 0x4000000>;
> +-- 
> +2.39.2
> +
> diff --git a/configs/platform-mipsel/patches/barebox-2021.06.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch b/configs/platform-mipsel/patches/barebox-2021.06.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
> new file mode 100644
> index 000000000000..074b8c70036a
> --- /dev/null
> +++ b/configs/platform-mipsel/patches/barebox-2021.06.0/0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
> @@ -0,0 +1,35 @@
> +From 0da08cd25a0bacfa22cde380d5ead90077b6c7b3 Mon Sep 17 00:00:00 2001
> +From: Ahmad Fatoum <a.fatoum@pengutronix.de>
> +Date: Wed, 21 Aug 2024 15:12:02 +0200
> +Subject: [PATCH 2/2] MIPS: qemu-malta: explicitly set stdout-path
> +
> +The Malta device tree describes and enables two consoles, but doesn't
> +specify which one to use for barebox console.
> +
> +In configurations with CONFIG_CONSOLE_ACTIVATE_FIRST, it's thus
> +dependent on device tree probe order, which console ends up being used
> +by barebox.
> +
> +Fix this by explicitly pointing stdout-path at the first console.
> +
> +Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> +---
> + arch/mips/dts/qemu-malta.dts | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/arch/mips/dts/qemu-malta.dts b/arch/mips/dts/qemu-malta.dts
> +index c2bc03dd4631..6cf7513ff5fa 100644
> +--- a/arch/mips/dts/qemu-malta.dts
> ++++ b/arch/mips/dts/qemu-malta.dts
> +@@ -8,6 +8,8 @@ / {
> + 	#size-cells = <1>;
> + 
> + 	chosen {
> ++		stdout-path = &uart0;
> ++
> + 		environment {
> + 			compatible = "barebox,environment";
> + 			device-path = &env_nor;
> +-- 
> +2.39.2
> +
> diff --git a/configs/platform-mipsel/patches/barebox-2021.06.0/series b/configs/platform-mipsel/patches/barebox-2021.06.0/series
> new file mode 100644
> index 000000000000..b9b6f404fa41
> --- /dev/null
> +++ b/configs/platform-mipsel/patches/barebox-2021.06.0/series
> @@ -0,0 +1,2 @@
> +0001-MIPS-dts-add-chosen-stdout-path-where-it-is-missing.patch
> +0002-MIPS-qemu-malta-explicitly-set-stdout-path.patch
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |