diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-11 10:29:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-11 10:29:28 -0500 |
| commit | f7a5f025ba0bc405e321df4dd55b73a7995ba527 (patch) | |
| tree | 321f7881fcde27920ffab72f93ec237e56e2c59b /drivers | |
| parent | a5d4785ccb4ae8c5414490b14a9112a944318217 (diff) | |
| parent | eb623b98c9d28691cbce5adfd02163ad102dcbed (diff) | |
| download | talos-obmc-uboot-f7a5f025ba0bc405e321df4dd55b73a7995ba527.tar.gz talos-obmc-uboot-f7a5f025ba0bc405e321df4dd55b73a7995ba527.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/core/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/serial/serial-uclass.c | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index 53acee05fa..f332480e1d 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -155,7 +155,7 @@ config OF_TRANSLATE smaller in size than fdt_translate_address(). config SPL_OF_TRANSLATE - bool "Translate addresses using fdt_translate_address" + bool "Translate addresses using fdt_translate_address in SPL" depends on SPL_DM && SPL_OF_CONTROL default n help diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 842f78bff3..4bf9a5c681 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -64,9 +64,9 @@ static void serial_find_console_or_panic(void) } /* - * If the console is not marked to be bound before relocation, - * bind it anyway. - */ + * If the console is not marked to be bound before relocation, + * bind it anyway. + */ if (node > 0 && !lists_bind_fdt(gd->dm_root, blob, node, &dev)) { if (!device_probe(dev)) { @@ -77,13 +77,13 @@ static void serial_find_console_or_panic(void) } if (!SPL_BUILD || !CONFIG_IS_ENABLED(OF_CONTROL) || !blob) { /* - * Try to use CONFIG_CONS_INDEX if available (it is numbered - * from 1!). - * - * Failing that, get the device with sequence number 0, or in - * extremis just the first serial device we can find. But we - * insist on having a console (even if it is silent). - */ + * Try to use CONFIG_CONS_INDEX if available (it is numbered + * from 1!). + * + * Failing that, get the device with sequence number 0, or in + * extremis just the first serial device we can find. But we + * insist on having a console (even if it is silent). + */ #ifdef CONFIG_CONS_INDEX #define INDEX (CONFIG_CONS_INDEX - 1) #else |
