Skip to content

Commit 972418b

Browse files
committed
uboot-rockchip: update loading address of atf
Fixes: #13875
1 parent c58e723 commit 972418b

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

package/boot/uboot-rockchip/Makefile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -538,23 +538,19 @@ UBOOT_TARGETS := \
538538

539539
UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes
540540

541+
UBOOT_CUSTOMIZE_CONFIG := \
542+
--disable TOOLS_MKEFICAPSULE \
543+
--set-str MKIMAGE_DTC_PATH $(PKG_BUILD_DIR)/scripts/dtc/dtc
544+
541545
UBOOT_MAKE_FLAGS += \
542546
BL31=$(STAGING_DIR_IMAGE)/$(ATF) \
543547
PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \
544548
$(if $(TPL),ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(TPL))
545549

546-
define Build/Configure
547-
$(call Build/Configure/U-Boot)
548-
549-
$(SED) 's#CONFIG_MKIMAGE_DTC_PATH=.*#CONFIG_MKIMAGE_DTC_PATH="$(PKG_BUILD_DIR)/scripts/dtc/dtc"#g' $(PKG_BUILD_DIR)/.config
550-
echo '# CONFIG_TOOLS_MKEFICAPSULE is not set' >> $(PKG_BUILD_DIR)/.config
551-
echo 'CONFIG_IDENT_STRING=" OpenWrt"' >> $(PKG_BUILD_DIR)/.config
552-
endef
553-
554550
define Build/InstallDev
555551
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
556552
ifneq ($(USE_RKBIN),)
557-
$(STAGING_DIR_IMAGE)/loaderimage --pack --uboot $(PKG_BUILD_DIR)/u-boot-dtb.bin $(PKG_BUILD_DIR)/uboot.img 0x200000
553+
$(STAGING_DIR_IMAGE)/loaderimage --pack --uboot $(PKG_BUILD_DIR)/u-boot-dtb.bin $(PKG_BUILD_DIR)/uboot.img 0x800000
558554
$(CP) $(PKG_BUILD_DIR)/uboot.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-uboot.img
559555
else
560556
$(CP) $(PKG_BUILD_DIR)/idbloader.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-idbloader.img

0 commit comments

Comments
 (0)