From 39784f2af5a51e9fb387c331b6faa2cb6ee41ad1 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 5 Jun 2020 10:29:17 +0900 Subject: [PATCH] uniphier: increase BL33 max size and GZIP temporary buffer size The current BL33 size is large enough for U-Boot, but we need to increase the limit to use other boot loaders such as edk2. Increase the buffer size used for GZIP decompression too. BL33 max size (UNIPHIER_BL33_MAX_SIZE): 1MB -> 8MB GZIP buffer (UNIPHIER_IMAGE_BUF_SIZE): 1MB -> 8MB Increasing the block buffer size (UNIPHIER_BLOCK_BUF_SIZE) is not required, but I increased it too to make it work more efficiently. Change-Id: I4fa6d795bed9ab9ada7f8f616c7d47076139e3a8 Signed-off-by: Masahiro Yamada --- plat/socionext/uniphier/uniphier_bl2_setup.c | 4 ++-- plat/socionext/uniphier/uniphier_image_desc.c | 4 ++-- plat/socionext/uniphier/uniphier_io_storage.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plat/socionext/uniphier/uniphier_bl2_setup.c b/plat/socionext/uniphier/uniphier_bl2_setup.c index 679f14d0a..4524610c0 100644 --- a/plat/socionext/uniphier/uniphier_bl2_setup.c +++ b/plat/socionext/uniphier/uniphier_bl2_setup.c @@ -21,8 +21,8 @@ #include "uniphier.h" -#define UNIPHIER_IMAGE_BUF_OFFSET 0x04300000UL -#define UNIPHIER_IMAGE_BUF_SIZE 0x00100000UL +#define UNIPHIER_IMAGE_BUF_OFFSET 0x03800000UL +#define UNIPHIER_IMAGE_BUF_SIZE 0x00800000UL static uintptr_t uniphier_mem_base = UNIPHIER_MEM_BASE; static unsigned int uniphier_soc = UNIPHIER_SOC_UNKNOWN; diff --git a/plat/socionext/uniphier/uniphier_image_desc.c b/plat/socionext/uniphier/uniphier_image_desc.c index 8c232ba31..dd62d1ebb 100644 --- a/plat/socionext/uniphier/uniphier_image_desc.c +++ b/plat/socionext/uniphier/uniphier_image_desc.c @@ -14,9 +14,9 @@ #include "uniphier.h" #define UNIPHIER_BL33_OFFSET 0x04000000UL -#define UNIPHIER_BL33_MAX_SIZE 0x00100000UL +#define UNIPHIER_BL33_MAX_SIZE 0x00800000UL -#define UNIPHIER_SCP_OFFSET 0x04100000UL +#define UNIPHIER_SCP_OFFSET 0x04800000UL #define UNIPHIER_SCP_MAX_SIZE 0x00020000UL static struct bl_mem_params_node uniphier_image_descs[] = { diff --git a/plat/socionext/uniphier/uniphier_io_storage.c b/plat/socionext/uniphier/uniphier_io_storage.c index 77d1eaf00..92e15b09a 100644 --- a/plat/socionext/uniphier/uniphier_io_storage.c +++ b/plat/socionext/uniphier/uniphier_io_storage.c @@ -25,8 +25,8 @@ #define UNIPHIER_OCM_REGION_SIZE 0x00040000ULL -#define UNIPHIER_BLOCK_BUF_OFFSET 0x04200000UL -#define UNIPHIER_BLOCK_BUF_SIZE 0x00100000UL +#define UNIPHIER_BLOCK_BUF_OFFSET 0x03000000UL +#define UNIPHIER_BLOCK_BUF_SIZE 0x00800000UL static const io_dev_connector_t *uniphier_fip_dev_con; static uintptr_t uniphier_fip_dev_handle;