diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-02 10:52:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-02 10:52:26 -0400 |
| commit | ec7483e34ea932fb68267dc0b1de30be51f271c9 (patch) | |
| tree | 6120e2d0923962ec16cc757a22454bc942c90af4 /include/configs/ls1046aqds.h | |
| parent | 07d778382200a05a8b86cc135f79ec48e386f25a (diff) | |
| parent | ec85721c8b94f9eb6807ebb15a223e4ec49a092a (diff) | |
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/ls1046aqds.h')
| -rw-r--r-- | include/configs/ls1046aqds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 53cdcf2caf..9dc74b4f09 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -144,7 +144,6 @@ unsigned long get_board_ddr_clk(void); #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 @@ -460,6 +459,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMDLINE_TAG +#undef CONFIG_BOOTCOMMAND #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_BOOTCOMMAND "sf probe && sf read $kernel_load " \ "e0000 f00000 && bootm $kernel_load" |