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-net
[platform/kernel/u-boot.git]
/
include
/
configs
/
MPC8572DS.h
diff --git
a/include/configs/MPC8572DS.h
b/include/configs/MPC8572DS.h
index
bb7f38e
..
e063c7a
100644
(file)
--- a/
include/configs/MPC8572DS.h
+++ b/
include/configs/MPC8572DS.h
@@
-15,10
+15,6
@@
#include "../board/freescale/common/ics307_clk.h"
#include "../board/freescale/common/ics307_clk.h"
-#ifdef CONFIG_36BIT
-#define CONFIG_PHYS_64BIT
-#endif
-
#ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xeff40000
#endif
#ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xeff40000
#endif
@@
-587,7
+583,6
@@
#ifdef CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_PCI
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#ifdef CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_PCI
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#define CONFIG_USB_STORAGE
#define CONFIG_PCI_EHCI_DEVICE 0
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
#endif
#define CONFIG_PCI_EHCI_DEVICE 0
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
#endif
@@
-646,7
+641,6
@@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
@@
-669,7
+663,7
@@
"consoledev=ttyS0\0" \
"ramdiskaddr=2000000\0" \
"ramdiskfile=8572ds/ramdisk.uboot\0" \
"consoledev=ttyS0\0" \
"ramdiskaddr=2000000\0" \
"ramdiskfile=8572ds/ramdisk.uboot\0" \
-"fdtaddr=
c00000\0"
\
+"fdtaddr=
1e00000\0"
\
"fdtfile=8572ds/mpc8572ds.dtb\0" \
"bdev=sda3\0"
"fdtfile=8572ds/mpc8572ds.dtb\0" \
"bdev=sda3\0"