summaryrefslogtreecommitdiff
path: root/include/configs/tqma6.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-06-08 08:37:02 -0400
committerTom Rini <trini@konsulko.com>2015-06-08 08:37:02 -0400
commit4d80051b63ff54f6b6f90fceb92cf87ab3401ecb (patch)
treeaea5bee67c756558fc8c820b4ee04adb75c85146 /include/configs/tqma6.h
parent5bcec545a6ca977ad74ee9fe0f2b335d348b5000 (diff)
parent943a3f2ccb71bcb4a6041bc2946129c4d4bb197e (diff)
downloadu-boot-4d80051b63ff54f6b6f90fceb92cf87ab3401ecb.tar.gz
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'include/configs/tqma6.h')
-rw-r--r--include/configs/tqma6.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 4859e03890..00294f6d52 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -22,6 +22,13 @@
/* #endif */
+/* place code in last 4 MiB of RAM */
+#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
+#define CONFIG_SYS_TEXT_BASE 0x2fc00000
+#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
+#define CONFIG_SYS_TEXT_BASE 0x4fc00000
+#endif
+
#include "mx6_common.h"
#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
@@ -116,13 +123,6 @@
#define CONFIG_CMD_BMODE
#define CONFIG_CMD_ITEST
-/* place code in last 4 MiB of RAM */
-#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
-#define CONFIG_SYS_TEXT_BASE 0x2fc00000
-#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
-#define CONFIG_SYS_TEXT_BASE 0x4fc00000
-#endif
-
#define CONFIG_ENV_SIZE (SZ_8K)
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * SZ_1M)
@@ -367,10 +367,6 @@
"panicboot=echo No boot device !!! reset\0" \
TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS \
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
-
#define CONFIG_STACKSIZE (128u * SZ_1K)
/* Physical Memory Map */