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://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
pengwyn.h
diff --git
a/include/configs/pengwyn.h
b/include/configs/pengwyn.h
index
4130f53
..
34f88e5
100644
(file)
--- a/
include/configs/pengwyn.h
+++ b/
include/configs/pengwyn.h
@@
-183,7
+183,6
@@
* add mass storage support.
*/
#define CONFIG_USB_MUSB_DSPS
* add mass storage support.
*/
#define CONFIG_USB_MUSB_DSPS
-#define CONFIG_ARCH_MISC_INIT
#define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
#define CONFIG_AM335X_USB0
#define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
#define CONFIG_AM335X_USB0
@@
-207,6
+206,6
@@
/* CPSW support */
/* CPSW support */
-#define CONFIG_SPL_LDSCRIPT "
$(CPUDIR)
/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT "
arch/arm/mach-omap2
/am33xx/u-boot-spl.lds"
#endif /* ! __CONFIG_PENGWYN_H */
#endif /* ! __CONFIG_PENGWYN_H */