diff options
| author | danh-arm <dan.handley@arm.com> | 2018-07-24 11:06:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 11:06:24 +0100 |
| commit | df0b5a4b71a2259ae90b212fa7527203f81d294d (patch) | |
| tree | 4dcc5607edf9d796f6b386f5d93091b979d73147 | |
| parent | ba0248b52d8027e0f38cf44353f8860bbf171b2d (diff) | |
| parent | 99eb5ae86d461029bfc33dad768e11d24693bd28 (diff) | |
Merge pull request #1487 from hzhuang1/tbb_bl1
hikey: include TBB in BL1
| -rw-r--r-- | plat/hisilicon/hikey/include/hikey_layout.h | 10 | ||||
| -rw-r--r-- | plat/hisilicon/hikey/platform.mk | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/plat/hisilicon/hikey/include/hikey_layout.h b/plat/hisilicon/hikey/include/hikey_layout.h index 5c593fc8..acc7ad6f 100644 --- a/plat/hisilicon/hikey/include/hikey_layout.h +++ b/plat/hisilicon/hikey/include/hikey_layout.h @@ -31,20 +31,20 @@ * + loader + * ++++++++++ 0xF980_1000 * + BL1_RO + - * ++++++++++ 0xF981_0000 + * ++++++++++ 0xF981_8000 * + BL1_RW + * ++++++++++ 0xF989_8000 */ #define BL1_RO_BASE (XG2RAM0_BASE + BL1_XG2RAM0_OFFSET) -#define BL1_RO_LIMIT (XG2RAM0_BASE + 0x10000) -#define BL1_RW_BASE (BL1_RO_LIMIT) /* 0xf981_0000 */ -#define BL1_RW_SIZE (0x00088000) +#define BL1_RO_LIMIT (XG2RAM0_BASE + 0x18000) +#define BL1_RW_BASE (BL1_RO_LIMIT) /* 0xf981_8000 */ +#define BL1_RW_SIZE (0x00080000) #define BL1_RW_LIMIT (0xF9898000) /* * Non-Secure BL1U specific defines. */ -#define NS_BL1U_BASE (0xf9818000) +#define NS_BL1U_BASE (0xf9828000) #define NS_BL1U_SIZE (0x00010000) #define NS_BL1U_LIMIT (NS_BL1U_BASE + NS_BL1U_SIZE) diff --git a/plat/hisilicon/hikey/platform.mk b/plat/hisilicon/hikey/platform.mk index acd1e62b..6a2474e8 100644 --- a/plat/hisilicon/hikey/platform.mk +++ b/plat/hisilicon/hikey/platform.mk @@ -134,6 +134,11 @@ AUTH_SOURCES := drivers/auth/auth_mod.c \ drivers/auth/img_parser_mod.c \ drivers/auth/tbbr/tbbr_cot.c +BL1_SOURCES += ${AUTH_SOURCES} \ + plat/common/tbbr/plat_tbbr.c \ + plat/hisilicon/hikey/hikey_tbbr.c \ + plat/hisilicon/hikey/hikey_rotpk.S + BL2_SOURCES += ${AUTH_SOURCES} \ plat/common/tbbr/plat_tbbr.c \ plat/hisilicon/hikey/hikey_tbbr.c \ @@ -143,6 +148,7 @@ ROT_KEY = $(BUILD_PLAT)/rot_key.pem ROTPK_HASH = $(BUILD_PLAT)/rotpk_sha256.bin $(eval $(call add_define_val,ROTPK_HASH,'"$(ROTPK_HASH)"')) +$(BUILD_PLAT)/bl1/hikey_rotpk.o: $(ROTPK_HASH) $(BUILD_PLAT)/bl2/hikey_rotpk.o: $(ROTPK_HASH) certificates: $(ROT_KEY) @@ -154,8 +160,6 @@ $(ROTPK_HASH): $(ROT_KEY) @echo " OPENSSL $@" $(Q)openssl rsa -in $< -pubout -outform DER 2>/dev/null |\ openssl dgst -sha256 -binary > $@ 2>/dev/null - -override BL1_SOURCES = endif # Enable workarounds for selected Cortex-A53 errata. |