| Message ID | 20180125110556.76352-5-agraf@suse.de |
|---|---|
| State | Accepted |
| Commit | 71fc2e1459cae1ee544664dd454a125f692bddcf |
| Headers | show |
| Series | RPi: Properly handle dynamic serial configuration | expand |
On Thu, Jan 25, 2018 at 12:05:45PM +0100, Alexander Graf wrote: > 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> Applied to u-boot/master, thanks! -- Tom
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
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> --- include/configs/rpi.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)