u-boot: add HOME env for make invocations to avoid binman/Python problems with older u-boot versions

lib/functions/compilation/uboot.sh

@@ -214,6 +214,7 @@ function compile_uboot_target() {
 		"CCACHE_BASEDIR=$(pwd)"
 		"PATH=${toolchain}:${toolchain2}:${PATH}"
 		"PYTHONPATH=\"${PYTHON3_INFO[MODULES_PATH]}:${PYTHONPATH}\"" # Insert the pip modules downloaded by Armbian into PYTHONPATH (needed e.g. for pyelftools)
+		"HOME=${WORKDIR}"                                            # give it a temporary-dir HOME; some Python stuff in old u-boots wants HOME env to be set
 	)
 
 	# workaround when two compilers are needed

patch/u-boot/v2022.04/board_tinkerboard/0001-tinkerboard-defconfig-fix.patch

@@ -1,8 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo Sabatino <[email protected]>
+Date: Thu, 24 Mar 2022 09:21:56 +0000
+Subject: [ARCHEOLOGY] rockchip: fix kernel device tree in u-boot
+
+> X-Git-Archeology: - Revision 2cbd35f3b2fbc90e4c93f3c1669fcd0f459d08a4: https://github.com/armbian/build/commit/2cbd35f3b2fbc90e4c93f3c1669fcd0f459d08a4
+> X-Git-Archeology:   Date: Thu, 24 Mar 2022 09:21:56 +0000
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rockchip: fix kernel device tree in u-boot
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 445062b8dc243c55381db7f5a579a08ca6a0d73a: https://github.com/armbian/build/commit/445062b8dc243c55381db7f5a579a08ca6a0d73a
+> X-Git-Archeology:   Date: Thu, 24 Mar 2022 09:21:56 +0000
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rockchip: advance tinkerboard u-boot to v2022.01
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision c674bac80c15025081086ef481e31365dddc74c2: https://github.com/armbian/build/commit/c674bac80c15025081086ef481e31365dddc74c2
+> X-Git-Archeology:   Date: Thu, 24 Mar 2022 09:21:56 +0000
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rockchip: advance tinkerboard u-boot to v2021.01
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision de26797423e22d58ec2882d7032c67f77196ecc5: https://github.com/armbian/build/commit/de26797423e22d58ec2882d7032c67f77196ecc5
+> X-Git-Archeology:   Date: Sun, 06 Nov 2022 20:32:46 +0100
+> X-Git-Archeology:   From: Igor Pecovnik <[email protected]>
+> X-Git-Archeology:   Subject: Move all legacy u-boot patches under one general legacy folder (#4386)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 97c34489831f2146940f52915428263b7edfcbe1: https://github.com/armbian/build/commit/97c34489831f2146940f52915428263b7edfcbe1
+> X-Git-Archeology:   Date: Fri, 24 Mar 2023 23:13:42 +0100
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rockchip: put all rockchip 32 bit into uboot/v2022.04 directory
+> X-Git-Archeology:
+---
+ configs/tinker-rk3288_defconfig | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
 diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
-index a9c9a122..842a43fb 100644
+index 111111111111..222222222222 100644
 --- a/configs/tinker-rk3288_defconfig
 +++ b/configs/tinker-rk3288_defconfig
-@@ -17,11 +17,12 @@ CONFIG_DEBUG_UART=y
+@@ -18,11 +18,12 @@ CONFIG_DEBUG_UART=y
  CONFIG_SYS_LOAD_ADDR=0x800800
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
@@ -16,15 +50,15 @@ index a9c9a122..842a43fb 100644
  CONFIG_SPL_I2C=y
  CONFIG_SPL_POWER=y
  CONFIG_CMD_GPIO=y
-@@ -75,6 +76,7 @@ CONFIG_REGULATOR_RK8XX=y
+@@ -76,6 +77,7 @@ CONFIG_REGULATOR_RK8XX=y
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM=y
  CONFIG_SPL_RAM=y
 +CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_SHIFT=2
  CONFIG_SYSRESET=y
  CONFIG_USB=y
-@@ -85,6 +87,9 @@ CONFIG_USB_HOST_ETHER=y
+@@ -86,6 +88,9 @@ CONFIG_USB_HOST_ETHER=y
  CONFIG_USB_ETHER_ASIX=y
  CONFIG_USB_ETHER_SMSC95XX=y
  CONFIG_USB_GADGET=y
@@ -34,3 +68,6 @@ index a9c9a122..842a43fb 100644
  CONFIG_USB_GADGET_DWC2_OTG=y
  CONFIG_DM_VIDEO=y
  CONFIG_DISPLAY=y
+-- 
+Armbian
+

patch/u-boot/v2022.04/board_tinkerboard/0002-tinkerboard-add-emmc.patch

@@ -1,15 +1,15 @@
-From b89be51a2e80e7a56ddd444cc57b042594016218 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <[email protected]>
 Date: Sat, 19 Mar 2022 21:37:32 +0000
-Subject: [PATCH] rk3288: add emmc to tinkerboard dts
+Subject: rk3288: add emmc to tinkerboard dts
 
 ---
  arch/arm/dts/rk3288-tinker-u-boot.dtsi |  4 ++++
- arch/arm/dts/rk3288-tinker.dts         | 12 ++++++++++++
+ arch/arm/dts/rk3288-tinker.dts         | 12 ++++++++++
  2 files changed, 16 insertions(+)
 
 diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
-index 56d10c82e..164c72eb7 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi
 +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
 @@ -36,6 +36,10 @@
@@ -24,7 +24,7 @@ index 56d10c82e..164c72eb7 100644
  	u-boot,dm-spl;
  };
 diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
-index 8b1848c31..8db248412 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/dts/rk3288-tinker.dts
 +++ b/arch/arm/dts/rk3288-tinker.dts
 @@ -31,3 +31,15 @@
@@ -44,5 +44,5 @@ index 8b1848c31..8db248412 100644
 +	status = "okay";
 +};
 -- 
-2.30.2
+Armbian
 

patch/u-boot/v2022.04/board_tinkerboard/0003-UMS-mode-on-otg-port.patch

@@ -1,15 +1,15 @@
-From 2636bc3f11c953c24b3af7334082811737bf475b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <[email protected]>
 Date: Sat, 19 Mar 2022 21:41:38 +0000
-Subject: [PATCH] rk3288: tinkerboard: add UMS mode when USB host is connected
- to OTG port during boot
+Subject: rk3288: tinkerboard: add UMS mode when USB host is connected to OTG
+ port during boot
 
 ---
- arch/arm/include/asm/arch-rockchip/gpio.h  |  22 ++++
- arch/arm/mach-rockchip/board.c             | 115 +++++++++++++++++++++
- arch/arm/mach-rockchip/spl.c               |  23 ++++-
+ arch/arm/include/asm/arch-rockchip/gpio.h  |  22 ++
+ arch/arm/mach-rockchip/board.c             | 115 ++++++++++
+ arch/arm/mach-rockchip/spl.c               |  23 +-
  cmd/usb_mass_storage.c                     |   9 +-
- common/autoboot.c                          |  22 ++++
+ common/autoboot.c                          |  22 ++
  common/board_r.c                           |   1 +
  drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c |   1 +
  drivers/usb/gadget/f_mass_storage.c        |  10 +-
@@ -18,7 +18,7 @@ Subject: [PATCH] rk3288: tinkerboard: add UMS mode when USB host is connected
  10 files changed, 203 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/include/asm/arch-rockchip/gpio.h b/arch/arm/include/asm/arch-rockchip/gpio.h
-index 1aaec5fae..135688d3b 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/include/asm/arch-rockchip/gpio.h
 +++ b/arch/arm/include/asm/arch-rockchip/gpio.h
 @@ -24,6 +24,28 @@ struct rockchip_gpio_regs {
@@ -51,10 +51,10 @@ index 1aaec5fae..135688d3b 100644
  	GPIO_PULL_NORMAL = 0,
  	GPIO_PULL_UP,
 diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
-index ba4da72b3..5ae2c7f8f 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/mach-rockchip/board.c
 +++ b/arch/arm/mach-rockchip/board.c
-@@ -17,10 +17,26 @@
+@@ -18,10 +18,26 @@
  #include <asm/arch-rockchip/clock.h>
  #include <asm/arch-rockchip/periph.h>
  #include <asm/arch-rockchip/misc.h>
@@ -81,7 +81,7 @@ index ba4da72b3..5ae2c7f8f 100644
  __weak int rk_board_late_init(void)
  {
  	return 0;
-@@ -33,6 +49,105 @@ int board_late_init(void)
+@@ -34,6 +50,105 @@ int board_late_init(void)
  	return rk_board_late_init();
  }
 
@@ -188,10 +188,10 @@ index ba4da72b3..5ae2c7f8f 100644
  {
  	int ret;
 diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
-index f148d48b6..59daff438 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/mach-rockchip/spl.c
 +++ b/arch/arm/mach-rockchip/spl.c
-@@ -106,6 +106,27 @@ __weak int arch_cpu_init(void)
+@@ -108,6 +108,27 @@ __weak int arch_cpu_init(void)
  	return 0;
  }
 
@@ -219,7 +219,7 @@ index f148d48b6..59daff438 100644
  void board_init_f(ulong dummy)
  {
  	int ret;
-@@ -122,7 +143,7 @@ void board_init_f(ulong dummy)
+@@ -124,7 +145,7 @@ void board_init_f(ulong dummy)
  	debug_uart_init();
  	debug("\nspl:debug uart enabled in %s\n", __func__);
  #endif
@@ -229,7 +229,7 @@ index f148d48b6..59daff438 100644
 
  	ret = spl_early_init();
 diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
-index cf2f55994..d406ea453 100644
+index 111111111111..222222222222 100644
 --- a/cmd/usb_mass_storage.c
 +++ b/cmd/usb_mass_storage.c
 @@ -111,7 +111,7 @@ static int ums_init(const char *devtype, const char *devnums_part_str)
@@ -263,7 +263,7 @@ index cf2f55994..d406ea453 100644
  			/* Check I/O error */
  			if (rc == -EIO)
 diff --git a/common/autoboot.c b/common/autoboot.c
-index e628baffb..eefaa28d4 100644
+index 111111111111..222222222222 100644
 --- a/common/autoboot.c
 +++ b/common/autoboot.c
 @@ -40,6 +40,9 @@ DECLARE_GLOBAL_DATA_PTR;
@@ -276,9 +276,9 @@ index e628baffb..eefaa28d4 100644
  #if !defined(CONFIG_AUTOBOOT_STOP_STR_CRYPT)
  #define CONFIG_AUTOBOOT_STOP_STR_CRYPT ""
  #endif
-@@ -49,6 +52,10 @@ static int menukey;
- #define AUTOBOOT_MENUKEY 0
- #endif
+@@ -120,6 +123,10 @@ static int passwd_abort_crypt(uint64_t etime)
+ 	return abort;
+ }
 
 +extern int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]);
 +void usb_current_limit_ctrl(bool unlock_current);
@@ -287,7 +287,7 @@ index e628baffb..eefaa28d4 100644
  /*
   * Use a "constant-length" time compare function for this
   * hash compare:
-@@ -363,6 +370,21 @@ void autoboot_command(const char *s)
+@@ -476,6 +483,21 @@ void autoboot_command(const char *s)
  {
  	debug("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");
 
@@ -310,19 +310,19 @@ index e628baffb..eefaa28d4 100644
  		 (stored_bootdelay != -1 && !abortboot(stored_bootdelay)))) {
  		bool lock;
 diff --git a/common/board_r.c b/common/board_r.c
-index 29dd7d26d..5b952d00c 100644
+index 111111111111..222222222222 100644
 --- a/common/board_r.c
 +++ b/common/board_r.c
-@@ -797,6 +797,7 @@ static init_fnc_t init_sequence_r[] = {
+@@ -697,6 +697,7 @@ static init_fnc_t init_sequence_r[] = {
  #ifdef CONFIG_MMC
  	initr_mmc,
  #endif
 +	check_force_enter_ums_mode,
  #ifdef CONFIG_XEN
- 	initr_xen,
+ 	xen_init,
  #endif
 diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
-index f17009a29..b85b3f825 100644
+index 111111111111..222222222222 100644
 --- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
 +++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c
 @@ -1393,6 +1393,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev)
@@ -334,7 +334,7 @@ index f17009a29..b85b3f825 100644
 
  		case USB_REQ_SET_INTERFACE:
 diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
-index 45f0504b6..80706d41b 100644
+index 111111111111..222222222222 100644
 --- a/drivers/usb/gadget/f_mass_storage.c
 +++ b/drivers/usb/gadget/f_mass_storage.c
 @@ -655,7 +655,7 @@ static void busy_indicator(void)
@@ -369,10 +369,10 @@ index 45f0504b6..80706d41b 100644
  	}
  	common->thread_wakeup_needed = 0;
 diff --git a/include/init.h b/include/init.h
-index 0f48ccb57..bae1cb88e 100644
+index 111111111111..222222222222 100644
 --- a/include/init.h
 +++ b/include/init.h
-@@ -261,6 +261,7 @@ int board_early_init_f(void);
+@@ -297,6 +297,7 @@ int board_early_init_f(void);
  /* manipulate the U-Boot fdt before its relocation */
  int board_fix_fdt(void *rw_fdt_blob);
  int board_late_init(void);
@@ -381,7 +381,7 @@ index 0f48ccb57..bae1cb88e 100644
  int board_early_init_r(void);
 
 diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
-index 06292ddeb..48709f3b0 100644
+index 111111111111..222222222222 100644
 --- a/include/linux/usb/gadget.h
 +++ b/include/linux/usb/gadget.h
 @@ -25,6 +25,9 @@
@@ -395,5 +395,5 @@ index 06292ddeb..48709f3b0 100644
   * struct usb_request - describes one i/o request
   * @buf: Buffer used for data.  Always provide this; some controllers
 -- 
-2.30.2
+Armbian
 

patch/u-boot/v2022.04/board_tinkerboard/0004-make-emmc-bootable.patch

@@ -1,14 +1,14 @@
-From e8926f5e4dd307c01b59883db7ae76e67bb47894 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <[email protected]>
 Date: Sat, 19 Mar 2022 12:58:06 +0000
-Subject: [PATCH] rk3288: tinkerboard-s emmc boot
+Subject: rk3288: tinkerboard-s emmc boot
 
 ---
  include/configs/tinker_rk3288.h | 9 +--------
  1 file changed, 1 insertion(+), 8 deletions(-)
 
 diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h
-index 269ec529..e19fa902 100644
+index 111111111111..222222222222 100644
 --- a/include/configs/tinker_rk3288.h
 +++ b/include/configs/tinker_rk3288.h
 @@ -13,13 +13,6 @@
@@ -26,18 +26,20 @@ index 269ec529..e19fa902 100644
 +#define CONFIG_SYS_MMC_ENV_DEV 0
 
  #endif
+-- 
+Armbian
 
-From b8a75200b11fc0005a8e12192473159e51abd29c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <[email protected]>
 Date: Sat, 19 Mar 2022 13:05:33 +0000
-Subject: [PATCH] rk3288: fix redefined symbol
+Subject: rk3288: fix redefined symbol
 
 ---
  include/configs/tinker_rk3288.h | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h
-index e19fa9021..bde7d72e6 100644
+index 111111111111..222222222222 100644
 --- a/include/configs/tinker_rk3288.h
 +++ b/include/configs/tinker_rk3288.h
 @@ -13,6 +13,7 @@
@@ -49,5 +51,5 @@ index e19fa9021..bde7d72e6 100644
 
  #endif
 -- 
-2.30.2
+Armbian
 

patch/u-boot/v2022.04/board_tinkerboard/add-overlay-support.patch

@@ -1,13 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: zador-blood-stained <[email protected]>
+Date: Tue, 31 Oct 2017 21:23:43 +0300
+Subject: [ARCHEOLOGY] Add mvebu dev branch
+
+> X-Git-Archeology: > recovered message: > It uses the same kernel as next, but it uses mainline u-boot with DT
+> X-Git-Archeology: > recovered message: > overlay support, but without SPI, USB and possibly SATA support
+> X-Git-Archeology: - Revision aba730f4880b20f7ba37504a8d1d6bc484f28c54: https://github.com/armbian/build/commit/aba730f4880b20f7ba37504a8d1d6bc484f28c54
+> X-Git-Archeology:   Date: Tue, 31 Oct 2017 21:23:43 +0300
+> X-Git-Archeology:   From: zador-blood-stained <[email protected]>
+> X-Git-Archeology:   Subject: Add mvebu dev branch
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision e71d1560f0429d9ecbc077ac457c6247735e3e9a: https://github.com/armbian/build/commit/e71d1560f0429d9ecbc077ac457c6247735e3e9a
+> X-Git-Archeology:   Date: Fri, 23 Nov 2018 15:39:23 +0100
+> X-Git-Archeology:   From: aprayoga <[email protected]>
+> X-Git-Archeology:   Subject: Helios4: various updates (#1161)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 3a185c8b8262a3189fd99fedc4350d738e825d0d: https://github.com/armbian/build/commit/3a185c8b8262a3189fd99fedc4350d738e825d0d
+> X-Git-Archeology:   Date: Thu, 13 Dec 2018 19:04:47 -0500
+> X-Git-Archeology:   From: Thomas McKahan <[email protected]>
+> X-Git-Archeology:   Subject: [ rockchip-dev ] Add DT overlay framework
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision de26797423e22d58ec2882d7032c67f77196ecc5: https://github.com/armbian/build/commit/de26797423e22d58ec2882d7032c67f77196ecc5
+> X-Git-Archeology:   Date: Sun, 06 Nov 2022 20:32:46 +0100
+> X-Git-Archeology:   From: Igor Pecovnik <[email protected]>
+> X-Git-Archeology:   Subject: Move all legacy u-boot patches under one general legacy folder (#4386)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 97c34489831f2146940f52915428263b7edfcbe1: https://github.com/armbian/build/commit/97c34489831f2146940f52915428263b7edfcbe1
+> X-Git-Archeology:   Date: Fri, 24 Mar 2023 23:13:42 +0100
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rockchip: put all rockchip 32 bit into uboot/v2022.04 directory
+> X-Git-Archeology:
+---
+ arch/arm/Kconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 8a23c76d..bb1e3cb7 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1321,6 +1321,8 @@ config ARCH_ROCKCHIP
+@@ -1908,6 +1908,8 @@ config ARCH_ROCKCHIP
+ 	select DM_SPI
  	select DM_SPI_FLASH
- 	select DM_USB if USB
  	select ENABLE_ARM_SOC_BOOT0_HOOK
 +	select OF_LIBFDT
 +	select OF_LIBFDT_OVERLAY
  	select OF_CONTROL
  	select SPI
  	select SPL_DM if SPL
+-- 
+Armbian
+