Stephen,
-----Original Message----- From: Stephen Warren [mailto:swarren@wwwdotorg.org] Sent: Friday, September 04, 2015 9:04 PM To: Tom Rini Cc: u-boot@lists.denx.de; Simon Glass; Tom Warren; Stephen Warren; Lukasz Majewski; Przemyslaw Marczak Subject: [PATCH 07/10] ARM: tegra: fix malloc region sizing
From: Stephen Warren swarren@nvidia.com
Commit 52a7c98a1772 "tegra-common: increase malloc pool len by dfu mmc file buffer size" updated the definition of CONFIG_SYS_MALLOC_LEN for Tegra to take account of the DFU buffer size. However, this change had no effect, since typical Tegra board config headers don't set the DFU- related defines until after tegra-common.h is included. Fix this by moving the affected conditional code to tegra-common-post.h, which is included last. Also move the definition of SYS_NONCACHED_MEMORY since it's a related and adjacent definition.
Fix the condition to test for the DFU feature, rather than specifically MMC DFU support, so it applies in all cases.
Signed-off-by: Stephen Warren swarren@nvidia.com
Do you want me to take these last four in to u-boot-tegra for the pending PR, or do you expect them to go in another way?
Thanks,
Tom -- nvpublic
include/configs/tegra-common-post.h | 14 ++++++++++++++ include/configs/tegra-common.h | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra- common-post.h index e67ff7b95715..594fa456d17f 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -8,6 +8,20 @@ #ifndef __TEGRA_COMMON_POST_H #define __TEGRA_COMMON_POST_H
+/*
- Size of malloc() pool
- */
+#ifdef CONFIG_USB_FUNCTION_DFU +#define CONFIG_SYS_MALLOC_LEN ((4 << 20) + \
- CONFIG_SYS_DFU_DATA_BUF_SIZE)
+#else +#define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MB */ +#endif
+#ifndef CONFIG_ARM64 +#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */ +#endif
#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ diff --git a/include/configs/tegra-common.h b/include/configs/tegra- common.h index 6fe5f2ce6543..b886c6450763 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -37,20 +37,6 @@ #define CONFIG_ENV_SIZE 0x2000 /* Total Size Environment */
/*
- Size of malloc() pool
- */
-#ifdef CONFIG_DFU_MMC -#define CONFIG_SYS_MALLOC_LEN ((4 << 20) + \
CONFIG_SYS_DFU_DATA_BUF_SIZE)-#else -#define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MB */ -#endif
-#ifndef CONFIG_ARM64 -#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */ -#endif
-/*
- NS16550 Configuration
*/
#define CONFIG_TEGRA_SERIAL
1.9.1