Skip to contentSkip to conversation

ARM: imx: Update VINING|2000 to DM/DT

PATCH Superseded Marek Vasut 2 participants 17 messages May 17, 2019 – Jun 10, 2019

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover ARM: imx: Update VINING|2000 to DM/DT

Update Softing VINING|2000 to DM / DT and remove the warnings. This depends on the following patches / series:

http://patchwork.ozlabs.org/patch/1101222/
http://patchwork.ozlabs.org/patch/1101230/
https://patchwork.ozlabs.org/project/uboot/list/?series=108463

Marek Vasut (8):

  ARM: imx: Rename VINING|2000

ARM: dts: imx: vining2000: Import VINING|2000 DT from Linux
ARM: imx: vining2000: Enable DM pin control
ARM: imx: vining2000: Convert MMC and block to DM
ARM: imx: vining2000: Enable DM USB
ARM: imx: vining2000: Enable DM GPIO
ARM: imx: vining2000: Enable DM PCI
ARM: imx: vining2000: Enable DM Serial

 arch/arm/dts/Makefile                         |   3 +-
 arch/arm/dts/imx6sx-softing-vining-2000.dts   | 578 ++++++++++++++++++
 arch/arm/mach-imx/mx6/Kconfig                 |   6 +-
 board/{samtec => softing}/vining_2000/Kconfig |   4 +-
 .../vining_2000/MAINTAINERS                   |   4 +-
 .../{samtec => softing}/vining_2000/Makefile  |   1 +
 .../vining_2000/imximage.cfg                  |   1 +
 .../vining_2000/vining_2000.c                 |  91 +--
 configs/vining_2000_defconfig                 |  20 +-
 include/configs/vining_2000.h                 |   3 -
 10 files changed, 608 insertions(+), 103 deletions(-)
 create mode 100644 arch/arm/dts/imx6sx-softing-vining-2000.dts
 rename board/{samtec => softing}/vining_2000/Kconfig (69%)
 rename board/{samtec => softing}/vining_2000/MAINTAINERS (57%)
 rename board/{samtec => softing}/vining_2000/Makefile (67%)
 rename board/{samtec => softing}/vining_2000/imximage.cfg (97%)
 rename board/{samtec => softing}/vining_2000/vining_2000.c (77%)
Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/8 ARM: imx: Rename VINING|2000

The company Samtec was merged into Softing, migrate the board over to the new name and update copyright headers.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>
---
 arch/arm/mach-imx/mx6/Kconfig                       | 6 +++---
 board/{samtec => softing}/vining_2000/Kconfig       | 4 ++--
 board/{samtec => softing}/vining_2000/MAINTAINERS   | 4 ++--
 board/{samtec => softing}/vining_2000/Makefile      | 1 +
 board/{samtec => softing}/vining_2000/imximage.cfg  | 1 +
 board/{samtec => softing}/vining_2000/vining_2000.c | 1 +
 configs/vining_2000_defconfig                       | 4 ++--
 7 files changed, 12 insertions(+), 9 deletions(-)
 rename board/{samtec => softing}/vining_2000/Kconfig (69%)
 rename board/{samtec => softing}/vining_2000/MAINTAINERS (57%)
 rename board/{samtec => softing}/vining_2000/Makefile (67%)
 rename board/{samtec => softing}/vining_2000/imximage.cfg (97%)
 rename board/{samtec => softing}/vining_2000/vining_2000.c (99%)
arch/arm/mach-imx/mx6/Kconfig +3 -3
index f513c4c06f..1ef0c58c2f 100644
@@ -498,8 +498,8 @@ config TARGET_UDOO_NEO
 	select SUPPORT_SPL
 	imply CMD_DM
 
-config TARGET_SAMTEC_VINING_2000
-	bool "samtec VIN|ING 2000"
+config TARGET_SOFTING_VINING_2000
+	bool "Softing VIN|ING 2000"
 	select BOARD_LATE_INIT
 	select DM
 	select DM_THERMAL
@@ -580,7 +580,7 @@ source "board/phytec/pfla02/Kconfig"
 source "board/phytec/pcl063/Kconfig"
 source "board/gateworks/gw_ventana/Kconfig"
 source "board/kosagi/novena/Kconfig"
-source "board/samtec/vining_2000/Kconfig"
+source "board/softing/vining_2000/Kconfig"
 source "board/liebherr/display5/Kconfig"
 source "board/liebherr/mccmon6/Kconfig"
 source "board/logicpd/imx6/Kconfig"
board/softing/vining_2000/Kconfig renamed from board/samtec/vining_2000/Kconfig +2 -2
similarity index 69%
rename from board/samtec/vining_2000/Kconfig
rename to board/softing/vining_2000/Kconfig
index 3447c27fa4..90d45a7f6e 100644
@@ -1,10 +1,10 @@
-if TARGET_SAMTEC_VINING_2000
+if TARGET_SOFTING_VINING_2000
 
 config SYS_BOARD
 	default "vining_2000"
 
 config SYS_VENDOR
-	default "samtec"
+	default "softing"
 
 config SYS_CONFIG_NAME
 	default "vining_2000"
board/softing/vining_2000/MAINTAINERS renamed from board/samtec/vining_2000/MAINTAINERS +2 -2
similarity index 57%
rename from board/samtec/vining_2000/MAINTAINERS
rename to board/softing/vining_2000/MAINTAINERS
index 027e52736f..0df78c6b95 100644
@@ -1,6 +1,6 @@
 VINING_2000 BOARD
-M:	Ingo Schroeck <[email protected]>
+M:	Silvio Fricke <[email protected]>
 S:	Maintained
-F:	board/samtec/vining_2000/
+F:	board/softing/vining_2000/
 F:	include/configs/vining_2000.h
 F:	configs/vining_2000_defconfig
board/softing/vining_2000/Makefile renamed from board/samtec/vining_2000/Makefile +1 -0
similarity index 67%
rename from board/samtec/vining_2000/Makefile
rename to board/softing/vining_2000/Makefile
index 9650da711d..84f66a67b5 100644
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0+
 # (C) Copyright 2016 samtec automotive software & electronics gmbh
+# Copyright (C) 2017-2019 softing automotive electronics gmbH
 
 obj-y  := vining_2000.o
board/softing/vining_2000/imximage.cfg renamed from board/samtec/vining_2000/imximage.cfg +1 -0
similarity index 97%
rename from board/samtec/vining_2000/imximage.cfg
rename to board/softing/vining_2000/imximage.cfg
index 3e4fcad8ea..f6f59ddf55 100644
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2016 samtec automotive software & electronics gmbh
+ * Copyright (C) 2017-2019 softing automotive electronics gmbH
  */
 
 #define __ASSEMBLY__
board/softing/vining_2000/vining_2000.c renamed from board/samtec/vining_2000/vining_2000.c +1 -0
similarity index 99%
rename from board/samtec/vining_2000/vining_2000.c
rename to board/softing/vining_2000/vining_2000.c
index d82b3aeb31..f0313b06fb 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 samtec automotive software & electronics gmbh
+ * Copyright (C) 2017-2019 softing automotive electronics gmbH
  *
  * Author: Christoph Fritz <[email protected]>
  */
configs/vining_2000_defconfig +2 -2
index 073ff48329..0f9069381e 100644
@@ -1,10 +1,10 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x87800000
-CONFIG_TARGET_SAMTEC_VINING_2000=y
+CONFIG_TARGET_SOFTING_VINING_2000=y
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_CMD_BMODE is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/samtec/vining_2000/imximage.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/softing/vining_2000/imximage.cfg"
 CONFIG_BOOTDELAY=0
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SUPPORT_RAW_INITRD=y
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/8 ARM: imx: Rename VINING|2000

Quoted 6 lines

The company Samtec was merged into Softing, migrate the board over to the new name and update copyright headers.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

PATCH 2/8 ARM: dts: imx: vining2000: Import VINING|2000 DT from Linux

In reply to Marek Vasut

Import iMX6SX VINING|2000 device tree from Linux 5.1.1 b724e9356404 . Enable DT control in full U-Boot .

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>
---
 arch/arm/dts/Makefile                       |   3 +-
 arch/arm/dts/imx6sx-softing-vining-2000.dts | 573 ++++++++++++++++++++
 configs/vining_2000_defconfig               |   6 +-
 3 files changed, 580 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/imx6sx-softing-vining-2000.dts
arch/arm/dts/Makefile +2 -1
index 0ec7bc987d..1dcfa9a535 100644
@@ -565,7 +565,8 @@ dtb-$(CONFIG_MX6SLL) += imx6sll-evk.dtb
 
 dtb-$(CONFIG_MX6SX) += \
 	imx6sx-sabreauto.dtb \
-	imx6sx-sdb.dtb
+	imx6sx-sdb.dtb \
+	imx6sx-softing-vining-2000.dtb
 
 dtb-$(CONFIG_MX6UL) += \
 	imx6ul-geam.dtb \
arch/arm/dts/imx6sx-softing-vining-2000.dts new file +573 -0

573 lines not on this page · raw message

configs/vining_2000_defconfig +5 -1
index 0f9069381e..958b7bb5ac 100644
@@ -1,9 +1,12 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SYS_TEXT_BASE=0x87800000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_TARGET_SOFTING_VINING_2000=y
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x400
 CONFIG_NR_DRAM_BANKS=1
 # CONFIG_CMD_BMODE is not set
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x400
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/softing/vining_2000/imximage.cfg"
 CONFIG_BOOTDELAY=0
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
@@ -31,6 +34,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="imx6sx-softing-vining-2000"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_SUPPORT_EMMC_BOOT=y
@@ -42,4 +47,3 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
-CONFIG_OF_LIBFDT=y
Signature · 1 line
2.20.1
#4 lore raw

PATCH 2/8 ARM: dts: imx: vining2000: Import VINING|2000

Quoted 6 lines

Import iMX6SX VINING|2000 device tree from Linux 5.1.1 b724e9356404 . Enable DT control in full U-Boot .

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#5 lore raw

PATCH 3/8 ARM: imx: vining2000: Enable DM pin control

In reply to Marek Vasut

Enable DM pin control support on iMX6SX VINING|2000.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>
---
 configs/vining_2000_defconfig | 3 +++
 1 file changed, 3 insertions(+)
configs/vining_2000_defconfig +3 -0
index 958b7bb5ac..01736823b8 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PART=y
 CONFIG_CMD_PCI=y
+# CONFIG_CMD_PINMUX is not set
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -43,6 +44,8 @@ CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
Signature · 1 line
2.20.1
#6 lore raw

PATCH 3/8 ARM: imx: vining2000: Enable DM pin control

Quoted 5 lines

Enable DM pin control support on iMX6SX VINING|2000.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#7 lore raw

PATCH 4/8 ARM: imx: vining2000: Convert MMC and block to DM

In reply to Marek Vasut

Enable DM block and DM MMC support on iMX6SX VINING|2000 . Convert board code to match the DM support. This disables USB mass storage support due to missing DM USB, however that will be re-enabled in subsequent patch.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>
---
 arch/arm/dts/imx6sx-softing-vining-2000.dts |  5 ++
 board/softing/vining_2000/vining_2000.c     | 77 ---------------------
 configs/vining_2000_defconfig               |  2 +-
 3 files changed, 6 insertions(+), 78 deletions(-)
arch/arm/dts/imx6sx-softing-vining-2000.dts +5 -0
index 2bc51623a8..371890ff60 100644
@@ -16,6 +16,11 @@
 	model = "Softing VIN|ING 2000";
 	compatible = "samtec,imx6sx-vining-2000", "fsl,imx6sx";
 
+	aliases {
+		mmc0 = &usdhc4;
+		mmc1 = &usdhc2;
+	};
+
 	chosen {
 		stdout-path = &uart1;
 	};
board/softing/vining_2000/vining_2000.c +0 -77

89 lines not on this page · raw message

configs/vining_2000_defconfig +1 -1
index 01736823b8..2bd88149be 100644
@@ -38,6 +38,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6sx-softing-vining-2000"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_DM_MMC=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
@@ -47,6 +48,5 @@ CONFIG_PCI=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_USB=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
Signature · 1 line
2.20.1
#8 lore raw

PATCH 4/8 ARM: imx: vining2000: Convert MMC and block to DM

Quoted 8 lines

Enable DM block and DM MMC support on iMX6SX VINING|2000 . Convert board code to match the DM support. This disables USB mass storage support due to missing DM USB, however that will be re-enabled in subsequent patch.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#9 lore raw

PATCH 5/8 ARM: imx: vining2000: Enable DM USB

In reply to Marek Vasut

Enable DM USB support on iMX6SX VINING|2000.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>
---
 configs/vining_2000_defconfig | 2 ++
 1 file changed, 2 insertions(+)
configs/vining_2000_defconfig +2 -0
index 2bd88149be..02dd223e63 100644
@@ -48,5 +48,7 @@ CONFIG_PCI=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
Signature · 1 line
2.20.1
#10 lore raw

PATCH 5/8 ARM: imx: vining2000: Enable DM USB

Quoted 5 lines

Enable DM USB support on iMX6SX VINING|2000.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#11 lore raw

PATCH 6/8 ARM: imx: vining2000: Enable DM GPIO

In reply to Marek Vasut

Enable DM GPIO support on iMX6SX VINING|2000 and fix up board code where applicable.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>
---
 board/softing/vining_2000/vining_2000.c | 1 +
 configs/vining_2000_defconfig           | 1 +
 2 files changed, 2 insertions(+)
board/softing/vining_2000/vining_2000.c +1 -0
index 9ab7fbeddf..d960773671 100644
@@ -133,6 +133,7 @@ int board_eth_init(bd_t *bis)
 		goto eth_fail;
 
 	/* reset phy */
+	gpio_request(PHY_RESET, "PHY-reset");
 	gpio_direction_output(PHY_RESET, 0);
 	mdelay(16);
 	gpio_set_value(PHY_RESET, 1);
configs/vining_2000_defconfig +1 -0
index 02dd223e63..94df5ac4df 100644
@@ -38,6 +38,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6sx-softing-vining-2000"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_SUPPORT_EMMC_BOOT=y
Signature · 1 line
2.20.1
#12 lore raw

PATCH 6/8 ARM: imx: vining2000: Enable DM GPIO

Quoted 6 lines

Enable DM GPIO support on iMX6SX VINING|2000 and fix up board code where applicable.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#13 lore raw

PATCH 7/8 ARM: imx: vining2000: Enable DM PCI

In reply to Marek Vasut

Enable DM PCI support on iMX6SX VINING|2000.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>
---
 configs/vining_2000_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/vining_2000_defconfig +1 -0
index 94df5ac4df..0a2b042ed1 100644
@@ -46,6 +46,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_DM_PCI=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_USB=y
Signature · 1 line
2.20.1
#14 lore raw

PATCH 7/8 ARM: imx: vining2000: Enable DM PCI

Quoted 5 lines

Enable DM PCI support on iMX6SX VINING|2000.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#15 lore raw

PATCH 8/8 ARM: imx: vining2000: Enable DM Serial

In reply to Marek Vasut

Enable DM Serial support on iMX6SX VINING|2000.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>
---
 board/softing/vining_2000/vining_2000.c | 12 ------------
 configs/vining_2000_defconfig           |  3 +++
 include/configs/vining_2000.h           |  3 ---
 3 files changed, 3 insertions(+), 15 deletions(-)
board/softing/vining_2000/vining_2000.c +0 -12
index d960773671..19b9b37276 100644
@@ -71,11 +71,6 @@ int dram_init(void)
 	return 0;
 }
 
-static iomux_v3_cfg_t const uart1_pads[] = {
-	MX6_PAD_GPIO1_IO04__UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
-	MX6_PAD_GPIO1_IO05__UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
 static iomux_v3_cfg_t const fec1_pads[] = {
 	MX6_PAD_ENET1_MDC__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
 	MX6_PAD_ENET1_MDIO__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL),
@@ -97,11 +92,6 @@ static iomux_v3_cfg_t const pwm_led_pads[] = {
 	MX6_PAD_RGMII2_RD3__PWM1_OUT | MUX_PAD_CTRL(NO_PAD_CTRL), /* blue */
 };
 
-static void setup_iomux_uart(void)
-{
-	imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
-}
-
 #define PHY_RESET IMX_GPIO_NR(5, 9)
 
 int board_eth_init(bd_t *bis)
@@ -419,8 +409,6 @@ int board_late_init(void)
 
 int board_early_init_f(void)
 {
-	setup_iomux_uart();
-
 	setup_iomux_usb();
 
 	return 0;
configs/vining_2000_defconfig +3 -0
index 0a2b042ed1..9e8326e771 100644
@@ -49,6 +49,9 @@ CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_MXC_UART=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
include/configs/vining_2000.h +0 -3
index fd98c1417e..d4db9b4a56 100644
@@ -17,9 +17,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(3 * SZ_1M)
 
-#define CONFIG_MXC_UART
-#define CONFIG_MXC_UART_BASE		UART1_BASE
-
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
 	func(MMC, mmc, 1) \
Signature · 1 line
2.20.1
#16 lore raw

PATCH 8/8 ARM: imx: vining2000: Enable DM Serial

Quoted 5 lines

Enable DM Serial support on iMX6SX VINING|2000.

Cc Fabio Estevam <[email protected]>
Cc Silvio Fricke <[email protected]>
Cc Stefano Babic <[email protected]>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================