From 9561603f45b921f744ae6d8a32939d6ae31e7e3b Mon Sep 17 00:00:00 2001 From: Joakim Bech <joakim.bech@linaro.org> Date: Fri, 1 Feb 2019 12:45:45 +0100 Subject: [PATCH] rpi3: add proper target to compile uboot.env To be able to compile uboot.env directly we must have a proper target instead of the current '$(RPI3_UBOOT_ENV)'. Therefore we replace '$(RPI3_UBOOT_ENV)' with u-boot-env instead which also lines up better with the u-boot-env-clean variable. Signed-off-by: Joakim Bech <joakim.bech@linaro.org> Tested-by: Joakim Bech <joakim.bech@linaro.org> (RPi3, RPi3+NFS) Acked-by: Jerome Forissier <jerome.forissier@linaro.org> --- rpi3.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rpi3.mk b/rpi3.mk index 71abfac..e172571 100644 --- a/rpi3.mk +++ b/rpi3.mk @@ -69,7 +69,7 @@ ARM_TF_FLAGS ?= \ RPI3_PRELOADED_DTB_BASE=0x00010000 \ SPD=opteed -arm-tf: optee-os $(RPI3_UBOOT_ENV) +arm-tf: optee-os u-boot-env $(ARM_TF_EXPORTS) $(MAKE) -C $(ARM_TF_PATH) $(ARM_TF_FLAGS) all fip arm-tf-clean: @@ -78,11 +78,11 @@ arm-tf-clean: ################################################################################ # Das U-Boot ################################################################################ - U-BOOT_EXPORTS ?= CROSS_COMPILE=$(AARCH64_CROSS_COMPILE) ARCH=arm64 U-BOOT_DEFCONFIG_COMMON_FILES := \ $(U-BOOT_PATH)/configs/rpi_3_defconfig \ $(CURDIR)/kconfigs/u-boot_rpi3.conf + .PHONY: u-boot u-boot: u-boot-defconfig $(U-BOOT_EXPORTS) $(MAKE) -C $(U-BOOT_PATH) all @@ -91,9 +91,10 @@ u-boot: u-boot-defconfig u-boot-clean: u-boot-defconfig-clean $(U-BOOT_EXPORTS) $(MAKE) -C $(U-BOOT_PATH) clean -$(RPI3_UBOOT_ENV): $(RPI3_UBOOT_ENV_TXT) u-boot +u-boot-env: $(RPI3_UBOOT_ENV_TXT) u-boot mkdir -p $(ROOT)/out - $(U-BOOT_PATH)/tools/mkenvimage -s 0x4000 -o $(ROOT)/out/uboot.env $(RPI3_UBOOT_ENV_TXT) + $(U-BOOT_PATH)/tools/mkenvimage -s 0x4000 -o $(RPI3_UBOOT_ENV) \ + $(RPI3_UBOOT_ENV_TXT) u-boot-env-clean: rm -f $(RPI3_UBOOT_ENV) @@ -106,6 +107,7 @@ u-boot-defconfig: $(U-BOOT_DEFCONFIG_COMMON_FILES) .PHONY: u-boot-defconfig-clean u-boot-defconfig-clean: rm -f $(U-BOOT_PATH)/.config + ################################################################################ # Busybox ################################################################################ -- GitLab