From: Alexander Graf <agraf@suse.de>
Date: Thu, 25 Jan 2018 11:05:45 +0000 (+0100)
Subject: rpi: Determine PL011/Mini-UART availability at runtime
X-Git-Tag: v2018.03-rc1~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=71fc2e1459cae1ee544664dd454a125f692bddcf;p=oweals%2Fu-boot.git

rpi: Determine PL011/Mini-UART availability at runtime

Firmware on the Raspberry Pi family of devices can dynamically configure either
the PL011, Mini-UART or no device at all to be routed to the user accessible
UART pins.

That means we need to always include both drivers, because we can never be sure
which of the two serial devices firmware actually chooses to use.

Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index cab8661779..2c84cf9a49 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -75,12 +75,9 @@
 #define CONFIG_MISC_INIT_R
 #endif
 
-/* Console UART */
-#if defined (CONFIG_BCM2837) || defined(CONFIG_TARGET_RPI_0_W)
+/* Console UART, can be configured dynamically in config.txt */
 #define CONFIG_BCM283X_MU_SERIAL
-#else
 #define CONFIG_PL01X_SERIAL
-#endif
 
 /* Console configuration */
 #define CONFIG_SYS_CBSIZE		1024