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 git://www.denx.de/git/u-boot-sunxi
[platform/kernel/u-boot.git]
/
include
/
configs
/
siemens-am33x-common.h
diff --git
a/include/configs/siemens-am33x-common.h
b/include/configs/siemens-am33x-common.h
index
bf9752f
..
0d5dba1
100644
(file)
--- a/
include/configs/siemens-am33x-common.h
+++ b/
include/configs/siemens-am33x-common.h
@@
-148,8
+148,8
@@
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
-#define CONFIG_SYS_MMC_SD_F
AT_BOOT_PARTITION
1
-#define CONFIG_SPL_F
AT_LOAD_PAYLOAD_NAME
"u-boot.img"
+#define CONFIG_SYS_MMC_SD_F
S_BOOT_PARTITION
1
+#define CONFIG_SPL_F
S_LOAD_PAYLOAD_NAME
"u-boot.img"
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
#define CONFIG_FS_FAT
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
#define CONFIG_FS_FAT
@@
-231,7
+231,7
@@
#define CONFIG_MUSB_GADGET
#define CONFIG_MUSB_PIO_ONLY
#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT
#define CONFIG_MUSB_GADGET
#define CONFIG_MUSB_PIO_ONLY
#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT
-#
define
CONFIG_USB_GADGET_DUALSPEED
+#
undef
CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_VBUS_DRAW 2
#define CONFIG_MUSB_HOST
#define CONFIG_USB_GADGET_VBUS_DRAW 2
#define CONFIG_MUSB_HOST