summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorNeil Armstrong <narmstrong@baylibre.com>2018-07-26 11:45:46 +0200
committerNeil Armstrong <narmstrong@baylibre.com>2019-01-31 09:35:01 +0100
commitf0d090442bfa73df6b698e70122bd3261f4b2163 (patch)
tree5ddc48b416a836e1dbb85db1a5b01142be15c7e1 /include/configs
parent0cc53faf59bcf5e2f4640adfef562c04d2cb4d57 (diff)
configs: meson64: use vidconsole and usbkbd if enabled
Allows displaying the console via video and using a USB keyboard. Also enables CONFIG_SPLASH_SCREEN if using video. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> Reviewed-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/meson64.h23
1 files changed, 23 insertions, 0 deletions
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index 40ac079dfc..d82a674270 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -16,6 +16,26 @@
#define GICC_BASE 0xc4302000
#endif
+/* For splashscreen */
+#ifdef CONFIG_DM_VIDEO
+#define CONFIG_VIDEO_BMP_RLE8
+#define CONFIG_BMP_16BPP
+#define CONFIG_BMP_24BPP
+#define CONFIG_BMP_32BPP
+#define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SCREEN_ALIGN
+#define STDOUT_CFG "vidconsole,serial"
+#else
+#define STDOUT_CFG "serial"
+#endif
+
+#ifdef CONFIG_USB_KEYBOARD
+#define STDIN_CFG "usbkbd,serial"
+#define CONFIG_PREBOOT "usb start"
+#else
+#define STDIN_CFG "serial"
+#endif
+
#define CONFIG_CPU_ARMV8
#define CONFIG_REMAKE_ELF
#define CONFIG_ENV_SIZE 0x2000
@@ -59,6 +79,9 @@
#ifndef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
+ "stdin=" STDIN_CFG "\0" \
+ "stdout=" STDOUT_CFG "\0" \
+ "stderr=" STDOUT_CFG "\0" \
"fdt_addr_r=0x08008000\0" \
"scriptaddr=0x08000000\0" \
"kernel_addr_r=0x08080000\0" \