diff options
author | Tom Rini <trini@konsulko.com> | 2017-04-13 21:31:06 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-04-13 21:31:06 (GMT) |
commit | b7b24a7a3cd74bb165d28a2959ed9143e3648fbf (patch) | |
tree | 062fd13092cee10dc8746a1339ecea18f08d21d6 /configs/rock_defconfig | |
parent | 1622559066d890f1b7622be0ede8a5d64de66ef3 (diff) | |
parent | 22e10be456014400788f80d45fc5f5c0b9d4a81d (diff) | |
download | u-boot-fsl-qoriq-b7b24a7a3cd74bb165d28a2959ed9143e3648fbf.tar.xz |
Merge git://git.denx.de/u-boot-dm
Here with some DM changes as well as the long-standing AT91 DM/DT
conversion patches which I have picked up via dm.
Diffstat (limited to 'configs/rock_defconfig')
-rw-r--r-- | configs/rock_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/rock_defconfig b/configs/rock_defconfig index 20a065a..b61286e 100644 --- a/configs/rock_defconfig +++ b/configs/rock_defconfig @@ -40,6 +40,7 @@ CONFIG_PMIC_ACT8846=y CONFIG_REGULATOR_ACT8846=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_RAM=y +# CONFIG_TPL_DM_SERIAL is not set CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART_BASE=0x20064000 CONFIG_DEBUG_UART_CLOCK=24000000 |