diff options
author | Victor Chong <victor.chong@linaro.org> | 2018-01-03 01:53:08 +0900 |
---|---|---|
committer | Victor Chong <victor.chong@linaro.org> | 2018-01-22 23:33:07 +0900 |
commit | 59149bbe89c45b2fab2f4111a34c26506ef1e158 (patch) | |
tree | 215d8fcbe96d1d59f8fbb98e18badfe95b7932e3 /plat/hisilicon/poplar/include | |
parent | 0caaa03bf182429e40d8785e4a9017c443841a52 (diff) | |
download | trusted-firmware-a-59149bbe89c45b2fab2f4111a34c26506ef1e158.tar.gz |
poplar: Enable emmc support
Let bl1 and bl2 have the ability to load images from emmc instead of
dram (mmap).
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'plat/hisilicon/poplar/include')
-rw-r--r-- | plat/hisilicon/poplar/include/hi3798cv200.h | 6 | ||||
-rw-r--r-- | plat/hisilicon/poplar/include/platform_def.h | 9 | ||||
-rw-r--r-- | plat/hisilicon/poplar/include/poplar_layout.h | 21 |
3 files changed, 29 insertions, 7 deletions
diff --git a/plat/hisilicon/poplar/include/hi3798cv200.h b/plat/hisilicon/poplar/include/hi3798cv200.h index 540d0aa18b..125b04841b 100644 --- a/plat/hisilicon/poplar/include/hi3798cv200.h +++ b/plat/hisilicon/poplar/include/hi3798cv200.h @@ -7,6 +7,8 @@ #ifndef __HI3798cv200_H__ #define __HI3798cv200_H__ +#include <utils_def.h> + /* PL011 */ #define PL011_UART0_BASE (0xF8B00000) #define PL011_BAUDRATE (115200) @@ -63,11 +65,11 @@ #define EMMC_CLK_50M (1 << 8) #define EMMC_CLK_25M (2 << 8) -#define EMMC_DESC_SIZE (0xF0000) +#define EMMC_DESC_SIZE U(0x00100000) /* 1MB */ #define EMMC_INIT_PARAMS(base) \ { .bus_width = EMMC_BUS_WIDTH_8, \ .clk_rate = 25 * 1000 * 1000, \ - .desc_base = (base) - EMMC_DESC_SIZE, \ + .desc_base = (base), \ .desc_size = EMMC_DESC_SIZE, \ .flags = EMMC_FLAG_CMD23, \ .reg_base = REG_BASE_MCI, \ diff --git a/plat/hisilicon/poplar/include/platform_def.h b/plat/hisilicon/poplar/include/platform_def.h index 3d1ad9b999..c0f83711c3 100644 --- a/plat/hisilicon/poplar/include/platform_def.h +++ b/plat/hisilicon/poplar/include/platform_def.h @@ -12,6 +12,7 @@ #include <gic_common.h> #include <interrupt_props.h> #include <tbbr/tbbr_img_def.h> +#include <utils_def.h> #include "hi3798cv200.h" #include "poplar_layout.h" /* BL memory region sizes, etc */ @@ -53,13 +54,12 @@ #define POPLAR_DRAM_ID 1 /* - * DDR for OP-TEE (28MB from 0x02200000 -0x04000000) is divided in several + * DDR for OP-TEE (26MB from 0x02400000 -0x04000000) is divided in several * regions: * - Secure DDR (default is the top 16MB) used by OP-TEE * - Non-secure DDR (4MB) reserved for OP-TEE's future use * - Secure DDR (4MB aligned on 4MB) for OP-TEE's "Secure Data Path" feature * - Non-secure DDR used by OP-TEE (shared memory and padding) (4MB) - * - Non-secure DDR (2MB) reserved for OP-TEE's future use */ #define DDR_SEC_SIZE 0x01000000 #define DDR_SEC_BASE 0x03000000 @@ -96,6 +96,11 @@ #endif /* SPD_none */ #endif +#define POPLAR_EMMC_DATA_BASE U(0x02200000) +#define POPLAR_EMMC_DATA_SIZE EMMC_DESC_SIZE +#define POPLAR_EMMC_DESC_BASE (POPLAR_EMMC_DATA_BASE + POPLAR_EMMC_DATA_SIZE) +#define POPLAR_EMMC_DESC_SIZE EMMC_DESC_SIZE + #define PLAT_POPLAR_NS_IMAGE_OFFSET 0x37000000 /* Page table and MMU setup constants */ diff --git a/plat/hisilicon/poplar/include/poplar_layout.h b/plat/hisilicon/poplar/include/poplar_layout.h index e0b5618ef4..3e11370780 100644 --- a/plat/hisilicon/poplar/include/poplar_layout.h +++ b/plat/hisilicon/poplar/include/poplar_layout.h @@ -12,8 +12,8 @@ */ /* - * When Poplar is powered on, boot ROM loads the initial content of - * boot media into low memory, verifies it, and begins executing it + * When Poplar is powered on, boot ROM verifies the initial content of + * boot media, loads it into low memory, and begins executing it * in 32-bit mode. The image loaded is "l-loader.bin", which contains * a small amount code along with an embedded ARM Trusted Firmware * BL1 image. The main purpose of "l-loader" is to prepare the @@ -78,12 +78,27 @@ #define BL1_OFFSET 0x0000D000 /* page multiple */ #define FIP_BASE 0x02040000 +/* + * FIP_BASE_EMMC = 0x40000 - 0x1000 + * = fip.bin offset - l-loader text offset + * in l-loader.bin + */ +#define FIP_BASE_EMMC 0x0003f000 + #define BL1_RO_SIZE 0x00008000 /* page multiple */ #define BL1_RW_SIZE 0x00008000 /* page multiple */ #define BL1_SIZE (BL1_RO_SIZE + BL1_RW_SIZE) #define BL2_SIZE 0x0000c000 /* page multiple */ #define BL31_SIZE 0x00014000 -#define FIP_SIZE 0x000c0000 /* absolute max */ +/* + * emmc partition1 4096KB + * - l-loader.bin 1984KB + * |- l-loader + bl1.bin 256KB + * |- fip.bin 1728KB (0x001b0000) + * - u-boot persistent data 64KB + * - uefi persistent data 2048KB + */ +#define FIP_SIZE 0x001b0000 /* absolute max */ /* BL1_OFFSET */ /* (Defined above) */ #define BL1_BASE (LLOADER_TEXT_BASE + BL1_OFFSET) |