projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mmc
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx6sabresd.h
diff --git
a/include/configs/mx6sabresd.h
b/include/configs/mx6sabresd.h
index
10c229d
..
a8c0e03
100644
(file)
--- a/
include/configs/mx6sabresd.h
+++ b/
include/configs/mx6sabresd.h
@@
-11,7
+11,6
@@
#ifdef CONFIG_SPL
#include "imx6_spl.h"
#ifdef CONFIG_SPL
#include "imx6_spl.h"
-#undef CONFIG_SPL_EXT_SUPPORT
#endif
#define CONFIG_MACH_TYPE 3980
#endif
#define CONFIG_MACH_TYPE 3980
@@
-24,8
+23,9
@@
#include "mx6sabre_common.h"
/* Falcon Mode */
#include "mx6sabre_common.h"
/* Falcon Mode */
+#define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
+#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
#define CONFIG_CMD_SPL
#define CONFIG_CMD_SPL
-#define CONFIG_SPL_OS_BOOT
#define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
#define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)
#define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
#define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)
@@
-63,8
+63,6
@@
/* USB Configs */
#ifdef CONFIG_CMD_USB
/* USB Configs */
#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MX6
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX