Merge branch 'master' into CA/ts

Author: anischali

.gitignore

@@ -46,6 +46,7 @@ policy-list
 *.dtb.*
 *.dtbo
 *.dtbo.*
+*.z
 *.asn1.c
 *.asn1.h
 

Documentation/boards/layerscape.rst

@@ -27,11 +27,11 @@ The barebox binary is expected to be located 4K bytes into the SD-Card::
 From there on, ``barebox_update`` can be used to flash
 barebox to the QSPI NOR-Flash if required::
 
-  barebox_update -t qspi /mnt/tftp/barebox-${global.hostname}-qspi.imaag
+  barebox_update -t qspi /mnt/tftp/barebox-${global.hostname}-qspi.image
 
 Flashing to the eMMC is possible likewise::
 
-  barebox_update -t sd /mnt/tftp/barebox-${global.hostname}-sd.imaag
+  barebox_update -t sd /mnt/tftp/barebox-${global.hostname}-sd.image
 
 .. note:: Some SoCs like the LS1046A feature only a single eSDHC.
   In such a case, using eMMC and SD-Card at the same time is not possible.

Documentation/migration-guides/migration-2026.06.0.rst

@@ -0,0 +1,19 @@
+Release v2026.06.0
+==================
+
+global.linux.bootargs.* appending order
+---------------------------------------
+
+If barebox was configured to automatically generate any of the ``root``,
+``rootwait``, ``earlycon``, ``systemd.machine_id``, ``systemd.hostname``
+or ``barebox.security.policy`` kernel command line options, they will be
+appended onto the final kernel command line
+:ref:`**after** all other options <bootargs_concat_order>`.
+
+Removal of global.env.autoprobe
+-------------------------------
+
+The global.env.autoprobe variable introduced with v2025.02.0 is removed and
+now replaced with CONFIG_ENV_HANDLING_AUTOPROBE. It has never worked. If you
+want to load a barebox environment based on its partition UUID enable
+CONFIG_ENV_HANDLING_AUTOPROBE.

Documentation/user/devboot.rst

@@ -89,7 +89,7 @@ Override rules
 
   .. tip::
 
-     The Linux kernel ``make cpio-modules-pkg`` target builds a CPIO archive
+     The Linux kernel ``make modules-cpio-pkg`` target builds a CPIO archive
      containing all kernel modules. This is useful for supplementing an existing
      initramfs with modules without modifying the root filesystem.
      Combined with initrd concatenation, a devboot script

Documentation/user/usb.rst

@@ -168,6 +168,7 @@ The Fastboot gadget supports the following commands:
 - fastboot getvar
 - fastboot boot
 - fastboot reboot
+- fastboot erase
 
 ``fastboot flash`` additionally supports image types UBI and Barebox. For UBI
 Images and a MTD device as target, ubiformat is called. For a Barebox image

Makefile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 2026
-PATCHLEVEL = 05
+PATCHLEVEL = 06
 SUBLEVEL = 0
 EXTRAVERSION =
 NAME = None

arch/Kconfig

@@ -92,6 +92,25 @@ config ARCH_HAS_DATA_ABORT_MASK_PBL
 config ARCH_HAS_ZERO_PAGE
 	bool
 
+config ARCH_HAS_MALLOC_SIZE
+	bool
+	help
+	  This is selected by architectures, where CONFIG_MALLOC_SIZE
+	  can be used to specify an exact size of the malloc area.
+
+	  Eventually, this should only be selected by sandbox, with
+	  everyone else switched over to ARCH_HAS_BAREBOX_MEMORY_OFFSET.
+
+config ARCH_HAS_BAREBOX_MEMORY_OFFSET
+	bool
+	help
+	  This is selected by architectures, where CONFIG_BAREBOX_MEMORY_OFFSET
+	  can be used to specify the start offset of the barebox memory
+	  within the initially available memory (first memory bank usually).
+
+	  Compared to CONFIG_MALLOC_SIZE, this offset simplifies memory layout
+	  calculation and allows to reserve the malloc region very early on.
+
 config HAVE_EFFICIENT_UNALIGNED_ACCESS
 	bool
 

arch/arm/Kconfig

@@ -33,10 +33,12 @@ config ARCH_MKIMAGE_NAME
 
 config ARM32
 	def_bool CPU_32
+	select ARCH_HAS_MALLOC_SIZE
 
 config ARM64
 	def_bool CPU_64
 	select ARCH_HAS_RELR
+	select ARCH_HAS_BAREBOX_MEMORY_OFFSET
 
 config ARCH_TEXT_BASE
 	hex

arch/arm/boards/embest-riotboard/flash-header-embest-riotboard.imxcfg

@@ -67,4 +67,5 @@ wm 32 MX6_MMDC_P0_MDPDC 0x00025565
 wm 32 MX6_MMDC_P0_MAPSR 0x00011006
 wm 32 MX6_MMDC_P0_MDSCR 0x00000000
 
+#include <mach/imx/imx6q-tzasc.h>
 #include <mach/imx/habv4-imx6-gencsf.h>

arch/arm/boards/embest-riotboard/lowlevel.c

@@ -11,26 +11,35 @@
 #include <asm/cache.h>
 #include <asm/mmu.h>
 #include <mach/imx/imx6.h>
+#include <mach/imx/iomux-mx6.h>
+#include <mach/imx/esdctl.h>
 
 extern char __dtb_imx6s_riotboard_start[];
 
-ENTRY_FUNCTION(start_imx6s_riotboard, r0, r1, r2)
+static noinline void continue_imx6s_riotboard(void)
 {
-	void *fdt;
+	void __iomem *iomuxbase = IOMEM(MX6_IOMUXC_BASE_ADDR);
 
-	imx6_cpu_lowlevel_init();
+	writel(0x4, iomuxbase + 0x016c);
+
+	imx6_ungate_all_peripherals();
+	// if uart ist not set-up, then OP-TEE will fail if debugging is enabled.
+	imx6_uart_setup(IOMEM(MX6_UART2_BASE_ADDR));
 
 	if (IS_ENABLED(CONFIG_DEBUG_LL)) {
-		/*
-		 * CONFIG_DEBUG_IMX6Q_UART=y
-		 * CONFIG_DEBUG_IMX_UART_PORT=2
-		 */
-		writel(0x4, 0x020e016c);
-		imx6_ungate_all_peripherals();
-		imx6_uart_setup_ll();
-		putc_ll('a');
+		pbl_set_putc(imx_uart_putc, IOMEM(MX6_UART2_BASE_ADDR));
+		putc_ll('>');
 	}
 
-	fdt = __dtb_imx6s_riotboard_start + get_runtime_offset();
-	barebox_arm_entry(0x10000000, SZ_1G, fdt);
+	imx6q_barebox_entry(__dtb_imx6s_riotboard_start);
+}
+
+ENTRY_FUNCTION(start_imx6s_riotboard, r0, r1, r2)
+{
+	imx6_cpu_lowlevel_init();
+
+	relocate_to_current_adr();
+	setup_c();
+
+	continue_imx6s_riotboard();
 }