From: Josep Orga <jorga@somdevices.com>
Date: Sun, 26 Apr 2020 09:21:58 +0000 (+0200)
Subject: arm: imx: Add SOMDEVICES panel with somdevices.bmp logo:
X-Git-Tag: rel_imx_4.19.35_1.1.0-somdevices.0~6
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=d50b29a9e7e01713d8b4954d84318fd9f702e890;p=u-boot.git

arm: imx: Add SOMDEVICES panel with somdevices.bmp logo:
	Remove logo version in splash screen.
	Remove Tux logo.
	Remove blinking cursor.
	To create bmp:
		convert somdevices.png -bordercolor white -channel RGBA -fuzz 20% -fill black -floodfill +0+0 white -resize 600x146\! -colors 200 -alpha off -type palette -compress none somdevices_small.bmp

Signed-off-by: Josep Orga <jorga@somdevices.com>
---

diff --git a/arch/arm/dts/imx6ull-somdevices.dts b/arch/arm/dts/imx6ull-somdevices.dts
index 2c801b2de7..d0a2901134 100644
--- a/arch/arm/dts/imx6ull-somdevices.dts
+++ b/arch/arm/dts/imx6ull-somdevices.dts
@@ -41,7 +41,7 @@
 
 	backlight {
 		compatible = "pwm-backlight";
-		pwms = <&pwm1 0 5000000>;
+		pwms = <&pwm1 0 2000000>;
 		brightness-levels = <0 4 8 16 32 64 128 255>;
 		default-brightness-level = <6>;
 		status = "okay";
@@ -636,8 +636,7 @@
 &lcdif {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_lcdif_dat
-		     &pinctrl_lcdif_ctrl
-		     &pinctrl_lcdif_reset>;
+		&pinctrl_lcdif_ctrl>;
 	display = <&display0>;
 	status = "okay";
 
@@ -648,14 +647,15 @@
 		display-timings {
 			native-mode = <&timing0>;
 			timing0: timing0 {
-			clock-frequency = <9200000>;
-			hactive = <480>;
-			vactive = <272>;
-			hfront-porch = <8>;
-			hback-porch = <4>;
-			hsync-len = <41>;
-			vback-porch = <2>;
-			vfront-porch = <4>;
+			//7INCH LCD
+			clock-frequency = <33000000>;
+			hactive = <800>;
+			vactive = <480>;
+			hfront-porch = <210>;
+			hback-porch = <30>;
+			hsync-len = <16>;
+			vback-porch = <13>;
+			vfront-porch = <22>;
 			vsync-len = <10>;
 
 			hsync-active = <0>;
diff --git a/board/somdevices/imx6ull_somdevices/imx6ull_somdevices.c b/board/somdevices/imx6ull_somdevices/imx6ull_somdevices.c
index fc4384b134..961c789cc0 100644
--- a/board/somdevices/imx6ull_somdevices/imx6ull_somdevices.c
+++ b/board/somdevices/imx6ull_somdevices/imx6ull_somdevices.c
@@ -314,15 +314,15 @@ struct display_info_t const displays[] = {{
 	.detect = NULL,
 	.enable	= do_enable_parallel_lcd,
 	.mode	= {
-		.name			= "TFT43AB",
-		.xres           = 480,
-		.yres           = 272,
-		.pixclock       = 108695,
-		.left_margin    = 8,
-		.right_margin   = 4,
-		.upper_margin   = 2,
-		.lower_margin   = 4,
-		.hsync_len      = 41,
+		.name			= "SOMDEVICES",
+		.xres           = 800,
+		.yres           = 480,
+		.pixclock       = 30303,
+		.left_margin    = 30,
+		.right_margin   = 210,
+		.upper_margin   = 13,
+		.lower_margin   = 22,
+		.hsync_len      = 16,
 		.vsync_len      = 10,
 		.sync           = 0,
 		.vmode          = FB_VMODE_NONINTERLACED
diff --git a/include/configs/imx6ull_somdevices.h b/include/configs/imx6ull_somdevices.h
index ed10df2484..73ae0e0863 100644
--- a/include/configs/imx6ull_somdevices.h
+++ b/include/configs/imx6ull_somdevices.h
@@ -85,7 +85,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
 	TEE_ENV \
-	"panel=TFT43AB\0" \
+	"panel=SOMDEVICES\0" \
 	"fdt_addr=0x83000000\0" \
 	"fdt_high=0xffffffff\0"	  \
 	"tee_addr=0x84000000\0" \
@@ -119,14 +119,16 @@
 	"tee_file=undefined\0" \
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
-	"panel=TFT43AB\0" \
+	"panel=SOMDEVICES\0" \
 	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
 	"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
 	"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 	"mmcautodetect=yes\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
 		BOOTARGS_CMA_SIZE \
-		"root=${mmcroot}\0" \
+		"root=${mmcroot} " \
+		"logo.nologo vt.global_cursor_default=0\0" \
+	"splashpos=100,167\0" \
 	"loadbootscript=" \
 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
@@ -324,6 +326,7 @@
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_VIDEO_SKIP
+#define CONFIG_HIDE_LOGO_VERSION
 #endif
 #endif
 
diff --git a/tools/logos/somdevices.bmp b/tools/logos/somdevices.bmp
new file mode 100644
index 0000000000..5b9efaa2ff
Binary files /dev/null and b/tools/logos/somdevices.bmp differ