diff options
Diffstat (limited to 'package/u-boot')
-rw-r--r-- | package/u-boot/Makefile | 71 | ||||
-rw-r--r-- | package/u-boot/files/boot.script.bpizero | 4 | ||||
-rw-r--r-- | package/u-boot/files/boot.script.imx6 | 6 | ||||
-rw-r--r-- | package/u-boot/files/boot.script.rockpi4 | 4 | ||||
-rw-r--r-- | package/u-boot/files/fw_env.config | 2 | ||||
-rwxr-xr-x | package/u-boot/files/uboot_print_env | 5 | ||||
-rwxr-xr-x | package/u-boot/files/uboot_set_env | 5 | ||||
-rw-r--r-- | package/u-boot/patches/patch-configs_bananapi_m2_p2_zero_defconfig | 18 | ||||
-rw-r--r-- | package/u-boot/patches/patch-tools_Makefile | 11 | ||||
-rw-r--r-- | package/u-boot/src/bl31.elf | bin | 0 -> 365344 bytes |
10 files changed, 99 insertions, 27 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index b793e8540..9e2a12bb8 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -4,19 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot -PKG_VERSION:= 2019.10 +PKG_VERSION:= 2024.07 PKG_RELEASE:= 1 -PKG_HASH:= 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014 +PKG_HASH:= f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= libressl-host dtc-host -PKG_BUILDDEP:= u-boot-host +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 PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SYSTEM_DEPENDS:= beaglebone-black orange-pi0 raspberry-pi raspberry-pi2 raspberry-pi3 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 phytec-imx6 +PKG_SYSTEM_DEPENDS:= banana-p2-zero beaglebone-black orange-pi0 raspberry-pi raspberry-pi2 raspberry-pi3 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 rockpi4-plus phytec-imx6 pcduino-3b imgtec-ci20 st-stm32f746g starfive-visionfive2 include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -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 @@ -37,6 +37,9 @@ ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) CONFIG:= mx6cuboxi_defconfig UBOOT:= u-boot.img endif +ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y) +CONFIG:= Linksprite_pcDuino3_defconfig +endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIG:= rpi_defconfig endif @@ -55,10 +58,18 @@ endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64),y) CONFIG:= rpi_3_defconfig endif +ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y) +CONFIG:= rock-pi-4-rk3399_defconfig +UBOOT:= u-boot.itb +endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) CONFIG:= Bananapro_defconfig UBOOT:= u-boot-sunxi-with-spl.bin endif +ifeq ($(ADK_TARGET_SYSTEM_BANANA_P2_ZERO),y) +CONFIG:= bananapi_m2_p2_zero_defconfig +UBOOT:= u-boot-sunxi-with-spl.bin +endif ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y) CONFIG:= orangepi_zero_defconfig UBOOT:= u-boot-sunxi-with-spl.bin @@ -67,6 +78,18 @@ ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) CONFIG:= am335x_evm_defconfig UBOOT:= u-boot.img endif +ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y) +CONFIG:= ci20_mmc_defconfig +UBOOT:= u-boot-dtb.img +endif +ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) +CONFIG:= stm32f746-disco_defconfig +UBOOT:= u-boot-dtb.bin +endif +ifeq ($(ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2),y) +CONFIG:= starfive_visionfive2_defconfig +UBOOT:= u-boot.itb +endif HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" @@ -75,6 +98,10 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +ifeq ($(ADK_TARGET_BINFMT_FDPIC),y) +EXTRA_CFLAGS:= -mno-fdpic +endif + host-build: (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ $(HOST_MAKE_FLAGS) sandbox_defconfig ) @@ -86,32 +113,47 @@ 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 \ + PKG_CONFIG="$(STAGING_HOST_DIR)/usr/bin/pkg-config" \ + PKG_CONFIG_LIBDIR="$(STAGING_HOST_DIR)/lib/pkgconfig:$(STAGING_HOST_DIR)/share/pkgconfig" \ + KBUILD_VERBOSE=1 \ + KCFLAGS='$(EXTRA_CFLAGS)' \ PATH='$(HOST_PATH)' \ CROSS_COMPILE='$(TARGET_CROSS)' \ + OPENSBI="$(FW_DIR)/fw_dynamic.bin" \ $(MAKE)) -ifneq ($(OS_FOR_BUILD),Darwin) (cd $(WRKBUILD) && env \ PATH='$(HOST_PATH)' \ CROSS_COMPILE='$(TARGET_CROSS)' \ - $(MAKE) env) -endif + $(MAKE) envtools) u-boot-install: $(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR) $(INSTALL_DIR) $(IDIR_U_BOOT)/etc $(CP) ./files/fw_env.config $(IDIR_U_BOOT)/etc -ifneq ($(OS_FOR_BUILD),Darwin) $(INSTALL_DIR) $(IDIR_U_BOOT)/usr/bin - $(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT)/usr/bin - $(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/tools/env/fw_printenv \ + $(IDIR_U_BOOT)/usr/bin + cd $(IDIR_U_BOOT)/usr/bin && ln -fs fw_printenv fw_setenv +ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y) + $(CP) $(WRKBUILD)/idbloader.img $(FW_DIR) +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) endif +ifeq ($(ADK_TARGET_SYSTEM_BANANA_P2_ZERO),y) + $(INSTALL_BIN) ./files/boot.script.bpizero $(FW_DIR) +endif +ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y) + $(INSTALL_BIN) ./files/boot.script.rockpi4 $(FW_DIR) +endif ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y) $(INSTALL_BIN) ./files/boot.script.opi $(FW_DIR) endif @@ -130,6 +172,9 @@ ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) $(CP) ./files/uEnv.txt.bbb $(FW_DIR)/uEnv.txt $(INSTALL_BIN) $(WRKBUILD)/MLO $(FW_DIR) endif +ifeq ($(ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2),y) + $(CP) $(WRKBUILD)/spl/u-boot-spl.bin.normal.out $(FW_DIR) +endif include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/u-boot/files/boot.script.bpizero b/package/u-boot/files/boot.script.bpizero new file mode 100644 index 000000000..1d7893b49 --- /dev/null +++ b/package/u-boot/files/boot.script.bpizero @@ -0,0 +1,4 @@ +setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait +ext4load mmc 0:1 $fdt_addr_r boot/${fdtfile} +ext4load mmc 0:1 $kernel_addr_r boot/kernel +bootz $kernel_addr_r - $fdt_addr_r diff --git a/package/u-boot/files/boot.script.imx6 b/package/u-boot/files/boot.script.imx6 index 24d1b2a93..0a4ff9fd9 100644 --- a/package/u-boot/files/boot.script.imx6 +++ b/package/u-boot/files/boot.script.imx6 @@ -1,4 +1,4 @@ -setenv bootargs 'console=ttymxc0,115200 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 root=/dev/mmcblk0p1' -ext4load mmc 0:1 0x18000000 boot/${fdtfile} -ext4load mmc 0:1 0x10800000 boot/kernel +setenv bootargs 'console=ttymxc0,115200 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 root=/dev/mmcblk1p1 rootwait' +ext4load mmc 1:1 0x18000000 boot/${fdtfile} +ext4load mmc 1:1 0x10800000 boot/kernel bootz 0x10800000 - 0x18000000 diff --git a/package/u-boot/files/boot.script.rockpi4 b/package/u-boot/files/boot.script.rockpi4 new file mode 100644 index 000000000..c74916170 --- /dev/null +++ b/package/u-boot/files/boot.script.rockpi4 @@ -0,0 +1,4 @@ +setenv bootargs console=tty0 console=ttyS2,115200 root=/dev/mmcblk0p1 rootwait +ext4load mmc 1:1 $kernel_addr_r boot/kernel +ext4load mmc 1:1 $fdt_addr_r boot/rk3399-rock-pi-4b-plus.dtb +booti $kernel_addr_r - $fdt_addr_r diff --git a/package/u-boot/files/fw_env.config b/package/u-boot/files/fw_env.config index 5571d60e0..8fd738b4e 100644 --- a/package/u-boot/files/fw_env.config +++ b/package/u-boot/files/fw_env.config @@ -1 +1 @@ -/mnt/uboot.env 0x0000 0x4000 +/dev/mmcblk1 0x3F8000 0x8000 diff --git a/package/u-boot/files/uboot_print_env b/package/u-boot/files/uboot_print_env deleted file mode 100755 index 7231e1a47..000000000 --- a/package/u-boot/files/uboot_print_env +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mount -r /dev/mmcblk0p1 /mnt -fw_printenv "$@" -umount /mnt diff --git a/package/u-boot/files/uboot_set_env b/package/u-boot/files/uboot_set_env deleted file mode 100755 index 7b5a33ccc..000000000 --- a/package/u-boot/files/uboot_set_env +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mount /dev/mmcblk0p1 /mnt -fw_setenv "$@" -umount /mnt diff --git a/package/u-boot/patches/patch-configs_bananapi_m2_p2_zero_defconfig b/package/u-boot/patches/patch-configs_bananapi_m2_p2_zero_defconfig new file mode 100644 index 000000000..c9761d409 --- /dev/null +++ b/package/u-boot/patches/patch-configs_bananapi_m2_p2_zero_defconfig @@ -0,0 +1,18 @@ +--- u-boot-2022.10.orig/configs/bananapi_m2_p2_zero_defconfig 1970-01-01 00:00:00.000000000 +0100 ++++ u-boot-2022.10/configs/bananapi_m2_p2_zero_defconfig 2022-12-25 07:59:45.852731211 +0100 +@@ -0,0 +1,15 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++# CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-bananapi-m2-plus-v1.2" ++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-bananapi-m2-zero" ++CONFIG_SPL=y ++CONFIG_MACH_SUN8I_H3=y ++CONFIG_DRAM_CLK=408 ++CONFIG_MMC0_CD_PIN="" ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_PREBOOT="" ++# CONFIG_SYS_DEVICE_NULLDEV is not set ++CONFIG_SPL_STACK=0x8000 ++CONFIG_SYS_PBSIZE=1024 ++CONFIG_SUN8I_EMAC=y diff --git a/package/u-boot/patches/patch-tools_Makefile b/package/u-boot/patches/patch-tools_Makefile new file mode 100644 index 000000000..fc284ad58 --- /dev/null +++ b/package/u-boot/patches/patch-tools_Makefile @@ -0,0 +1,11 @@ +--- 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 diff --git a/package/u-boot/src/bl31.elf b/package/u-boot/src/bl31.elf Binary files differnew file mode 100644 index 000000000..24cb666c7 --- /dev/null +++ b/package/u-boot/src/bl31.elf |