From 310ca4ddbc703a764e535dcb453e5e56c4d17018 Mon Sep 17 00:00:00 2001 From: Victor Chong <victor.chong@linaro.org> Date: Sun, 22 Jan 2017 07:00:19 +0000 Subject: [PATCH] hikey*.mk: Support ptable-linux-8g.img build Fixes: https://github.com/OP-TEE/build/issues/64 Fixes: https://github.com/OP-TEE/optee_os/issues/1296 Signed-off-by: Victor Chong <victor.chong@linaro.org> Tested-by: Victor Chong <victor.chong@linaro.org> (build only) Reviewed-by: Joakim Bech <joakim.bech@linaro.org> [Update commit message: turn "Fixes X" into "Fixes: X" tags] Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> --- hikey.mk | 7 +++++-- hikey_debian.mk | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hikey.mk b/hikey.mk index 7bae4ba..248915e 100644 --- a/hikey.mk +++ b/hikey.mk @@ -12,6 +12,9 @@ COMPILE_S_KERNEL ?= 64 CFG_NW_CONSOLE_UART ?= 3 CFG_SW_CONSOLE_UART ?= 3 +# eMMC flash size: 8 or 4 GB [default 8] +CFG_FLASH_SIZE ?= 8 + ################################################################################ # Includes ################################################################################ @@ -320,7 +323,7 @@ boot-img-clean: # l-loader ################################################################################ lloader: arm-tf - $(MAKE) -C $(LLOADER_PATH) BL1=$(ARM_TF_PATH)/build/hikey/$(ARM_TF_BUILD)/bl1.bin CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" PTABLE_LST=linux-4g + $(MAKE) -C $(LLOADER_PATH) BL1=$(ARM_TF_PATH)/build/hikey/$(ARM_TF_BUILD)/bl1.bin CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" PTABLE_LST=linux-$(CFG_FLASH_SIZE)g .PHONY: lloader-clean lloader-clean: @@ -372,7 +375,7 @@ ifneq ($(FROM_RECOVERY),1) @echo " \"Android Fastboot mode - version x.x Press any key to quit.\"" @read -r -p " Then press any key to continue flashing" dummy endif - fastboot flash ptable $(LLOADER_PATH)/ptable-linux-4g.img + fastboot flash ptable $(LLOADER_PATH)/ptable-linux-$(CFG_FLASH_SIZE)g.img fastboot flash fastboot $(ARM_TF_PATH)/build/hikey/$(ARM_TF_BUILD)/fip.bin fastboot flash nvme $(NVME_IMG) fastboot flash boot $(BOOT_IMG) diff --git a/hikey_debian.mk b/hikey_debian.mk index 8ae7eb5..5124f17 100644 --- a/hikey_debian.mk +++ b/hikey_debian.mk @@ -14,6 +14,9 @@ COMPILE_S_KERNEL ?= 64 CFG_NW_CONSOLE_UART ?= 3 CFG_SW_CONSOLE_UART ?= 3 +# eMMC flash size: 8 or 4 GB [default 8] +CFG_FLASH_SIZE ?= 8 + # TODO: Figure out how to handle this in a better way, but we need a version # number with major and minor for the debian packages. # <major version>.<minor version>-<package revision> @@ -250,7 +253,7 @@ system-img-cleaner: # l-loader ################################################################################ lloader: arm-tf - $(MAKE) -C $(LLOADER_PATH) BL1=$(ARM_TF_PATH)/build/hikey/$(ARM_TF_BUILD)/bl1.bin CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" PTABLE_LST=linux-4g + $(MAKE) -C $(LLOADER_PATH) BL1=$(ARM_TF_PATH)/build/hikey/$(ARM_TF_BUILD)/bl1.bin CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" PTABLE_LST=linux-$(CFG_FLASH_SIZE)g .PHONY: lloader-clean lloader-clean: @@ -355,7 +358,7 @@ ifneq ($(FROM_RECOVERY),1) @echo " \"Android Fastboot mode - version x.x Press any key to quit.\"" @read -r -p " Then press any key to continue flashing" dummy endif - fastboot flash ptable $(LLOADER_PATH)/ptable-linux-4g.img + fastboot flash ptable $(LLOADER_PATH)/ptable-linux-$(CFG_FLASH_SIZE)g.img fastboot flash fastboot $(ARM_TF_PATH)/build/hikey/$(ARM_TF_BUILD)/fip.bin fastboot flash nvme $(NVME_IMG) fastboot flash boot $(BOOT_IMG) -- GitLab