diff options
| author | Xiaobo Gu <xiaobo.gu@amlogic.com> | 2016-06-01 17:41:00 +0800 |
|---|---|---|
| committer | Xiaobo Gu <xiaobo.gu@amlogic.com> | 2016-07-22 01:26:23 -0700 |
| commit | c65be71cae6757793c4fdf9cf8cfbb7fc1e59bb9 (patch) | |
| tree | 621656f67dd5f0c3e8926e708c7231f0f3a28f77 /Makefile | |
| parent | d58a35b78328b318480a0c77c129abb2d035d567 (diff) | |
| download | u-boot-odroid-c1-c65be71cae6757793c4fdf9cf8cfbb7fc1e59bb9.tar.gz | |
PD#126474: TXL bringup merge - base
Merged from next-2015-dev-txl-bringup branch.
This is a combination of 6 commits.
1). 84b78155feac95e2d7e0fafc0accdfb1d828e4ef
TXL bringup init
2). 7b89b0c16f44a008c745f0049932a539a55bf8e0
Update txl firmware bin file
3). 1e82ce8e9448b98c9c4ae3e928698ad5c7c0357d
TXL: update firmware
4). 04c5e3436469e1eb0b55fda54b41fac7c467243c
PD#126474: txl: change to 2g for pxp
5). 400811fdb0a1a8dbd8a0bca8000dc6b773b89cc7
cpu id: add TXL major id
6). 60f3b14af67e693185ee98fd40f6e692fbacc563
txl socket board ok
Change-Id: Ia13295e59a2f9d4550972c7a3e62a964b88f6edd
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -934,7 +934,8 @@ endif bl2 $(Q)cat $(FIP_FOLDER_SOC)/bl2_new.bin $(FIP_FOLDER_SOC)/fip.bin > $(FIP_FOLDER_SOC)/boot_new.bin -ifeq ($(SOC),gxl) +#ifeq ($(SOC),gxl) +ifeq ($(strip $(SOC)), $(filter $(SOC), gxl txl)) $(Q)$(FIP_FOLDER_SOC)/aml_encrypt_$(SOC) --bl3enc --input $(FIP_FOLDER_SOC)/bl30_new.bin $(Q)$(FIP_FOLDER_SOC)/aml_encrypt_$(SOC) --bl3enc --input $(FIP_FOLDER_SOC)/bl31.$(BL3X_SUFFIX) ifeq ($(FIP_BL32), bl32.$(BL3X_SUFFIX)) @@ -951,7 +952,8 @@ else endif ifeq ($(CONFIG_AML_CRYPTO_UBOOT), y) -ifeq ($(SOC),gxl) +#ifeq ($(SOC),gxl) +ifeq ($(strip $(SOC)), $(filter $(SOC), gxl txl)) $(Q)$(FIP_FOLDER_SOC)/aml_encrypt_$(SOC) --efsgen --amluserkey $(srctree)/$(BOARDDIR)/aml-user-key.sig \ --output $(FIP_FOLDER_SOC)/u-boot.bin.encrypt.efuse endif |