From 8ad132b3f176d0552b28f1fe77f8d1321449b4ef Mon Sep 17 00:00:00 2001 From: Victor Chong Date: Mon, 29 Jan 2018 18:11:02 +0900 Subject: [PATCH] poplar: Add build option for dram size Signed-off-by: Victor Chong Tested-by: Shawn Guo --- plat/hisilicon/poplar/include/platform_def.h | 11 +++++++++++ plat/hisilicon/poplar/platform.mk | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/plat/hisilicon/poplar/include/platform_def.h b/plat/hisilicon/poplar/include/platform_def.h index c0f83711..941a84b5 100644 --- a/plat/hisilicon/poplar/include/platform_def.h +++ b/plat/hisilicon/poplar/include/platform_def.h @@ -39,9 +39,20 @@ #define MAX_IO_HANDLES (4) #define MAX_IO_BLOCK_DEVICES (2) +/* Memory size options */ +#define POPLAR_DRAM_SIZE_1G 0 +#define POPLAR_DRAM_SIZE_2G 1 + /* Memory map related constants */ #define DDR_BASE (0x00000000) + +#if (POPLAR_DRAM_SIZE_ID == POPLAR_DRAM_SIZE_2G) +#define DDR_SIZE (0x80000000) +#elif (POPLAR_DRAM_SIZE_ID == POPLAR_DRAM_SIZE_1G) #define DDR_SIZE (0x40000000) +#else +#error "Currently unsupported POPLAR_DRAM_SIZE_ID value" +#endif #define DEVICE_BASE (0xF0000000) #define DEVICE_SIZE (0x0F000000) diff --git a/plat/hisilicon/poplar/platform.mk b/plat/hisilicon/poplar/platform.mk index 0fb8f6b2..fca06220 100644 --- a/plat/hisilicon/poplar/platform.mk +++ b/plat/hisilicon/poplar/platform.mk @@ -15,6 +15,16 @@ else endif $(eval $(call add_define,POPLAR_TSP_RAM_LOCATION_ID)) +POPLAR_DRAM_SIZE ?= two_gig +ifeq (${POPLAR_DRAM_SIZE}, two_gig) + POPLAR_DRAM_SIZE_ID = POPLAR_DRAM_SIZE_2G +else ifeq (${POPLAR_DRAM_SIZE}, one_gig) + POPLAR_DRAM_SIZE_ID = POPLAR_DRAM_SIZE_1G +else + $(error "Currently unsupported POPLAR_DRAM_SIZE value") +endif +$(eval $(call add_define,POPLAR_DRAM_SIZE_ID)) + POPLAR_RECOVERY := 0 $(eval $(call add_define,POPLAR_RECOVERY)) -- 2.30.2