diff options
Diffstat (limited to 'package/u-boot')
| -rw-r--r-- | package/u-boot/Makefile | 20 | ||||
| -rw-r--r-- | package/u-boot/files/uboot-env.txt.ci20 | 10 | ||||
| -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 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-tools_Makefile | 11 |
5 files changed, 22 insertions, 41 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 704465fe9..65c430802 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot -PKG_VERSION:= 2024.04 +PKG_VERSION:= 2025.04 PKG_RELEASE:= 1 -PKG_HASH:= 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a +PKG_HASH:= 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= libressl-host dtc-host swig-host python3-host python-setuptools-host -PKG_BUILDDEP:= python3-host python-setuptools-host swig-host u-boot-host +HOST_BUILDDEP:= gnutls-host openssl-host dtc-host swig-host python3-host python3-setuptools-host +PKG_BUILDDEP:= python3-host python3-setuptools-host swig-host u-boot-host PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ @@ -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 @@ -39,6 +39,7 @@ UBOOT:= u-boot.img endif ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y) CONFIG:= Linksprite_pcDuino3_defconfig +UBOOT:= u-boot-sunxi-with-spl.bin endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIG:= rpi_defconfig @@ -91,6 +92,8 @@ CONFIG:= starfive_visionfive2_defconfig UBOOT:= u-boot.itb endif +MAKE_FLAGS+= HOSTCFLAGS="-I$(STAGING_HOST_DIR)/usr/include" \ + HOSTLDFLAGS="$(HOST_LDFLAGS)" HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" HOST_STYLE:= manual @@ -104,16 +107,16 @@ endif host-build: (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ - $(HOST_MAKE_FLAGS) sandbox_defconfig ) + $(HOST_MAKE_FLAGS) tools-only_defconfig ) (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ - $(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) ) + $(HOST_MAKE_FLAGS) tools-only $(MAKE_TRACE) ) u-boot-hostinstall: $(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \ $(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 +146,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/files/uboot-env.txt.ci20 b/package/u-boot/files/uboot-env.txt.ci20 new file mode 100644 index 000000000..c66316928 --- /dev/null +++ b/package/u-boot/files/uboot-env.txt.ci20 @@ -0,0 +1,10 @@ +baudrate=115200 +board_mfr=NP +bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 +bootcmd=run ethargs; ext4load mmc 0:1 0x88000000 /boot/kernel; bootm 0x88000000 +bootdelay=1 +ethargs=env set bootargs ${bootargs} +loads_echo=1 +stderr=eserial0,eserial4 +stdin=eserial0,eserial4 +stdout=eserial0,eserial4 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 diff --git a/package/u-boot/patches/patch-tools_Makefile b/package/u-boot/patches/patch-tools_Makefile deleted file mode 100644 index fc284ad58..000000000 --- a/package/u-boot/patches/patch-tools_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- u-boot-2024.01.orig/tools/Makefile 2024-01-08 16:37:48.000000000 +0100 -+++ u-boot-2024.01/tools/Makefile 2024-01-17 17:56:21.004096375 +0100 -@@ -250,7 +250,7 @@ HOSTLDLIBS_mkeficapsule += \ - $(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls") - HOSTLDLIBS_mkeficapsule += \ - $(shell pkg-config --libs uuid 2> /dev/null || echo "-luuid") --hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule -+#hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule - - mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o - HOSTLDLIBS_mkfwumdata += -luuid |