Package: u-boot
Severity: wishlist
Hello.
The attached commit updates the existing patches.
>From 2eea1a9fd33c34255f1c1fdf3f1d3752ddc87dd5 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nico...@debian.org>
Date: Tue, 1 Dec 2020 19:29:57 +0100
Subject: Refresh patches for v2021.01-rc3
diff --git a/debian/patches/add-debian-revision-to-u-boot-version
b/debian/patches/add-debian-revision-to-u-boot-version
index 8e6bccdb0d..e6dcdfce23 100644
--- a/debian/patches/add-debian-revision-to-u-boot-version
+++ b/debian/patches/add-debian-revision-to-u-boot-version
@@ -1,11 +1,9 @@
Add the debian revision to the U-boot version, which is displayed at
boot and can be helpful to determine which specific version is used.
-Index: u-boot/Makefile
-===================================================================
---- u-boot.orig/Makefile
-+++ u-boot/Makefile
-@@ -350,7 +350,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__
+--- a/Makefile
++++ b/Makefile
+@@ -447,7 +447,7 @@
# Read UBOOTRELEASE from include/config/uboot.release (if it exists)
UBOOTRELEASE = $(shell cat include/config/uboot.release 2> /dev/null)
diff --git a/debian/patches/am57xx/omap5_distro_bootcmd
b/debian/patches/am57xx/omap5_distro_bootcmd
index 641feacf3e..71927e0f70 100644
--- a/debian/patches/am57xx/omap5_distro_bootcmd
+++ b/debian/patches/am57xx/omap5_distro_bootcmd
@@ -1,9 +1,7 @@
Enable distro_bootcmd support (doc/README.distro) for omap5 targets.
-Index: u-boot/include/configs/ti_omap5_common.h
-===================================================================
---- u-boot.orig/include/configs/ti_omap5_common.h
-+++ u-boot/include/configs/ti_omap5_common.h
+--- a/include/configs/ti_omap5_common.h
++++ b/include/configs/ti_omap5_common.h
@@ -58,6 +58,21 @@
#include <environment/ti/mmc.h>
#include <environment/ti/nand.h>
diff --git a/debian/patches/arndale/board-spl-rule.diff
b/debian/patches/arndale/board-spl-rule.diff
index 66e9ae65c0..5022a7f92f 100644
--- a/debian/patches/arndale/board-spl-rule.diff
+++ b/debian/patches/arndale/board-spl-rule.diff
@@ -1,11 +1,9 @@
Description: Add spl/arndale-spl.bin rule
Author: Ian Campbell <i...@debian.org>
-Index: u-boot/Makefile
-===================================================================
---- u-boot.orig/Makefile
-+++ u-boot/Makefile
-@@ -1406,6 +1406,9 @@ spl/u-boot-spl.sfp: spl/u-boot-spl
+--- a/Makefile
++++ b/Makefile
+@@ -1941,6 +1941,9 @@
spl/boot.bin: spl/u-boot-spl
@:
diff --git a/debian/patches/ensure-config-sandbox-for-make-env.patch
b/debian/patches/ensure-config-sandbox-for-make-env.patch
index 830d9acdbc..2558b11876 100644
--- a/debian/patches/ensure-config-sandbox-for-make-env.patch
+++ b/debian/patches/ensure-config-sandbox-for-make-env.patch
@@ -2,11 +2,9 @@ Ensure that CONFIG_SANDBOX is set when running "make env",
avoiding a
failure to build caused by config_distro_bootcmd.h following the wrong
codepath...
-Index: u-boot/include/configs/sandbox.h
-===================================================================
---- u-boot.orig/include/configs/sandbox.h
-+++ u-boot/include/configs/sandbox.h
-@@ -66,6 +66,9 @@
+--- a/include/configs/sandbox.h
++++ b/include/configs/sandbox.h
+@@ -64,6 +64,9 @@
#ifdef __ASSEMBLY__
#define BOOTENV
#else
diff --git
a/debian/patches/exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch
b/debian/patches/exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch
index ed5507a131..c4fe56d696 100644
---
a/debian/patches/exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch
+++
b/debian/patches/exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch
@@ -76,21 +76,12 @@ Index: u-boot/include/configs/odroid.h
===================================================================
--- u-boot.orig/include/configs/odroid.h
+++ u-boot/include/configs/odroid.h
-@@ -40,7 +40,7 @@
- /* Console configuration */
-
- #define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run autoboot"
--#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
-+#define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8"
-
- #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- - GENERATED_GBL_DATA_SIZE)
@@ -155,7 +155,7 @@
"elif test -e mmc ${mmcbootdev} uImage; then; " \
"run boot_uimg;" \
"fi;\0" \
-- "console=" CONFIG_DEFAULT_CONSOLE \
-+ "console=" CONFIG_DEFAULT_CONSOLE "\0" \
+- "console=console=ttySAC1,115200n8\0" \
++ "console=ttySAC1,115200n8\0" \
"mmcbootdev=0\0" \
"mmcbootpart=1\0" \
"mmcrootdev=0\0" \
@@ -98,21 +89,12 @@ Index: u-boot/include/configs/odroid_xu3.h
===================================================================
--- u-boot.orig/include/configs/odroid_xu3.h
+++ u-boot/include/configs/odroid_xu3.h
-@@ -25,7 +25,7 @@
-
- #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR -
0x1000000)
-
--#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
-+#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8"
-
- /* USB */
- #define CONFIG_USB_EHCI_EXYNOS
@@ -98,7 +98,7 @@
MEM_LAYOUT_ENV_SETTINGS \
BOOTENV \
"rootfstype=ext4\0" \
-- "console=" CONFIG_DEFAULT_CONSOLE \
-+ "console=" CONFIG_DEFAULT_CONSOLE "\0"\
+- "console=console=ttySAC2,115200n8\0" \
++ "console=ttySAC2,115200n8\0" \
"fdtfile=exynos5422-odroidxu3.dtb\0" \
"board_name=odroidxu3\0" \
"mmcbootdev=0\0" \
@@ -120,21 +102,12 @@ Index: u-boot/include/configs/s5p_goni.h
===================================================================
--- u-boot.orig/include/configs/s5p_goni.h
+++ u-boot/include/configs/s5p_goni.h
-@@ -85,7 +85,7 @@
-
- #define CONFIG_BOOTCOMMAND "run mmcboot"
-
--#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
-+#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8"
-
- #define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \
- " ${console} ${meminfo}"
@@ -132,7 +132,7 @@
"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
"verify=n\0" \
"rootfstype=ext4\0" \
-- "console=" CONFIG_DEFAULT_CONSOLE \
-+ "console=" CONFIG_DEFAULT_CONSOLE "\0"\
+- "console=console=ttySAC2,115200n8\0" \
++ "console=ttySAC2,115200n8\0" \
"meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \
"loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \
"mmcdev=0\0" \
@@ -142,21 +115,12 @@ Index: u-boot/include/configs/s5pc210_universal.h
===================================================================
--- u-boot.orig/include/configs/s5pc210_universal.h
+++ u-boot/include/configs/s5pc210_universal.h
-@@ -27,7 +27,7 @@
- /* Console configuration */
-
- #define CONFIG_BOOTCOMMAND "run mmcboot"
--#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
-+#define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8"
-
- #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- - GENERATED_GBL_DATA_SIZE)
@@ -106,7 +106,7 @@
"mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
"verify=n\0" \
"rootfstype=ext4\0" \
-- "console=" CONFIG_DEFAULT_CONSOLE \
-+ "console=" CONFIG_DEFAULT_CONSOLE "\0" \
+- "console=console=ttySAC1,115200n8\0" \
++ "console=ttySAC1,115200n8\0" \
"mtdparts=" CONFIG_MTDPARTS_DEFAULT \
"mbrparts=" MBRPARTS_DEFAULT \
"meminfo=crashkernel=32M@0x50000000\0" \
@@ -164,21 +128,12 @@ Index: u-boot/include/configs/trats.h
===================================================================
--- u-boot.orig/include/configs/trats.h
+++ u-boot/include/configs/trats.h
-@@ -36,7 +36,7 @@
- #define CONFIG_MACH_TYPE MACH_TYPE_TRATS
-
- #define CONFIG_BOOTCOMMAND "run autoboot"
--#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
-+#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8"
-
- #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- - GENERATED_GBL_DATA_SIZE)
@@ -118,7 +118,7 @@
"mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
"verify=n\0" \
"rootfstype=ext4\0" \
-- "console=" CONFIG_DEFAULT_CONSOLE \
-+ "console=" CONFIG_DEFAULT_CONSOLE "\0" \
+- "console=console=ttySAC2,115200n8\0" \
++ "console=ttySAC2,115200n8\0" \
"meminfo=crashkernel=32M@0x50000000\0" \
"nfsroot=/nfsroot/arm\0" \
"bootblock=" CONFIG_BOOTBLOCK "\0" \
@@ -186,21 +141,12 @@ Index: u-boot/include/configs/trats2.h
===================================================================
--- u-boot.orig/include/configs/trats2.h
+++ u-boot/include/configs/trats2.h
-@@ -34,7 +34,7 @@
- /* Console configuration */
-
- #define CONFIG_BOOTCOMMAND "run autoboot"
--#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
-+#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8"
-
- #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- - GENERATED_GBL_DATA_SIZE)
@@ -101,7 +101,7 @@
"boottrace=setenv opts initcall_debug; run bootcmd\0" \
"verify=n\0" \
"rootfstype=ext4\0" \
-- "console=" CONFIG_DEFAULT_CONSOLE \
-+ "console=" CONFIG_DEFAULT_CONSOLE "\0" \
+- "console=console=ttySAC2,115200n8\0" \
++ "console=ttySAC2,115200n8\0" \
"kernelname=uImage\0" \
"loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 " \
"${kernelname}\0" \
diff --git a/debian/patches/mx53loco b/debian/patches/mx53loco
index f62b9bf748..0e39d482e8 100644
--- a/debian/patches/mx53loco
+++ b/debian/patches/mx53loco
@@ -1,10 +1,8 @@
Enables support for ext4, the "load" command, and using bootz with raw initrds.
-Index: u-boot/configs/mx53loco_defconfig
-===================================================================
---- u-boot.orig/configs/mx53loco_defconfig
-+++ u-boot/configs/mx53loco_defconfig
-@@ -21,6 +21,7 @@ CONFIG_CMD_DHCP=y
+--- a/configs/mx53loco_defconfig
++++ b/configs/mx53loco_defconfig
+@@ -21,6 +21,7 @@
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_EXT2=y
diff --git a/debian/patches/n900/bootz_and_raw_initrd.patch
b/debian/patches/n900/bootz_and_raw_initrd.patch
index 12e03e8d64..7425bc64cf 100644
--- a/debian/patches/n900/bootz_and_raw_initrd.patch
+++ b/debian/patches/n900/bootz_and_raw_initrd.patch
@@ -1,11 +1,9 @@
Enable booting of zImage/vmlinuz and initrd without requiring the use
of mkimage to create uImage/uInitrd.
-Index: u-boot/configs/nokia_rx51_defconfig
-===================================================================
---- u-boot.orig/configs/nokia_rx51_defconfig
-+++ u-boot/configs/nokia_rx51_defconfig
-@@ -59,3 +59,5 @@ CONFIG_CFB_CONSOLE_ANSI=y
+--- a/configs/nokia_rx51_defconfig
++++ b/configs/nokia_rx51_defconfig
+@@ -62,3 +62,5 @@
# CONFIG_VGA_AS_SINGLE_DEVICE is not set
CONFIG_SPLASH_SCREEN=y
# CONFIG_GZIP is not set
diff --git
a/debian/patches/olinuxino-a20-lime2-emmc/0001-sunxi-Enable-ethernet-on-newer-Olimex-OLinuXino-A20-.patch
b/debian/patches/olinuxino-a20-lime2-emmc/0001-sunxi-Enable-ethernet-on-newer-Olimex-OLinuXino-A20-.patch
deleted file mode 100644
index 83730601d9..0000000000
---
a/debian/patches/olinuxino-a20-lime2-emmc/0001-sunxi-Enable-ethernet-on-newer-Olimex-OLinuXino-A20-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 22885f4ed9f5a67564aa8f0401669a9601051251 Mon Sep 17 00:00:00 2001
-From: Jonas Smedegaard <d...@jones.dk>
-Date: Sun, 9 Aug 2020 11:48:51 +0200
-Subject: [PATCH] sunxi: Enable ethernet on newer Olimex
- OLinuXino-A20-Lime2-eMMC
-
-Olimex OLinuXino LIME2 rev. H through L uses Micrel KSZ9031 PHY.
-
-This enables the Micrel PHY for A20-OLinuXino-Lime2-eMMC_defconfig.
-
-Signed-off-by: Jonas Smedegaard <d...@jones.dk>
-Reviewed-by: Jagan Teki <ja...@amarulasolutions.com>
----
- configs/A20-OLinuXino-Lime2-eMMC_defconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
-index b1a38d7a4d..f9f8f14151 100644
---- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
-+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
-@@ -19,6 +19,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y
- CONFIG_SCSI_AHCI=y
- CONFIG_DFU_RAM=y
- CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
-+CONFIG_PHY_MICREL=y
-+CONFIG_PHY_MICREL_KSZ90X1=y
- CONFIG_PHY_REALTEK=y
- CONFIG_ETH_DESIGNWARE=y
- CONFIG_RGMII=y
---
-2.20.1
-
diff --git
a/debian/patches/riscv64/qemu-riscv64_smode-sifive-fu540-fix-extlinux-define-.patch
b/debian/patches/riscv64/qemu-riscv64_smode-sifive-fu540-fix-extlinux-define-.patch
index da952e7213..37055040f6 100644
---
a/debian/patches/riscv64/qemu-riscv64_smode-sifive-fu540-fix-extlinux-define-.patch
+++
b/debian/patches/riscv64/qemu-riscv64_smode-sifive-fu540-fix-extlinux-define-.patch
@@ -19,21 +19,17 @@ Signed-off-by: David Abdurachmanov
<david.abdurachma...@sifive.com>
include/configs/sifive-fu540.h | 4 ----
3 files changed, 4 insertions(+), 4 deletions(-)
-Index: u-boot/configs/qemu-riscv64_smode_defconfig
-===================================================================
---- u-boot.orig/configs/qemu-riscv64_smode_defconfig
-+++ u-boot/configs/qemu-riscv64_smode_defconfig
-@@ -14,3 +14,5 @@ CONFIG_CMD_NVEDIT_EFI=y
+--- a/configs/qemu-riscv64_smode_defconfig
++++ b/configs/qemu-riscv64_smode_defconfig
+@@ -14,3 +14,5 @@
CONFIG_OF_PRIOR_STAGE=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MTD=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr
${fdtcontroladdr};"
-Index: u-boot/configs/sifive_fu540_defconfig
-===================================================================
---- u-boot.orig/configs/sifive_fu540_defconfig
-+++ u-boot/configs/sifive_fu540_defconfig
-@@ -27,3 +27,5 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
+--- a/configs/sifive_fu540_defconfig
++++ b/configs/sifive_fu540_defconfig
+@@ -27,3 +27,5 @@
CONFIG_SPL_CLK=y
CONFIG_DM_MTD=y
CONFIG_DM_RESET=y
diff --git a/debian/patches/series b/debian/patches/series
index f825baaca2..ae9f114b2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
add-debian-revision-to-u-boot-version
+
tools-generic-builds.patch
mx53loco
@@ -17,6 +18,4 @@
riscv64/qemu-riscv64_smode-sifive-fu540-fix-extlinux-define-.patch
n900/bootz_and_raw_initrd.patch
-olinuxino-a20-lime2-emmc/0001-sunxi-Enable-ethernet-on-newer-Olimex-OLinuXino-A20-.patch
-
teres-i/0001-sun50i-a64-A64-Teres-I-board-detect-builtin-keyboard.patch
diff --git
a/debian/patches/teres-i/0001-sun50i-a64-A64-Teres-I-board-detect-builtin-keyboard.patch
b/debian/patches/teres-i/0001-sun50i-a64-A64-Teres-I-board-detect-builtin-keyboard.patch
index be522153e7..005c52f4cd 100644
---
a/debian/patches/teres-i/0001-sun50i-a64-A64-Teres-I-board-detect-builtin-keyboard.patch
+++
b/debian/patches/teres-i/0001-sun50i-a64-A64-Teres-I-board-detect-builtin-keyboard.patch
@@ -18,18 +18,13 @@ Series-Cc: Andre Przywara <andre.przyw...@arm.com>
configs/teres_i_defconfig | 1 +
1 file changed, 1 insertion(+)
-diff --git a/configs/teres_i_defconfig b/configs/teres_i_defconfig
-index 1eba20e5f5..ee07f86f64 100644
--- a/configs/teres_i_defconfig
+++ b/configs/teres_i_defconfig
-@@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=3881949
+@@ -7,6 +7,7 @@
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_USB1_VBUS_PIN="PL7"
CONFIG_I2C0_ENABLE=y
+CONFIG_PREBOOT="setenv usb_pgood_delay 2000; usb start"
CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-teres-i"
+ CONFIG_PREBOOT="setenv usb_pgood_delay 2000; usb start"
CONFIG_DM_REGULATOR=y
- CONFIG_DM_REGULATOR_FIXED=y
---
-2.20.1
-
diff --git a/debian/patches/test-imagetools-test-fixes
b/debian/patches/test-imagetools-test-fixes
index 9266d6b410..fbedcad654 100644
--- a/debian/patches/test-imagetools-test-fixes
+++ b/debian/patches/test-imagetools-test-fixes
@@ -1,10 +1,8 @@
This patch allows testing in an alternate directory and also detects
failures to execute commands, treating that as a failure.
-Index: u-boot/test/image/test-imagetools.sh
-===================================================================
---- u-boot.orig/test/image/test-imagetools.sh
-+++ u-boot/test/image/test-imagetools.sh
+--- a/test/image/test-imagetools.sh
++++ b/test/image/test-imagetools.sh
@@ -11,7 +11,7 @@
# make O=sandbox
# ./test/image/test-imagetools.sh
@@ -14,7 +12,7 @@ Index: u-boot/test/image/test-imagetools.sh
SRCDIR=${BASEDIR}/boot
IMAGE_NAME="v1.0-test"
IMAGE_MULTI=linux.img
-@@ -94,7 +94,7 @@ create_multi_image()
+@@ -94,7 +94,7 @@
echo -e "\nBuilding multi-file image..."
do_cmd ${MKIMAGE} -A x86 -O linux -T multi -n \"${IMAGE_NAME}\" \
@@ -23,7 +21,7 @@ Index: u-boot/test/image/test-imagetools.sh
echo "done."
}
-@@ -102,10 +102,10 @@ create_multi_image()
+@@ -102,10 +102,10 @@
extract_multi_image()
{
echo -e "\nExtracting multi-file image contents..."
@@ -38,7 +36,7 @@ Index: u-boot/test/image/test-imagetools.sh
echo "done."
}
-@@ -158,7 +158,7 @@ create_fit_image()
+@@ -158,7 +158,7 @@
" > ${IMAGE_FIT_ITS}
echo -e "\nBuilding FIT image..."
@@ -47,7 +45,7 @@ Index: u-boot/test/image/test-imagetools.sh
echo "done."
}
-@@ -166,10 +166,10 @@ create_fit_image()
+@@ -166,10 +166,10 @@
extract_fit_image()
{
echo -e "\nExtracting FIT image contents..."
@@ -62,7 +60,7 @@ Index: u-boot/test/image/test-imagetools.sh
echo "done."
}
-@@ -181,8 +181,8 @@ list_image()
+@@ -181,8 +181,8 @@
local image="$1"
echo -e "\nListing image contents..."
diff --git a/debian/patches/tools-generic-builds.patch
b/debian/patches/tools-generic-builds.patch
index 8f173e0037..1f05d5aba1 100644
--- a/debian/patches/tools-generic-builds.patch
+++ b/debian/patches/tools-generic-builds.patch
@@ -1,11 +1,9 @@
Description: Enable generic tools build
Author: Hector Oron <zu...@debian.org>
-Index: u-boot/tools/Makefile
-===================================================================
---- u-boot.orig/tools/Makefile
-+++ u-boot/tools/Makefile
-@@ -54,7 +54,7 @@ HOSTCFLAGS_xway-swap-bytes.o := -pedanti
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -52,7 +52,7 @@
hostprogs-y += mkenvimage
mkenvimage-objs := mkenvimage.o os_support.o lib/crc32.o
