diff options
| author | Tom Rini <trini@ti.com> | 2014-11-05 07:23:32 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-05 07:23:32 -0500 |
| commit | d5325eff10922acb11c39efece6d5f24de5b1998 (patch) | |
| tree | 8ab0ce7214dcb242ab4edcc5d79f5ff78cd0446b /include/configs | |
| parent | 7417e7fdf2481320f1253393f6d560981849c9cb (diff) | |
| parent | 44fd5914fb08ffcd96c9db7e448787f1d2aed801 (diff) | |
| download | u-boot-imx-d5325eff10922acb11c39efece6d5f24de5b1998.zip u-boot-imx-d5325eff10922acb11c39efece6d5f24de5b1998.tar.gz u-boot-imx-d5325eff10922acb11c39efece6d5f24de5b1998.tar.bz2 | |
Merge git://www.denx.de/git/u-boot-sunxi
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/sun4i.h | 1 | ||||
| -rw-r--r-- | include/configs/sun5i.h | 1 | ||||
| -rw-r--r-- | include/configs/sun6i.h | 1 | ||||
| -rw-r--r-- | include/configs/sun7i.h | 1 | ||||
| -rw-r--r-- | include/configs/sun8i.h | 1 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 22 |
6 files changed, 16 insertions, 11 deletions
diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index d0191a3..e0ec52d 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -11,7 +11,6 @@ /* * A10 specific configuration */ -#define CONFIG_SUN4I /* sun4i SoC generation */ #define CONFIG_CLK_FULL_SPEED 1008000000 #define CONFIG_SYS_PROMPT "sun4i# " diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h index 7b683e9..09f7533 100644 --- a/include/configs/sun5i.h +++ b/include/configs/sun5i.h @@ -11,7 +11,6 @@ /* * High Level Configuration Options */ -#define CONFIG_SUN5I /* sun5i SoC generation */ #define CONFIG_CLK_FULL_SPEED 1008000000 #define CONFIG_SYS_PROMPT "sun5i# " diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h index 93a1d96..b714474 100644 --- a/include/configs/sun6i.h +++ b/include/configs/sun6i.h @@ -14,7 +14,6 @@ /* * A31 specific configuration */ -#define CONFIG_SUN6I /* sun6i SoC generation */ #define CONFIG_SYS_PROMPT "sun6i# " diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index 966cbd8..0193826 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -12,7 +12,6 @@ /* * A20 specific configuration */ -#define CONFIG_SUN7I /* sun7i SoC generation */ #define CONFIG_CLK_FULL_SPEED 912000000 #define CONFIG_SYS_PROMPT "sun7i# " diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index 1c1a7cd..6f1fc48 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -12,7 +12,6 @@ /* * A23 specific configuration */ -#define CONFIG_SUN8I /* sun8i SoC generation */ #define CONFIG_SYS_PROMPT "sun8i# " /* diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index cc450e0..ce038ed 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -27,6 +27,14 @@ #define CONFIG_SYS_TEXT_BASE 0x4a000000 +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM) +# define CONFIG_CMD_DM +# define CONFIG_DM_GPIO +# define CONFIG_DM_SERIAL +# define CONFIG_DW_SERIAL +# define CONFIG_SYS_MALLOC_F_LEN (1 << 10) +#endif + /* * Display CPU information */ @@ -36,13 +44,15 @@ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL /* ns16550 reg in the low bits of cpu reg */ -#define CONFIG_SYS_NS16550_REG_SIZE -4 #define CONFIG_SYS_NS16550_CLK 24000000 -#define CONFIG_SYS_NS16550_COM1 SUNXI_UART0_BASE -#define CONFIG_SYS_NS16550_COM2 SUNXI_UART1_BASE -#define CONFIG_SYS_NS16550_COM3 SUNXI_UART2_BASE -#define CONFIG_SYS_NS16550_COM4 SUNXI_UART3_BASE -#define CONFIG_SYS_NS16550_COM5 SUNXI_R_UART_BASE +#ifndef CONFIG_DM_SERIAL +# define CONFIG_SYS_NS16550_REG_SIZE -4 +# define CONFIG_SYS_NS16550_COM1 SUNXI_UART0_BASE +# define CONFIG_SYS_NS16550_COM2 SUNXI_UART1_BASE +# define CONFIG_SYS_NS16550_COM3 SUNXI_UART2_BASE +# define CONFIG_SYS_NS16550_COM4 SUNXI_UART3_BASE +# define CONFIG_SYS_NS16550_COM5 SUNXI_R_UART_BASE +#endif /* DRAM Base */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 |