diff options
Diffstat (limited to 'package/u-boot')
| -rw-r--r-- | package/u-boot/Makefile | 9 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig | 11 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig | 11 |
3 files changed, 5 insertions, 26 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 704465fe9..9e2a12bb8 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot -PKG_VERSION:= 2024.04 +PKG_VERSION:= 2024.07 PKG_RELEASE:= 1 -PKG_HASH:= 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a +PKG_HASH:= f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot HOST_BUILDDEP:= libressl-host dtc-host swig-host python3-host python-setuptools-host @@ -27,7 +27,7 @@ $(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP UBOOT:= u-boot.bin ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) CONFIG:= clearfog_defconfig -UBOOT:= u-boot-spl.kwb +UBOOT:= u-boot-with-spl.kwb endif ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_IMX6),y) CONFIG:= pcm058_defconfig @@ -113,7 +113,7 @@ u-boot-hostinstall: $(STAGING_HOST_DIR)/usr/bin do-configure: - (cd $(WRKBUILD) && $(MAKE) $(CONFIG)) + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' $(MAKE) $(CONFIG)) do-build: (cd $(WRKBUILD) && env \ @@ -143,6 +143,7 @@ ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y) endif ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y) $(CP) $(WRKBUILD)/spl/u-boot-spl.bin $(FW_DIR) + cat ./files/uboot-env.txt.ci20 | PATH='$(HOST_PATH)' mkenvimage -s "32768" -o $(FW_DIR)/uboot-env.bin - endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) $(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR) diff --git a/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig b/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig deleted file mode 100644 index 818529353..000000000 --- a/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig +++ /dev/null @@ -1,11 +0,0 @@ ---- u-boot-2023.07.02.orig/configs/rock-pi-4-rk3399_defconfig 2023-07-11 17:20:44.000000000 +0200 -+++ u-boot-2023.07.02/configs/rock-pi-4-rk3399_defconfig 2023-09-29 15:54:05.235780393 +0200 -@@ -70,7 +70,7 @@ CONFIG_REGULATOR_PWM=y - CONFIG_REGULATOR_RK8XX=y - CONFIG_PWM_ROCKCHIP=y - CONFIG_RAM_ROCKCHIP_LPDDR4=y --CONFIG_BAUDRATE=1500000 -+CONFIG_BAUDRATE=115200 - CONFIG_DEBUG_UART_SHIFT=2 - CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y diff --git a/package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig b/package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig deleted file mode 100644 index 87e4bd238..000000000 --- a/package/u-boot/patches/patch-configs_rock-pi-4c-rk3399_defconfig +++ /dev/null @@ -1,11 +0,0 @@ ---- u-boot-2023.07.02.orig/configs/rock-pi-4c-rk3399_defconfig 2023-07-11 17:20:44.000000000 +0200 -+++ u-boot-2023.07.02/configs/rock-pi-4c-rk3399_defconfig 2023-09-29 15:54:16.927583546 +0200 -@@ -67,7 +67,7 @@ CONFIG_REGULATOR_PWM=y - CONFIG_REGULATOR_RK8XX=y - CONFIG_PWM_ROCKCHIP=y - CONFIG_RAM_ROCKCHIP_LPDDR4=y --CONFIG_BAUDRATE=1500000 -+CONFIG_BAUDRATE=115200 - CONFIG_DEBUG_UART_SHIFT=2 - CONFIG_SYS_NS16550_MEM32=y - CONFIG_SYSRESET=y |