summaryrefslogtreecommitdiff
path: root/plat/hisilicon/hikey/platform.mk
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@linaro.org>2018-01-28 23:33:02 +0800
committerHaojian Zhuang <haojian.zhuang@linaro.org>2018-03-05 09:50:47 +0800
commit103c213c0d82f08cf72c3e4de435bab9683d4ed5 (patch)
tree99e93c6cca925ef9a2c195acb65da865f23e0025 /plat/hisilicon/hikey/platform.mk
parentcde9f4f41fd0fbdc740dbec91ed6848f0f6aa1b7 (diff)
hikey: drop LOAD_IMAGE v1
Since LOAD_IMAGE_V2 is always enabled in HiKey platform. Drop LOAD_IMAGE v1 to simplify code. Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Diffstat (limited to 'plat/hisilicon/hikey/platform.mk')
-rw-r--r--plat/hisilicon/hikey/platform.mk13
1 files changed, 5 insertions, 8 deletions
diff --git a/plat/hisilicon/hikey/platform.mk b/plat/hisilicon/hikey/platform.mk
index c8a29924..faaf88f3 100644
--- a/plat/hisilicon/hikey/platform.mk
+++ b/plat/hisilicon/hikey/platform.mk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -69,7 +69,8 @@ BL1_SOURCES += bl1/tbbr/tbbr_img_desc.c \
plat/hisilicon/hikey/hikey_bl1_setup.c \
plat/hisilicon/hikey/hikey_io_storage.c
-BL2_SOURCES += drivers/arm/sp804/sp804_delay_timer.c \
+BL2_SOURCES += common/desc_image_load.c \
+ drivers/arm/sp804/sp804_delay_timer.c \
drivers/delay_timer/delay_timer.c \
drivers/io/io_block.c \
drivers/io/io_fip.c \
@@ -77,22 +78,18 @@ BL2_SOURCES += drivers/arm/sp804/sp804_delay_timer.c \
drivers/emmc/emmc.c \
drivers/synopsys/emmc/dw_mmc.c \
plat/hisilicon/hikey/aarch64/hikey_helpers.S \
+ plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c \
plat/hisilicon/hikey/hikey_bl2_setup.c \
plat/hisilicon/hikey/hikey_security.c \
plat/hisilicon/hikey/hikey_ddr.c \
+ plat/hisilicon/hikey/hikey_image_load.c \
plat/hisilicon/hikey/hikey_io_storage.c \
plat/hisilicon/hikey/hisi_dvfs.c \
plat/hisilicon/hikey/hisi_mcu.c
-ifeq (${LOAD_IMAGE_V2},1)
-BL2_SOURCES += plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c \
- plat/hisilicon/hikey/hikey_image_load.c \
- common/desc_image_load.c
-
ifeq (${SPD},opteed)
BL2_SOURCES += lib/optee/optee_utils.c
endif
-endif
HIKEY_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \
drivers/arm/gic/v2/gicv2_main.c \