Skip to contentSkip to conversation

ARM: dts: imx: novena: Import Novena DT from Linux

PATCH Superseded Marek Vasut 2 participants 13 messages May 5, 2019 – May 6, 2019

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 ARM: dts: imx: novena: Import Novena DT from Linux

Import iMX6Q Novena device tree from Linux 5.1-rc7 37624b58542f . Enable DT control in full U-Boot .

Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
 arch/arm/dts/Makefile         |   3 +-
 arch/arm/dts/imx6q-novena.dts | 792 ++++++++++++++++++++++++++++++++++
 configs/novena_defconfig      |   3 +-
 3 files changed, 796 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/imx6q-novena.dts
arch/arm/dts/Makefile +2 -1
index 8e082f2840..9ec2f5e2f2 100644
@@ -512,7 +512,8 @@ dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \
 dtb-$(CONFIG_MX6Q) += \
 	imx6-apalis.dtb \
 	imx6q-display5.dtb \
-	imx6q-logicpd.dtb
+	imx6q-logicpd.dtb \
+	imx6q-novena.dtb
 
 dtb-$(CONFIG_TARGET_TBS2910) += \
 	imx6q-tbs2910.dtb
arch/arm/dts/imx6q-novena.dts new file +792 -0

792 lines not on this page · raw message

configs/novena_defconfig +2 -1
index 340e1cd91c..04c944c6d8 100644
@@ -40,6 +40,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-novena"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DWC_AHSATA=y
 CONFIG_FSL_ESDHC=y
@@ -62,4 +64,3 @@ CONFIG_VIDEO_IPUV3=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_FAT_WRITE=y
-CONFIG_OF_LIBFDT=y
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/6 ARM: imx: novena: Enable DM pin control

Enable DM pin control support on iMX6Q Novena.

Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
 configs/novena_defconfig | 5 +++++
 1 file changed, 5 insertions(+)
configs/novena_defconfig +5 -0
index 04c944c6d8..31a32da0dc 100644
@@ -14,6 +14,7 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_DISTRO_DEFAULTS=y
+# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_USE_BOOTARGS=y
@@ -29,6 +30,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_EEPROM=y
+CONFIG_CMD_DM=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
@@ -43,6 +45,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-novena"
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
@@ -50,6 +53,8 @@ CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
 CONFIG_USB=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/6 ARM: imx: novena: Enable DM GPIO

In reply to Marek Vasut

Enable DM GPIO support on iMX6Q Novena and fix up board code where applicable.

Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
 board/kosagi/novena/novena.c | 2 ++
 board/kosagi/novena/video.c  | 3 +++
 configs/novena_defconfig     | 1 +
 3 files changed, 6 insertions(+)
board/kosagi/novena/novena.c +2 -0
index 9f2586521d..0750c4667e 100644
@@ -83,6 +83,8 @@ int drv_keyboard_init(void)
 		.tstc	= novena_gpio_button_tstc,
 	};
 
+	gpio_request(NOVENA_BUTTON_GPIO, "button");
+
 	error = input_init(&button_input, 0);
 	if (error) {
 		debug("%s: Cannot set up input\n", __func__);
board/kosagi/novena/video.c +3 -0
index f1351b9e28..7083b6e103 100644
@@ -270,6 +270,7 @@ static void enable_lvds(struct display_info_t const *dev)
 		return;
 
 	/* ITE IT6251 power enable. */
+	gpio_request(NOVENA_ITE6251_PWR_GPIO, "ite6251-power");
 	gpio_direction_output(NOVENA_ITE6251_PWR_GPIO, 0);
 	mdelay(10);
 	gpio_direction_output(NOVENA_ITE6251_PWR_GPIO, 1);
@@ -447,6 +448,8 @@ void setup_display_lvds(void)
 	/* Init the LVDS-to-eDP chip and if it succeeded, enable backlight. */
 	ret = it6251_init();
 	if (!ret) {
+		gpio_request(NOVENA_BACKLIGHT_PWR_GPIO, "backlight-power");
+		gpio_request(NOVENA_BACKLIGHT_PWM_GPIO, "backlight-pwm");
 		/* Backlight power enable. */
 		gpio_direction_output(NOVENA_BACKLIGHT_PWR_GPIO, 1);
 		/* PWM backlight pin, always on for full brightness. */
configs/novena_defconfig +1 -0
index 31a32da0dc..c74f635121 100644
@@ -47,6 +47,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-novena"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
+CONFIG_DM_GPIO=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
Signature · 1 line
2.20.1
#3 lore raw

PATCH 4/6 ARM: imx: novena: Convert block devices to DM

In reply to Marek Vasut

Enable DM block, DM MMC and DM SATA support on iMX6Q Novena convert board code to match the DM support.

Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
 arch/arm/dts/imx6q-novena.dts |   5 ++
 board/kosagi/novena/novena.c  | 107 +++++++++++++++++-----------------
 configs/novena_defconfig      |   3 +
 include/configs/novena.h      |   5 --
 4 files changed, 61 insertions(+), 59 deletions(-)
arch/arm/dts/imx6q-novena.dts +5 -0
index 61347a545d..35383c9a2b 100644
@@ -61,6 +61,11 @@
 		reg = <0x10000000 0>;
 	};
 
+	aliases {
+		mmc0 = &usdhc3;
+		mmc1 = &usdhc2;
+	};
+
 	chosen {
 		stdout-path = &uart2;
 	};
board/kosagi/novena/novena.c +53 -54

128 lines not on this page · raw message

configs/novena_defconfig +3 -0
index c74f635121..fa5fdea278 100644
@@ -13,6 +13,7 @@ CONFIG_SPL=y
 CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_CMD_HDMIDETECT=y
+CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
@@ -48,6 +49,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_DM_GPIO=y
+CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
@@ -56,6 +58,7 @@ CONFIG_MII=y
 CONFIG_PCI=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_SCSI=y
 CONFIG_USB=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
include/configs/novena.h +0 -5
index bb5bf808c2..bc7383e957 100644
@@ -102,12 +102,7 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* SATA Configs */
-#ifdef CONFIG_CMD_SATA
-#define CONFIG_SYS_SATA_MAX_DEVICE	1
-#define CONFIG_DWC_AHSATA_PORT_ID	0
-#define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#endif
 
 /* UART */
 #define CONFIG_MXC_UART
Signature · 1 line
2.20.1
#4 lore raw

PATCH 4/6 ARM: imx: novena: Convert block devices to DM

Quoted 2 lines · Marek Vasut

Enable DM block, DM MMC and DM SATA support on iMX6Q Novena convert board code to match the DM support.

Tested booting from MMC and SATA.

SATA performance was *much* faster, too! Thanks!

live well,
vagrant

Quoted 210 lines
Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
 arch/arm/dts/imx6q-novena.dts |   5 ++
 board/kosagi/novena/novena.c  | 107 +++++++++++++++++-----------------
 configs/novena_defconfig      |   3 +
 include/configs/novena.h      |   5 --
 4 files changed, 61 insertions(+), 59 deletions(-)
arch/arm/dts/imx6q-novena.dts +5 -0
index 61347a545d..35383c9a2b 100644
@@ -61,6 +61,11 @@
 		reg = <0x10000000 0>;
 	};
 
+	aliases {
+		mmc0 = &usdhc3;
+		mmc1 = &usdhc2;
+	};
+
 	chosen {
 		stdout-path = &uart2;
 	};
board/kosagi/novena/novena.c +53 -54
index 0750c4667e..4b31e2961c 100644
@@ -6,6 +6,9 @@
  */
 
 #include <common.h>
+#include <dm.h>
+#include <dm/device-internal.h>
+#include <ahci.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
@@ -20,6 +23,7 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/mach-imx/sata.h>
 #include <asm/mach-imx/video.h>
+#include <dwc_ahsata.h>
 #include <environment.h>
 #include <fsl_esdhc.h>
 #include <i2c.h>
@@ -101,60 +105,6 @@ int drv_keyboard_init(void)
 }
 #endif
 
-/*
- * SDHC
- */
-#ifdef CONFIG_FSL_ESDHC
-static struct fsl_esdhc_cfg usdhc_cfg[] = {
-	{ USDHC3_BASE_ADDR, 0, 4 },	/* Micro SD */
-	{ USDHC2_BASE_ADDR, 0, 4 },	/* Big SD */
-};
-
-int board_mmc_getcd(struct mmc *mmc)
-{
-	struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
-
-	/* There is no CD for a microSD card, assume always present. */
-	if (cfg->esdhc_base == USDHC3_BASE_ADDR)
-		return 1;
-	else
-		return !gpio_get_value(NOVENA_SD_CD);
-}
-
-int board_mmc_getwp(struct mmc *mmc)
-{
-	struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
-
-	/* There is no WP for a microSD card, assume always read-write. */
-	if (cfg->esdhc_base == USDHC3_BASE_ADDR)
-		return 0;
-	else
-		return gpio_get_value(NOVENA_SD_WP);
-}
-
-
-int board_mmc_init(bd_t *bis)
-{
-	s32 status = 0;
-	int index;
-
-	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-	usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
-
-	/* Big SD write-protect and card-detect */
-	gpio_direction_input(NOVENA_SD_WP);
-	gpio_direction_input(NOVENA_SD_CD);
-
-	for (index = 0; index < ARRAY_SIZE(usdhc_cfg); index++) {
-		status = fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
-		if (status)
-			return status;
-	}
-
-	return status;
-}
-#endif
-
 int board_early_init_f(void)
 {
 #if defined(CONFIG_VIDEO_IPUV3)
@@ -270,3 +220,52 @@ int misc_init_r(void)
 
 	return ret;
 }
+
+#if CONFIG_IS_ENABLED(AHCI)
+static int sata_imx_probe(struct udevice *dev)
+{
+	int i, err;
+
+	for (i = 0; i < 10; i++) {
+		err = setup_sata();
+		if (err) {
+			printf("SATA setup failed: %d\n", err);
+			return err;
+		}
+
+		udelay(100);
+
+		err = dwc_ahsata_probe(dev);
+		if (!err)
+			break;
+
+		/* There is no device on the SATA port */
+		if (sata_dm_port_status(0, 0) == 0)
+			break;
+
+		/* There's a device, but link not established. Retry */
+		device_remove(dev, DM_REMOVE_NORMAL);
+	}
+
+	return 0;
+}
+
+struct ahci_ops sata_imx_ops = {
+	.port_status = dwc_ahsata_port_status,
+	.reset	= dwc_ahsata_bus_reset,
+	.scan	= dwc_ahsata_scan,
+};
+
+static const struct udevice_id sata_imx_ids[] = {
+	{ .compatible = "fsl,imx6q-ahci" },
+	{ }
+};
+
+U_BOOT_DRIVER(sata_imx) = {
+	.name		= "dwc_ahci",
+	.id		= UCLASS_AHCI,
+	.of_match	= sata_imx_ids,
+	.ops		= &sata_imx_ops,
+	.probe		= sata_imx_probe,
+};
+#endif /* AHCI */
configs/novena_defconfig +3 -0
index c74f635121..fa5fdea278 100644
@@ -13,6 +13,7 @@ CONFIG_SPL=y
 CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_CMD_HDMIDETECT=y
+CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
@@ -48,6 +49,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_DM_GPIO=y
+CONFIG_DM_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
@@ -56,6 +58,7 @@ CONFIG_MII=y
 CONFIG_PCI=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_SCSI=y
 CONFIG_USB=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
include/configs/novena.h +0 -5
index bb5bf808c2..bc7383e957 100644
@@ -102,12 +102,7 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* SATA Configs */
-#ifdef CONFIG_CMD_SATA
-#define CONFIG_SYS_SATA_MAX_DEVICE	1
-#define CONFIG_DWC_AHSATA_PORT_ID	0
-#define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#endif
 
 /* UART */
 #define CONFIG_MXC_UART
Signature · 1 line
2.20.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190505/2ed984b1/attachment.sig>

#5 lore raw

PATCH 5/6 ARM: imx: novena: Enable DM USB

In reply to Marek Vasut

Enable DM USB support on iMX6Q Novena.

Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
 configs/novena_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/novena_defconfig +1 -0
index fa5fdea278..c5dbbb0b4d 100644
@@ -60,6 +60,7 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_SCSI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
Signature · 1 line
2.20.1
#6 lore raw

PATCH 5/6 ARM: imx: novena: Enable DM USB

Quoted 1 line · Marek Vasut

Enable DM USB support on iMX6Q Novena.

Hrm. Not working so well:

=> load usb 0:1 $kernel_addr_r misc/Binaries/linux/Image data abort

pc : [<fefbbf0e>]          lr : [<fefbb991>]

reloc pc : [<17832f0e>] lr : [<17832991>]
sp : faf7d788 ip : 00000003 fp : 00000005
r10: faf8c258 r9 : faf88ea0 r8 : 00000001
r7 : fafa9ba0 r6 : f9f7b040 r5 : faf7d7b0 r4 : 00000038
r3 : 0000006d r2 : f9f7b0a3 r1 : fafa9c0c r0 : f9f7b09f
Flags: nzCv IRQs off FIQs off Mode SVC_32

Code: 4630f801 81f0e8bd e7d84606 bf082b2f (f822235c)

Resetting CPU ...

That said, I haven't tested USB recently; it may be no worse.

live well,
vagrant

Quoted 22 lines
Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
 configs/novena_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/novena_defconfig +1 -0
index fa5fdea278..c5dbbb0b4d 100644
@@ -60,6 +60,7 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_SCSI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
Signature · 1 line
2.20.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190505/78c642bf/attachment.sig>

#7 lore raw

PATCH 5/6 ARM: imx: novena: Enable DM USB

Quoted 9 lines · Vagrant Cascadian
Quoted 1 line · Marek Vasut

Enable DM USB support on iMX6Q Novena.

Hrm. Not working so well:

=> load usb 0:1 $kernel_addr_r misc/Binaries/linux/Image data abort

pc : [<fefbbf0e>]          lr : [<fefbb991>]

reloc pc : [<17832f0e>] lr : [<17832991>]

Where does it crash ? arm-...objdump -d u-boot and look for the reloc_pc value, it should tell you in which function the crash occurred .

Quoted 35 lines

sp : faf7d788 ip : 00000003 fp : 00000005
r10: faf8c258 r9 : faf88ea0 r8 : 00000001
r7 : fafa9ba0 r6 : f9f7b040 r5 : faf7d7b0 r4 : 00000038
r3 : 0000006d r2 : f9f7b0a3 r1 : fafa9c0c r0 : f9f7b09f
Flags: nzCv IRQs off FIQs off Mode SVC_32

Code: 4630f801 81f0e8bd e7d84606 bf082b2f (f822235c)

Resetting CPU ...

That said, I haven't tested USB recently; it may be no worse.

live well,
vagrant

Quoted 22 lines
Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
 configs/novena_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/novena_defconfig +1 -0
index fa5fdea278..c5dbbb0b4d 100644
@@ -60,6 +60,7 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_SCSI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
Signature · 1 line
2.20.1
Signature · 2 lines
Best regards,
Marek Vasut
#8 lore raw

PATCH 5/6 ARM: imx: novena: Enable DM USB

Quoted 3 lines · Marek Vasut
Quoted 2 lines · Vagrant Cascadian
Quoted 1 line · Marek Vasut

Enable DM USB support on iMX6Q Novena.

...

Quoted 7 lines
Quoted 4 lines

=> load usb 0:1 $kernel_addr_r misc/Binaries/linux/Image data abort

pc : [<fefbbf0e>]          lr : [<fefbb991>]

reloc pc : [<17832f0e>] lr : [<17832991>]

Where does it crash ? arm-...objdump -d u-boot and look for the reloc_pc value, it should tell you in which function the crash occurred .

I didn't find 17832f0e in the objdump output... I'll try a build directly from upstream sources rather than using the debian packaging to make sure I'm not breaking something in the packaging.

Also, interesting enough, only one of the four USB ports is triggering this issue for me; front, internal, and "ext2" (near the corner of the board) all work, but "ext1" doesn't (between "ext2" and the full-size SD/hdmi/microUSB/audio ports).

live well,
vagrant
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190506/e3ba2fd6/attachment.sig>

#9 lore raw

PATCH 6/6 ARM: imx: novena: Convert to DM VIDEO

In reply to Marek Vasut

Enable DM Video support on iMX6Q Novena and fix minor details to restore previous behavior of the system.

Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
 configs/novena_defconfig | 6 +++---
 include/configs/novena.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
configs/novena_defconfig +3 -3
index c5dbbb0b4d..3ae485245d 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_MX6_DDRCAL=y
 CONFIG_TARGET_KOSAGI_NOVENA=y
 CONFIG_SPL_MMC_SUPPORT=y
@@ -15,7 +16,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_USE_BOOTARGS=y
@@ -70,7 +70,7 @@ CONFIG_USB_ETH_CDC=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_FAT_WRITE=y
include/configs/novena.h +2 -2
index bc7383e957..cdc437c492 100644
@@ -119,14 +119,12 @@
 #endif
 
 /* Video output */
-#ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
-#endif
 
 /* Extra U-Boot environment. */
 #ifndef CONFIG_SPL_BUILD
@@ -144,6 +142,8 @@
 	"ramdisk_addr_r=0x28000000\0"		   			\
 	"fdt_addr_r=0x18000000\0"					\
 	"fdtfile=imx6q-novena.dtb\0"					\
+	"stdout=serial,vidconsole\0"					\
+	"stderr=serial,vidconsole\0"					\
 	"addcons="							\
 		"setenv bootargs ${bootargs} "				\
 		"console=${consdev},${baudrate}\0"			\
Signature · 1 line
2.20.1
#10 lore raw

PATCH 6/6 ARM: imx: novena: Convert to DM VIDEO

Quoted 2 lines · Marek Vasut

Enable DM Video support on iMX6Q Novena and fix minor details to restore previous behavior of the system.

Also required:

"[U-Boot] video: ipuv3: Set max display bpp to 32"
https://patchwork.ozlabs.org/patch/1095618/

Otherwise it would hang after initializing video.

I don't see video output though. Not sure when I last tested video output from u-boot, though. But at least it boots!

live well,
vagrant

Quoted 69 lines
Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Vagrant Cascadian <[email protected]>
---
 configs/novena_defconfig | 6 +++---
 include/configs/novena.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
configs/novena_defconfig +3 -3
index c5dbbb0b4d..3ae485245d 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_MX6_DDRCAL=y
 CONFIG_TARGET_KOSAGI_NOVENA=y
 CONFIG_SPL_MMC_SUPPORT=y
@@ -15,7 +16,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
 CONFIG_USE_BOOTARGS=y
@@ -70,7 +70,7 @@ CONFIG_USB_ETH_CDC=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_FAT_WRITE=y
include/configs/novena.h +2 -2
index bc7383e957..cdc437c492 100644
@@ -119,14 +119,12 @@
 #endif
 
 /* Video output */
-#ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
-#endif
 
 /* Extra U-Boot environment. */
 #ifndef CONFIG_SPL_BUILD
@@ -144,6 +142,8 @@
 	"ramdisk_addr_r=0x28000000\0"		   			\
 	"fdt_addr_r=0x18000000\0"					\
 	"fdtfile=imx6q-novena.dtb\0"					\
+	"stdout=serial,vidconsole\0"					\
+	"stderr=serial,vidconsole\0"					\
 	"addcons="							\
 		"setenv bootargs ${bootargs} "				\
 		"console=${consdev},${baudrate}\0"			\
Signature · 1 line
2.20.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190505/de5113f7/attachment.sig>

#11 lore raw

PATCH 6/6 ARM: imx: novena: Convert to DM VIDEO

Quoted 6 lines · Vagrant Cascadian
Quoted 2 lines · Marek Vasut

Enable DM Video support on iMX6Q Novena and fix minor details to restore previous behavior of the system.

Also required:

Quoted 7 lines

"[U-Boot] video: ipuv3: Set max display bpp to 32"
https://patchwork.ozlabs.org/patch/1095618/

Otherwise it would hang after initializing video.

I don't see video output though. Not sure when I last tested video output from u-boot, though. But at least it boots!

Try "setenv stdout serial,vidconsole" , does it help ?

Signature · 2 lines
Best regards,
Marek Vasut
#12 lore raw

PATCH 6/6 ARM: imx: novena: Convert to DM VIDEO

Quoted 10 lines · Marek Vasut
Quoted 9 lines · Vagrant Cascadian
Quoted 2 lines · Marek Vasut

Enable DM Video support on iMX6Q Novena and fix minor details to restore previous behavior of the system.

Also required:

"[U-Boot] video: ipuv3: Set max display bpp to 32"
https://patchwork.ozlabs.org/patch/1095618/

Quoted 6 lines
Quoted 4 lines

Otherwise it would hang after initializing video.

I don't see video output though. Not sure when I last tested video output from u-boot, though. But at least it boots!

Try "setenv stdout serial,vidconsole" , does it help ?

Yes, that did help; thanks! So it's working on some level...

live well,
vagrant
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190506/8eac34de/attachment.sig>