[U-Boot] [PATCH 1/2] nios2: trim CONFIG_SYS_MALLOC_LEN
Trim CONFIG_SYS_MALLOC_LEN size, because CONFIG_ENV_SIZE is included to total memory allocation in common.h,
Signed-off-by: Thomas Chou thomas@wytron.com.tw --- include/configs/nios2-generic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 6e426d6..9a01b22 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -82,7 +82,7 @@ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_SDRAM_BASE + \ CONFIG_SYS_SDRAM_SIZE - \ CONFIG_SYS_MONITOR_LEN) -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x20000) +#define CONFIG_SYS_MALLOC_LEN 0x20000
/* * MISC
Trim CONFIG_SYS_MEMTEST_END location.
CONFIG_SYS_MONITOR_LEN Reserving 256k for U-Boot at: d7fc0000 CONFIG_ENV_SIZE CONFIG_SYS_MALLOC_LEN Reserving 256k for malloc() at: d7f80000 0x10000 for the rest Reserving 68 Bytes for Board Info at: d7f7ffbc Reserving 208 Bytes for Global Data at: d7f7feec Reserving 12000 Bytes for FDT at: d7f7d00c Stack
Signed-off-by: Thomas Chou thomas@wytron.com.tw --- include/configs/nios2-generic.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 9a01b22..4569de8 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -96,7 +96,10 @@ 16) /* Print buf size */ #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_INIT_SP - 0x20000) +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MONITOR_BASE - \ + CONFIG_ENV_SIZE - \ + CONFIG_SYS_MALLOC_LEN - \ + 0x10000) #define CONFIG_CMDLINE_EDITING #define CONFIG_CMD_GPIO
On Wed, 2015-11-04 at 13:30 +0800, thomas@wytron.com.tw wrote:
Trim CONFIG_SYS_MEMTEST_END location.
CONFIG_SYS_MONITOR_LEN Reserving 256k for U-Boot at: d7fc0000 CONFIG_ENV_SIZE CONFIG_SYS_MALLOC_LEN Reserving 256k for malloc() at: d7f80000 0x10000 for the rest Reserving 68 Bytes for Board Info at: d7f7ffbc Reserving 208 Bytes for Global Data at: d7f7feec Reserving 12000 Bytes for FDT at: d7f7d00c Stack
Signed-off-by: Thomas Chou thomas@wytron.com.tw
include/configs/nios2-generic.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 9a01b22..4569de8 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -96,7 +96,10 @@ 16) /* Print buf size */ #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_INIT_SP - 0x20000) +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MONITOR_BASE - \
CONFIG_ENV_SIZE - \CONFIG_SYS_MALLOC_LEN - \
Since CONFIG_ENV_IS_IN_FLASH, I believe we can take out the CONFIG_ENV_SIZE here.
Thanks Chin Liang
0x10000)#define CONFIG_CMDLINE_EDITING #define CONFIG_CMD_GPIO
Hi Chin Liang,
On 2015年11月04日 22:27, Chin Liang See wrote:
+#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MONITOR_BASE - \
CONFIG_ENV_SIZE - \CONFIG_SYS_MALLOC_LEN - \Since CONFIG_ENV_IS_IN_FLASH, I believe we can take out the CONFIG_ENV_SIZE here.
This comes from a very old macro in common.h,
#if defined(CONFIG_ENV_IS_EMBEDDED) #define TOTAL_MALLOC_LEN CONFIG_SYS_MALLOC_LEN #elif ( ((CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) < CONFIG_SYS_MONITOR_BASE) || \ (CONFIG_ENV_ADDR >= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)) ) || \ defined(CONFIG_ENV_IS_IN_NVRAM) #define TOTAL_MALLOC_LEN (CONFIG_SYS_MALLOC_LEN + CONFIG_ENV_SIZE) #else #define TOTAL_MALLOC_LEN CONFIG_SYS_MALLOC_LEN #endif
The TOTAL_MALLOC_LEN is (CONFIG_SYS_MALLOC_LEN + CONFIG_ENV_SIZE) for nios2. I think the macro might need fix though.
Best regards, Thomas
Hi Thomas,
On Thu, 2015-11-05 at 13:47 +0800, thomas@wytron.com.tw wrote:
Hi Chin Liang,
On 2015年11月04日 22:27, Chin Liang See wrote:
+#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MONITOR_BASE - \
CONFIG_ENV_SIZE - \CONFIG_SYS_MALLOC_LEN - \Since CONFIG_ENV_IS_IN_FLASH, I believe we can take out the CONFIG_ENV_SIZE here.
This comes from a very old macro in common.h,
#if defined(CONFIG_ENV_IS_EMBEDDED) #define TOTAL_MALLOC_LEN CONFIG_SYS_MALLOC_LEN #elif ( ((CONFIG_ENV_ADDR+CONFIG_ENV_SIZE) < CONFIG_SYS_MONITOR_BASE) || \ (CONFIG_ENV_ADDR >= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)) ) || \ defined(CONFIG_ENV_IS_IN_NVRAM) #define TOTAL_MALLOC_LEN (CONFIG_SYS_MALLOC_LEN + CONFIG_ENV_SIZE) #else #define TOTAL_MALLOC_LEN CONFIG_SYS_MALLOC_LEN #endif
The TOTAL_MALLOC_LEN is (CONFIG_SYS_MALLOC_LEN + CONFIG_ENV_SIZE) for nios2. I think the macro might need fix though.
Yah. In that case, it should be ok CONFIG_ENV_SIZE is much small. The memtest should sufficiently exercise the each memory lines. Thanks again for the patch.
Reviewed-by: Chin Liang See clsee@altera.com
Thanks Chin Liang
Best regards, Thomas
On 2015年11月04日 13:30, Thomas Chou wrote:
Trim CONFIG_SYS_MEMTEST_END location.
CONFIG_SYS_MONITOR_LEN Reserving 256k for U-Boot at: d7fc0000 CONFIG_ENV_SIZE CONFIG_SYS_MALLOC_LEN Reserving 256k for malloc() at: d7f80000 0x10000 for the rest Reserving 68 Bytes for Board Info at: d7f7ffbc Reserving 208 Bytes for Global Data at: d7f7feec Reserving 12000 Bytes for FDT at: d7f7d00c Stack
Signed-off-by: Thomas Chou thomas@wytron.com.tw
include/configs/nios2-generic.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
Applied to u-boot-nios.
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 9a01b22..4569de8 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -96,7 +96,10 @@ 16) /* Print buf size */ #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_INIT_SP - 0x20000) +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MONITOR_BASE - \
CONFIG_ENV_SIZE - \CONFIG_SYS_MALLOC_LEN - \0x10000)
On Wed, 2015-11-04 at 13:30 +0800, thomas@wytron.com.tw wrote:
Trim CONFIG_SYS_MALLOC_LEN size, because CONFIG_ENV_SIZE is included to total memory allocation in common.h,
Signed-off-by: Thomas Chou thomas@wytron.com.tw
Reviewed-by: Chin Liang See clsee@altera.com
Thanks Chin Liang
On 2015年11月04日 13:30, Thomas Chou wrote:
Trim CONFIG_SYS_MALLOC_LEN size, because CONFIG_ENV_SIZE is included to total memory allocation in common.h,
Signed-off-by: Thomas Chou thomas@wytron.com.tw
include/configs/nios2-generic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-nios.
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 6e426d6..9a01b22 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -82,7 +82,7 @@ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_SDRAM_BASE + \ CONFIG_SYS_SDRAM_SIZE - \ CONFIG_SYS_MONITOR_LEN) -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x20000) +#define CONFIG_SYS_MALLOC_LEN 0x20000
/*
- MISC
participants (2)
-
Chin Liang See -
Thomas Chou