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 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
include
/
configs
/
delta.h
diff --git
a/include/configs/delta.h
b/include/configs/delta.h
index
09667ed
..
1db962a
100644
(file)
--- a/
include/configs/delta.h
+++ b/
include/configs/delta.h
@@
-123,6
+123,8
@@
#define CONFIG_USB_STORAGE 1
#define CONFIG_DOS_PARTITION 1
#define CONFIG_USB_STORAGE 1
#define CONFIG_DOS_PARTITION 1
+#include <asm/arch/pxa-regs.h> /* for OHCI_REGS_BASE */
+
#undef CFG_USB_OHCI_BOARD_INIT
#define CFG_USB_OHCI_CPU_INIT 1
#define CFG_USB_OHCI_REGS_BASE OHCI_REGS_BASE
#undef CFG_USB_OHCI_BOARD_INIT
#define CFG_USB_OHCI_CPU_INIT 1
#define CFG_USB_OHCI_REGS_BASE OHCI_REGS_BASE
@@
-215,7
+217,7
@@
/*
* NAND Flash
*/
/*
* NAND Flash
*/
-#undef C
F
G_NAND_LEGACY
+#undef C
ONFI
G_NAND_LEGACY
#define CFG_NAND0_BASE 0x0 /* 0x43100040 */ /* 0x10000000 */
#undef CFG_NAND1_BASE
#define CFG_NAND0_BASE 0x0 /* 0x43100040 */ /* 0x10000000 */
#undef CFG_NAND1_BASE