summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2015-09-04 22:03:48 -0600
committerTom Rini <trini@konsulko.com>2015-09-11 17:15:24 -0400
commit99d969612f6e46192b4a963a7e5f8466a884f920 (patch)
tree5cdfb43490933d90462d48c7075d76668eb6fb1f /include/configs
parent411c5e57e8cf7dd83627a24b5cde73a0e662b1b0 (diff)
downloadu-boot-imx-99d969612f6e46192b4a963a7e5f8466a884f920.zip
u-boot-imx-99d969612f6e46192b4a963a7e5f8466a884f920.tar.gz
u-boot-imx-99d969612f6e46192b4a963a7e5f8466a884f920.tar.bz2
ARM: tegra: fix malloc region sizing
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>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/tegra-common-post.h14
-rw-r--r--include/configs/tegra-common.h14
2 files changed, 14 insertions, 14 deletions
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index e67ff7b..594fa45 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 6fe5f2c..b886c64 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