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 commit 'u-boot/master' into for-1.3.1
[platform/kernel/u-boot.git]
/
include
/
configs
/
MPC8568MDS.h
diff --git
a/include/configs/MPC8568MDS.h
b/include/configs/MPC8568MDS.h
index
ba744e9
..
b9366cc
100644
(file)
--- a/
include/configs/MPC8568MDS.h
+++ b/
include/configs/MPC8568MDS.h
@@
-297,7
+297,7
@@
extern unsigned long get_clock_freq(void);
#define OF_SOC "soc8568@e0000000"
#define OF_QE "qe@e0080000"
#define OF_TBCLK (bd->bi_busfreq / 8)
#define OF_SOC "soc8568@e0000000"
#define OF_QE "qe@e0080000"
#define OF_TBCLK (bd->bi_busfreq / 8)
-#define OF_STDOUT_PATH "/soc8568@e0000000/serial@4
6
00"
+#define OF_STDOUT_PATH "/soc8568@e0000000/serial@4
5
00"
/*
* I2C
/*
* I2C
@@
-334,11
+334,6
@@
extern unsigned long get_clock_freq(void);
#define CFG_SRIO_MEM_BASE 0xc0000000
#define CFG_SRIO_MEM_BASE 0xc0000000
-#if defined(CONFIG_PCI)
-
-#define CONFIG_NET_MULTI
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#ifdef CONFIG_QE
/*
* QE UEC ethernet configuration
#ifdef CONFIG_QE
/*
* QE UEC ethernet configuration
@@
-377,6
+372,11
@@
extern unsigned long get_clock_freq(void);
#endif
#endif /* CONFIG_QE */
#endif
#endif /* CONFIG_QE */
+#if defined(CONFIG_PCI)
+
+#define CONFIG_NET_MULTI
+#define CONFIG_PCI_PNP /* do pci plug-and-play */
+
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP