From 90ad4e43a2bb4c3202c5ce22f1c077c808c788a3 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 27 Jun 2019 22:03:10 +0200 Subject: [PATCH] sunxi-u-boot: Don't try to load logo when there is no video output. This removes error displayed on serial console when trying to load image Signed-off-by: Igor Pecovnik --- .../u-boot/u-boot-sun50iw2/sunxi-boot-splash.patch | 13 ++++++++----- .../u-boot-sunxi-legacy/sunxi-boot-splash.patch | 13 ++++++++----- patch/u-boot/u-boot-sunxi/sunxi-boot-splash.patch | 13 ++++++++----- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/patch/u-boot/u-boot-sun50iw2/sunxi-boot-splash.patch b/patch/u-boot/u-boot-sun50iw2/sunxi-boot-splash.patch index 868cac93d4..85f4144089 100644 --- a/patch/u-boot/u-boot-sun50iw2/sunxi-boot-splash.patch +++ b/patch/u-boot/u-boot-sun50iw2/sunxi-boot-splash.patch @@ -51,12 +51,15 @@ index 02d7be0849..cbdea20d08 100644 /* Ethernet support */ #ifdef CONFIG_SUNXI_EMAC #define CONFIG_PHY_ADDR 1 -@@ -444,7 +454,7 @@ extern int soft_i2c_gpio_scl; - - #ifdef CONFIG_USB_KEYBOARD +@@ -442,6 +442,11 @@ extern int soft_i2c_gpio_scl; #define CONSOLE_STDIN_SETTINGS \ -- "preboot=usb start\0" \ -+ "preboot=run loadsplash; usb start\0" \ + "preboot=usb start\0" \ "stdin=serial,usbkbd\0" ++#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO ++#define CONSOLE_STDIN_SETTINGS \ ++ "preboot=run loadsplash; usb start\0" \ ++ "stdin=serial,usbkbd\0" ++#endif #else #define CONSOLE_STDIN_SETTINGS \ + "stdin=serial\0" diff --git a/patch/u-boot/u-boot-sunxi-legacy/sunxi-boot-splash.patch b/patch/u-boot/u-boot-sunxi-legacy/sunxi-boot-splash.patch index 868cac93d4..85f4144089 100644 --- a/patch/u-boot/u-boot-sunxi-legacy/sunxi-boot-splash.patch +++ b/patch/u-boot/u-boot-sunxi-legacy/sunxi-boot-splash.patch @@ -51,12 +51,15 @@ index 02d7be0849..cbdea20d08 100644 /* Ethernet support */ #ifdef CONFIG_SUNXI_EMAC #define CONFIG_PHY_ADDR 1 -@@ -444,7 +454,7 @@ extern int soft_i2c_gpio_scl; - - #ifdef CONFIG_USB_KEYBOARD +@@ -442,6 +442,11 @@ extern int soft_i2c_gpio_scl; #define CONSOLE_STDIN_SETTINGS \ -- "preboot=usb start\0" \ -+ "preboot=run loadsplash; usb start\0" \ + "preboot=usb start\0" \ "stdin=serial,usbkbd\0" ++#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO ++#define CONSOLE_STDIN_SETTINGS \ ++ "preboot=run loadsplash; usb start\0" \ ++ "stdin=serial,usbkbd\0" ++#endif #else #define CONSOLE_STDIN_SETTINGS \ + "stdin=serial\0" diff --git a/patch/u-boot/u-boot-sunxi/sunxi-boot-splash.patch b/patch/u-boot/u-boot-sunxi/sunxi-boot-splash.patch index 868cac93d4..85f4144089 100644 --- a/patch/u-boot/u-boot-sunxi/sunxi-boot-splash.patch +++ b/patch/u-boot/u-boot-sunxi/sunxi-boot-splash.patch @@ -51,12 +51,15 @@ index 02d7be0849..cbdea20d08 100644 /* Ethernet support */ #ifdef CONFIG_SUNXI_EMAC #define CONFIG_PHY_ADDR 1 -@@ -444,7 +454,7 @@ extern int soft_i2c_gpio_scl; - - #ifdef CONFIG_USB_KEYBOARD +@@ -442,6 +442,11 @@ extern int soft_i2c_gpio_scl; #define CONSOLE_STDIN_SETTINGS \ -- "preboot=usb start\0" \ -+ "preboot=run loadsplash; usb start\0" \ + "preboot=usb start\0" \ "stdin=serial,usbkbd\0" ++#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO ++#define CONSOLE_STDIN_SETTINGS \ ++ "preboot=run loadsplash; usb start\0" \ ++ "stdin=serial,usbkbd\0" ++#endif #else #define CONSOLE_STDIN_SETTINGS \ + "stdin=serial\0"