imx6: aristainetos: add DM_SERIAL support

add DM_SERIAL support for the aristainetos board, and
remove not used code from board code.

remove CONSOLE_OVERWRITE_ROUTINE.

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index c78e91968b84ed456aaff47b12ccd35ddb33822f..6bc7405a1cafc648a7f52f768bd3a4f35035eb84 100644 (file)
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -132,7 +132,9 @@ config TARGET_ARISTAINETOS2
        select SYS_I2C_MXC
        select MXC_UART
        select FEC_MXC
+       select DM
        imply CMD_SATA
+       imply CMD_DM
 
 config TARGET_CGTQMX6EVAL
        bool "cgtqmx6eval"

diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index b296ea25226e399818900e94833291a1ba8bdbd0..00ffac8eb64f1aee0e6c6b0471e800c9583e28a8 100644 (file)
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -43,10 +43,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |                  \
-       PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm |                 \
-       PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
-
 #define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP |                   \
        PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm |                 \
        PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
@@ -117,30 +113,6 @@ struct i2c_pads_info i2c_pad_info4 = {
        }
 };
 
-iomux_v3_cfg_t const uart1_pads[] = {
-       MX6_PAD_CSI0_DAT10__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-       MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-       MX6_PAD_EIM_D19__UART1_CTS_B    | MUX_PAD_CTRL(UART_PAD_CTRL),
-       MX6_PAD_EIM_D20__UART1_RTS_B    | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
-iomux_v3_cfg_t const uart2_pads[] = {
-       MX6_PAD_EIM_D26__UART2_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-       MX6_PAD_EIM_D27__UART2_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
-iomux_v3_cfg_t const uart3_pads[] = {
-       MX6_PAD_EIM_D24__UART3_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-       MX6_PAD_EIM_D25__UART3_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-       MX6_PAD_EIM_D31__UART3_RTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),
-       MX6_PAD_EIM_D23__UART3_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
-iomux_v3_cfg_t const uart4_pads[] = {
-       MX6_PAD_KEY_COL0__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-       MX6_PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
 iomux_v3_cfg_t const gpio_pads[] = {
        /* LED enable*/
        MX6_PAD_ENET_CRS_DV__GPIO1_IO25 | MUX_PAD_CTRL(NO_PAD_CTRL),
@@ -312,28 +284,6 @@ static void setup_spi(void)
 #endif
 }
 
-static void setup_iomux_uart(void)
-{
-       switch (CONFIG_MXC_UART_BASE) {
-       case UART1_BASE:
-               imx_iomux_v3_setup_multiple_pads(uart1_pads,
-                                                ARRAY_SIZE(uart1_pads));
-               break;
-       case UART2_BASE:
-               imx_iomux_v3_setup_multiple_pads(uart2_pads,
-                                                ARRAY_SIZE(uart2_pads));
-               break;
-       case UART3_BASE:
-               imx_iomux_v3_setup_multiple_pads(uart3_pads,
-                                                ARRAY_SIZE(uart3_pads));
-               break;
-       case UART4_BASE:
-               imx_iomux_v3_setup_multiple_pads(uart4_pads,
-                                                ARRAY_SIZE(uart4_pads));
-               break;
-       }
-}
-
 int board_phy_config(struct phy_device *phydev)
 {
        /* control data pad skew - devaddr = 0x02, register = 0x04 */
@@ -629,7 +579,6 @@ static void set_gpr_register(void)
 extern char __bss_start[], __bss_end[];
 int board_early_init_f(void)
 {
-       setup_iomux_uart();
        setup_iomux_gpio();
 
        gpio_direction_output(SOFT_RESET_GPIO, 1);
@@ -808,15 +757,6 @@ int board_mmc_init(bd_t *bis)
 }
 #endif
 
-/*
- * Do not overwrite the console
- * Use always serial for U-Boot console
- */
-int overwrite_console(void)
-{
-       return 1;
-}
-
 struct display_info_t const displays[] = {
        {
                .bus    = -1,

diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index 564c8c46d76a2daf3264d60458a200a4cf8e3c5b..65702c09050840c3abc27730d2753dc81075cbaa 100644 (file)
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_SYS_THUMB_BUILD=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_SYS_MALLOC_F_LEN=0xe000
 CONFIG_TARGET_ARISTAINETOS2=y
 CONFIG_ENV_SIZE=0x3000
 CONFIG_ENV_OFFSET=0xD0000
@@ -12,7 +13,6 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_BOARD_TYPES=y
@@ -70,6 +70,7 @@ CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_MII=y
 CONFIG_PWM_IMX=y
+CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
 CONFIG_USB=y