diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-02 14:52:26 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-02 14:52:26 (GMT) |
| commit | ec7483e34ea932fb68267dc0b1de30be51f271c9 (patch) | |
| tree | 6120e2d0923962ec16cc757a22454bc942c90af4 /include/configs/ls1046ardb.h | |
| parent | 07d778382200a05a8b86cc135f79ec48e386f25a (diff) | |
| parent | ec85721c8b94f9eb6807ebb15a223e4ec49a092a (diff) | |
| download | u-boot-ec7483e34ea932fb68267dc0b1de30be51f271c9.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/ls1046aqds.h
include/configs/ls1046ardb.h
Diffstat (limited to 'include/configs/ls1046ardb.h')
| -rw-r--r-- | include/configs/ls1046ardb.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 10af410..3d3dfb1 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -219,7 +219,6 @@ #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_XHCI_DWC3 #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -#define CONFIG_CMD_USB #define CONFIG_USB_STORAGE #endif #endif @@ -239,10 +238,9 @@ #endif #ifndef SPL_NO_MISC -#define CONFIG_BOOTCOMMAND "sf probe 0:0;sf read $kernel_load" \ - "$kernel_start $kernel_size;" \ - "bootm $kernel_load" - +#undef CONFIG_BOOTCOMMAND +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \ + "&& esbc_halt; run qspi_bootcmd;" #define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:1m(rcw)," \ "15m(u-boot),48m(kernel.itb);" \ "7e800000.flash:16m(nand_uboot)," \ |