diff options
| author | Peifu Jiang <peifu.jiang@amlogic.com> | 2015-12-29 16:10:02 +0800 |
|---|---|---|
| committer | Xiaobo Gu <xiaobo.gu@amlogic.com> | 2015-12-30 15:34:10 +0800 |
| commit | 8f9bbfdf9a61a88ca2f8b85a49287283b415812f (patch) | |
| tree | e0465e086f14e72dc1f03cadaa2b9b22106f897d /Makefile | |
| parent | a73c7e60dc06e20eaf476156913a561aa7805c78 (diff) | |
| download | u-boot-odroid-c1-8f9bbfdf9a61a88ca2f8b85a49287283b415812f.tar.gz | |
PD#116925: gxbb: support bl32
BL2 commit:
commit ccfa733cac49721ecf3fdaacae94c88b5bf72651
Author: Yan Wang <yan.wang@amlogic.com>
Date: Thu Dec 24 10:44:32 2015 +0800
PD#116925: gxbb support secure memory config
Change-Id: I2c704c7bd7c5bd5b8204558ec79df0c9441799e7
BL31 commit:
commit f65baf38f35d9e2ac8dec51617340e6ebad20731
Author: Peifu Jiang <peifu.jiang@amlogic.com>
Date: Fri Dec 18 13:03:05 2015 +0800
PD#116925: New fip structure support
Change-Id: Ica8112afceed30dc8e21532d8e4d3817a4c465e6
Change-Id: I62a534da870c74240c9e0c1309336811f08f8918
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -860,9 +860,17 @@ FIP_ARGS += --bl30 $(FIP_FOLDER_SOC)/bl30.bin ifeq ($(CONFIG_NEED_BL301), y) FIP_ARGS += --bl301 $(FIP_FOLDER_SOC)/bl301.bin endif -FIP_ARGS += --bl31 $(FIP_FOLDER_SOC)/bl31.bin +ifeq ($(CONFIG_FIP_IMG_SUPPORT), y) +BL3X_SUFFIX := img +else +BL3X_SUFFIX := bin +endif +FIP_ARGS += --bl31 $(FIP_FOLDER_SOC)/bl31.$(BL3X_SUFFIX) ifeq ($(CONFIG_NEED_BL32), y) -FIP_ARGS += --bl32 $(FIP_FOLDER_SOC)/bl32.bin +FIP_BL32 := $(notdir $(shell find $(FIP_FOLDER_SOC) -name "bl32.$(BL3X_SUFFIX)")) +ifeq ($(FIP_BL32), bl32.$(BL3X_SUFFIX)) +FIP_ARGS += --bl32 $(FIP_FOLDER_SOC)/bl32.$(BL3X_SUFFIX) +endif endif FIP_ARGS += --bl33 $(FIP_FOLDER_SOC)/bl33.bin |