The Raspberry Pi environment appears to now be being automatically
escaped, however we are already manually escaping in places that results
in unexpected double escaping and breakage during macro expansion:

[ 1979s] include/generated/environment.h:1:296: error: expected ‘}’ before ‘extlinux’
[ 1979s]     1 | #define CONFIG_EXTRA_ENV_TEXT ...   ...boot_syslinux_conf \\"extlinux/extlinux...
[ 1979s]       |                                                              ^~~~~~~~

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>

Merge remote-tracking branch 'origin/apertis/v2025dev1' into proposed-updates/debian/trixie/c62abb52

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>

The detection of the RCar model is not as easy as expected.
Add some information on what is supported and what is not.

Also specify upstream status.

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>

Signed-off-by: Ritesh Raj Sarraf <ritesh.sarraf@collabora.co.uk>

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>

We do not use u-boot-qemu targets.

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>

The patch is needed to make sure that the reserved memory regions are
transfered to the linux FDT.

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>

Signed-off-by: mtt2hi <thomas.mittelstaedt@de.bosch.com>

d/patches: pxeboot: Variable for size of initrd set to get zboot working at distroboot cmd

Signed-off-by: mtt2hi <thomas.mittelstaedt@de.bosch.com>

Signed-off-by: mtt2hi <thomas.mittelstaedt@de.bosch.com>

Signed-off-by: mtt2hi <thomas.mittelstaedt@de.bosch.com>

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

Detlev Casanova authored 2 years ago and Walter Lozano committed 2 years ago

In commit d0399a46e7cda63c07e3eb8558bef84cfb068028, the device tree was
synchronized from linux and the aliases were dropped.

They need to be kept so that the mmc cards are in the right order.
Without the aliases, u-boot reports:
MMC:   FSL_SDHC: 2, FSL_SDHC: 3

With the aliases, u-boot reports:
MMC:   FSL_SDHC: 0, FSL_SDHC: 1

The upstream linux device tree does not contain the same aliases than
u-boot (It keeps the devices order with /dev/mmcblk2 and /dev/mmcblk3).
Because this board has been using different aliases in u-boot
and linux, a imx6q-sabrelite-u-boot.dtsi file is added to be
automatically included in imx6q-sabrelite.dts.

This way, linux and u-boot each keep their own aliases and there
is no breakage and current installations.

This should never be done for new boards as we want to keep linux and
u-boot with the same aliases as much as possible.
This patch is only necessary to avoid breaking existing setups.

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>

Boot it failing due to device tree allocation errors:

  Working FDT set to 88000000
     Loading Ramdisk to 8d70f000, end 8ffff88c ... OK
  ERROR: reserving fdt memory region failed (addr=9e780000 size=80000 flags=4)
  ERROR: reserving fdt memory region failed (addr=9e800000 size=1800000 flags=4)
  ERROR: reserving fdt memory region failed (addr=9db00000 size=c00000 flags=4)
  ERROR: Failed to allocate 0x9560 bytes below 0x90000000.
  device tree - allocation error
  FDT creation failed!

Integrate changes required to fix this.

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>

A number of changes have been upstreamed for am625 since the v2023.01
U-Boot release and we have ported extra support from the vendor kernel
to support operation in Apertis:

- Synced DT files with linux kernel (tag v6.0.3)
- Add support for USB
- Add SPI and SPI flash support
- Enabled Ethernet support
- Switched to upstreamed distroboot support
- Add support for DFU booting
- Clean up the defconfig
- Set USB PID to same value as used by boot ROM
- Increase size of images decompressable with bootm

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>

Currently, the u-boot binary is again going beyond the 1MiB limit on R-Car
Gen3. Upstream u-boot doesn't have this problem as the DISTRO_DEFAULTS
config option is disabled.

Let's disable the CMD_SPI config option to shrink the final image size.

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>

We do not make the imx8mn DDR firmware available during the U-Boot
build, instead deferring combining these elements till image creation as
we do not want dependencies in binaries packaged in non-free repository
on packages in the target repository. This would previously buid with a
warning about the missing binaries a change upstream[1] has made this an
error unless "BINMAN_ALLOW_MISSING=1" is passed to make.

Pass this required variable for these targets.

[1]: https://source.denx.de/u-boot/u-boot/-/commit/b144b93ea9ed862468842a20dace2e465ea5ac9c



Signed-off-by: Martyn Welch <martyn.welch@collabora.com>

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

Drop rk3399/0002-rockchip-roc-pc-rk3399-Enable-rockchip-efuse-support.patch because included in upstream release