All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 0/2] Fix pico-imx7d
@ 2019-09-23  8:59 Joris Offouga
  2019-09-23  8:59 ` [U-Boot] [PATCH 1/2] pico-imx7d: fix splash logo drawing Joris Offouga
  2019-09-23  8:59 ` [U-Boot] [PATCH 2/2] pico-imx7d: Remove dead code for dm_video Joris Offouga
  0 siblings, 2 replies; 5+ messages in thread
From: Joris Offouga @ 2019-09-23  8:59 UTC (permalink / raw)
  To: u-boot

After merge master imx and U-Boot master. Pico imx7d build break.

common/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:46 : définitions multiples de « bmp_logo_bitmap »
board/technexion/pico-imx7d/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:46 : défini pour la première fois ici
common/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:12 : définitions multiples de « bmp_logo_palette »
board/technexion/pico-imx7d/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:12 : défini pour la première fois ici
Makefile:1610: recipe for target 'u-boot' failed
make: *** [u-boot] Error 1

So fix with according Anatolij Gustschin U-Boot video merge.

See fix branch : https://github.com/jorisoffouga/u-boot/commits/fix/pico-imx7d

Joris Offouga (2):
  pico-imx7d: fix splash logo drawing
  pico-imx7d: Remove dead code for dm_video

 arch/arm/dts/imx7d-pico-u-boot.dtsi      | 31 ------------------------
 board/technexion/pico-imx7d/pico-imx7d.c | 24 ------------------
 configs/pico-dwarf-imx7d_defconfig       |  2 ++
 configs/pico-hobbit-imx7d_defconfig      |  2 ++
 configs/pico-imx7d_bl33_defconfig        |  2 ++
 configs/pico-imx7d_defconfig             |  2 ++
 configs/pico-nymph-imx7d_defconfig       |  2 ++
 configs/pico-pi-imx7d_defconfig          |  2 ++
 include/configs/pico-imx7d.h             |  1 +
 9 files changed, 13 insertions(+), 55 deletions(-)

-- 
2.17.1

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 1/2] pico-imx7d: fix splash logo drawing
  2019-09-23  8:59 [U-Boot] [PATCH 0/2] Fix pico-imx7d Joris Offouga
@ 2019-09-23  8:59 ` Joris Offouga
  2019-09-23 12:24   ` Otavio Salvador
  2019-09-23  8:59 ` [U-Boot] [PATCH 2/2] pico-imx7d: Remove dead code for dm_video Joris Offouga
  1 sibling, 1 reply; 5+ messages in thread
From: Joris Offouga @ 2019-09-23  8:59 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Joris Offouga <offougajoris@gmail.com>
---
 board/technexion/pico-imx7d/pico-imx7d.c | 13 -------------
 configs/pico-dwarf-imx7d_defconfig       |  2 ++
 configs/pico-hobbit-imx7d_defconfig      |  2 ++
 configs/pico-imx7d_bl33_defconfig        |  2 ++
 configs/pico-imx7d_defconfig             |  2 ++
 configs/pico-nymph-imx7d_defconfig       |  2 ++
 configs/pico-pi-imx7d_defconfig          |  2 ++
 include/configs/pico-imx7d.h             |  1 +
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 916220516e..32b04b8fd6 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -19,10 +19,6 @@
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../../freescale/common/pfuze.h"
-#ifdef CONFIG_DM_VIDEO
-#include <bmp_logo_data.h>
-#include <video.h>
-#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -250,18 +246,9 @@ int board_init(void)
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 #ifdef CONFIG_DM_VIDEO
-	struct udevice *dev;
-	int ret;
-
-	ret = uclass_get_device(UCLASS_VIDEO, 0, &dev);
-	if (ret)
-		return ret;
 
 	setup_lcd();
 
-	ret = video_bmp_display(dev, (ulong)bmp_logo_bitmap, 0, 0, true);
-	if (ret)
-		return ret;
 #endif
 #ifdef CONFIG_FEC_MXC
 	setup_fec();
diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig
index 97de873e7c..5ddf8d9001 100644
--- a/configs/pico-dwarf-imx7d_defconfig
+++ b/configs/pico-dwarf-imx7d_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MII is not set
+CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
@@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
index f3ed298087..8628ba4275 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MII is not set
+CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
@@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig
index ba347d2507..d7752446cd 100644
--- a/configs/pico-imx7d_bl33_defconfig
+++ b/configs/pico-imx7d_bl33_defconfig
@@ -20,6 +20,7 @@ CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
+CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
@@ -63,4 +64,5 @@ CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y
 CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
 CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_OF_LIBFDT_OVERLAY=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index bad34555fa..56c64e2604 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MII is not set
+CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
@@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
diff --git a/configs/pico-nymph-imx7d_defconfig b/configs/pico-nymph-imx7d_defconfig
index 97de873e7c..5ddf8d9001 100644
--- a/configs/pico-nymph-imx7d_defconfig
+++ b/configs/pico-nymph-imx7d_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MII is not set
+CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
@@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index c44bc778ca..f9069d9b08 100644
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y
 CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MII is not set
+CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
@@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_DM_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 956c383a31..5c4b90a8a1 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -85,6 +85,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"image=zImage\0" \
 	"splashpos=m,m\0" \
+	"splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
 	"console=ttymxc4\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 2/2] pico-imx7d: Remove dead code for dm_video
  2019-09-23  8:59 [U-Boot] [PATCH 0/2] Fix pico-imx7d Joris Offouga
  2019-09-23  8:59 ` [U-Boot] [PATCH 1/2] pico-imx7d: fix splash logo drawing Joris Offouga
@ 2019-09-23  8:59 ` Joris Offouga
  2019-09-23 12:19   ` Otavio Salvador
  1 sibling, 1 reply; 5+ messages in thread
From: Joris Offouga @ 2019-09-23  8:59 UTC (permalink / raw)
  To: u-boot

Since convert dm_video, unused code introduced, so remove this

Signed-off-by: Joris Offouga <offougajoris@gmail.com>
---
 arch/arm/dts/imx7d-pico-u-boot.dtsi      | 31 ------------------------
 board/technexion/pico-imx7d/pico-imx7d.c | 11 ---------
 2 files changed, 42 deletions(-)

diff --git a/arch/arm/dts/imx7d-pico-u-boot.dtsi b/arch/arm/dts/imx7d-pico-u-boot.dtsi
index ef19de2b30..cc50f38fd6 100644
--- a/arch/arm/dts/imx7d-pico-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-pico-u-boot.dtsi
@@ -4,37 +4,6 @@
         usb0 = &usbotg1;
         display0 = &lcdif;
     };
-
-	backlight: backlight {
-		compatible = "pwm-backlight";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_backlight>;
-		pwms = <&pwm4 0 50000 0>;
-		brightness-levels = <0 36 72 108 144 180 216 255>;
-		default-brightness-level = <6>;
-		status = "okay";
-	};
-
-	reg_lcd_3v3: regulator-lcd-3v3 {
-		compatible = "regulator-fixed";
-		regulator-name = "lcd-3v3";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		gpio = <&gpio1 6 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
-	};
-
-	panel {
-		compatible = "vxt,vl050-8048nt-c01";
-		backlight = <&backlight>;
-		power-supply = <&reg_lcd_3v3>;
-
-		port {
-			panel_in: endpoint {
-				remote-endpoint = <&display_out>;
-			};
-		};
-	};
 };
 
 &usbotg1 {
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 32b04b8fd6..ebfe769547 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -33,13 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define I2C_PAD_CTRL    (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
 	PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
 
-
-#define LCD_PAD_CTRL    (PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
-			 PAD_CTL_DSE_3P3V_49OHM)
-
-#define LCD_SYNC_PAD_CTRL    (PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
-			      PAD_CTL_DSE_3P3V_196OHM)
-
 #ifdef CONFIG_SYS_I2C_MXC
 #define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
 
@@ -224,10 +217,6 @@ int board_early_init_f(void)
 }
 
 #ifdef CONFIG_DM_VIDEO
-static iomux_v3_cfg_t const lcd_pads[] = {
-	MX7D_PAD_GPIO1_IO11__GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
 void setup_lcd(void)
 {
 	imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 2/2] pico-imx7d: Remove dead code for dm_video
  2019-09-23  8:59 ` [U-Boot] [PATCH 2/2] pico-imx7d: Remove dead code for dm_video Joris Offouga
@ 2019-09-23 12:19   ` Otavio Salvador
  0 siblings, 0 replies; 5+ messages in thread
From: Otavio Salvador @ 2019-09-23 12:19 UTC (permalink / raw)
  To: u-boot

On Mon, Sep 23, 2019 at 5:59 AM Joris Offouga <offougajoris@gmail.com> wrote:
>
> Since convert dm_video, unused code introduced, so remove this
>
> Signed-off-by: Joris Offouga <offougajoris@gmail.com>

Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 1/2] pico-imx7d: fix splash logo drawing
  2019-09-23  8:59 ` [U-Boot] [PATCH 1/2] pico-imx7d: fix splash logo drawing Joris Offouga
@ 2019-09-23 12:24   ` Otavio Salvador
  0 siblings, 0 replies; 5+ messages in thread
From: Otavio Salvador @ 2019-09-23 12:24 UTC (permalink / raw)
  To: u-boot

On Mon, Sep 23, 2019 at 5:59 AM Joris Offouga <offougajoris@gmail.com> wrote:
>
> Signed-off-by: Joris Offouga <offougajoris@gmail.com>

Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-09-23 12:24 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-23  8:59 [U-Boot] [PATCH 0/2] Fix pico-imx7d Joris Offouga
2019-09-23  8:59 ` [U-Boot] [PATCH 1/2] pico-imx7d: fix splash logo drawing Joris Offouga
2019-09-23 12:24   ` Otavio Salvador
2019-09-23  8:59 ` [U-Boot] [PATCH 2/2] pico-imx7d: Remove dead code for dm_video Joris Offouga
2019-09-23 12:19   ` Otavio Salvador

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.