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 tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm
[platform/kernel/u-boot.git]
/
include
/
configs
/
km_kirkwood.h
diff --git
a/include/configs/km_kirkwood.h
b/include/configs/km_kirkwood.h
index
e58a695
..
01482d5
100644
(file)
--- a/
include/configs/km_kirkwood.h
+++ b/
include/configs/km_kirkwood.h
@@
-23,7
+23,6
@@
/* KM_KIRKWOOD */
#if defined(CONFIG_KM_KIRKWOOD)
#define CONFIG_HOSTNAME "km_kirkwood"
/* KM_KIRKWOOD */
#if defined(CONFIG_KM_KIRKWOOD)
#define CONFIG_HOSTNAME "km_kirkwood"
-#define CONFIG_KM_DISABLE_PCIE
/* KM_KIRKWOOD_PCI */
#elif defined(CONFIG_KM_KIRKWOOD_PCI)
/* KM_KIRKWOOD_PCI */
#elif defined(CONFIG_KM_KIRKWOOD_PCI)
@@
-34,7
+33,6
@@
/* KM_KIRKWOOD_128M16 */
#elif defined(CONFIG_KM_KIRKWOOD_128M16)
#define CONFIG_HOSTNAME "km_kirkwood_128m16"
/* KM_KIRKWOOD_128M16 */
#elif defined(CONFIG_KM_KIRKWOOD_128M16)
#define CONFIG_HOSTNAME "km_kirkwood_128m16"
-#define CONFIG_KM_DISABLE_PCIE
/* KM_NUSA */
#elif defined(CONFIG_KM_NUSA)
/* KM_NUSA */
#elif defined(CONFIG_KM_NUSA)
@@
-44,7
+42,6
@@
/* KMCOGE5UN */
#elif defined(CONFIG_KM_COGE5UN)
#define CONFIG_HOSTNAME "kmcoge5un"
/* KMCOGE5UN */
#elif defined(CONFIG_KM_COGE5UN)
#define CONFIG_HOSTNAME "kmcoge5un"
-#define CONFIG_KM_DISABLE_PCIE
/* KM_SUSE2 */
#elif defined(CONFIG_KM_SUSE2)
/* KM_SUSE2 */
#elif defined(CONFIG_KM_SUSE2)
@@
-118,8
+115,4
@@
MVGBE_SET_MII_SPEED_TO_100)
#endif
MVGBE_SET_MII_SPEED_TO_100)
#endif
-#ifdef CONFIG_KM_DISABLE_PCIE
-#undef CONFIG_KIRKWOOD_PCIE_INIT
-#endif
-
#endif /* _CONFIG_KM_KIRKWOOD */
#endif /* _CONFIG_KM_KIRKWOOD */