diff options
author | Tom Rini <trini@ti.com> | 2014-09-13 20:32:52 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-09-13 20:32:52 (GMT) |
commit | 8d028d404fa117a4b1f425d7cfc8affe1d8df6d5 (patch) | |
tree | 39cad1c0da41fd8e45a29a4dba23289cbd411773 /include/configs | |
parent | 114cc4290b2f24bb314edf2edd5d8738a0778c4b (diff) | |
parent | 858530a8c0a7ce7e573e513934804a00d6676813 (diff) | |
download | u-boot-8d028d404fa117a4b1f425d7cfc8affe1d8df6d5.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/sandbox.h | 3 | ||||
-rw-r--r-- | include/configs/tegra-common.h | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index bf2d25c..f5fa4b3 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -31,6 +31,9 @@ #define CONFIG_DM_DEMO_SHAPE #define CONFIG_DM_GPIO #define CONFIG_DM_TEST +#define CONFIG_DM_SERIAL + +#define CONFIG_SYS_STDIO_DEREGISTER /* Number of bits in a C 'long' on this architecture */ #define CONFIG_SANDBOX_BITS_PER_LONG 64 diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index d27fceb..834b3d5 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -20,6 +20,10 @@ #define CONFIG_DM #define CONFIG_CMD_DM +#define CONFIG_DM_GPIO +#ifndef CONFIG_SPL_BUILD +#define CONFIG_DM_SERIAL +#endif #define CONFIG_SYS_TIMER_RATE 1000000 #define CONFIG_SYS_TIMER_COUNTER NV_PA_TMRUS_BASE @@ -40,14 +44,19 @@ * Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MB */ +#define CONFIG_SYS_MALLOC_F_LEN (1 << 10) /* * NS16550 Configuration */ -#define CONFIG_SYS_NS16550 +#ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK +#else +#define CONFIG_TEGRA_SERIAL +#endif +#define CONFIG_SYS_NS16550 /* * Common HW configuration. |