projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
arch
/
powerpc
/
include
/
asm
/
config.h
diff --git
a/arch/powerpc/include/asm/config.h
b/arch/powerpc/include/asm/config.h
index 6aec815c712fc1acee3025a13ccbc180371e68ae..39eeb39901de7c1a32f2e31356e177a1bb6fbf01 100644
(file)
--- a/
arch/powerpc/include/asm/config.h
+++ b/
arch/powerpc/include/asm/config.h
@@
-31,8
+31,6
@@
#define CONFIG_LMB
#define CONFIG_SYS_BOOT_RAMDISK_HIGH
#define CONFIG_LMB
#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-#define CONFIG_SYS_BOOT_GET_CMDLINE
-#define CONFIG_SYS_BOOT_GET_KBD
#ifndef CONFIG_MAX_MEM_MAPPED
#if defined(CONFIG_E500) || \
#ifndef CONFIG_MAX_MEM_MAPPED
#if defined(CONFIG_E500) || \
@@
-72,11
+70,9
@@
#endif
/* The TSEC driver uses the PHYLIB infrastructure */
#endif
/* The TSEC driver uses the PHYLIB infrastructure */
-#ifndef CONFIG_PHYLIB
-#if defined(CONFIG_TSEC_ENET)
+#if defined(CONFIG_TSEC_ENET) && defined(CONFIG_PHYLIB)
#include <config_phylib_all_drivers.h>
#endif /* TSEC_ENET */
#include <config_phylib_all_drivers.h>
#endif /* TSEC_ENET */
-#endif /* !CONFIG_PHYLIB */
/* The FMAN driver uses the PHYLIB infrastructure */
/* The FMAN driver uses the PHYLIB infrastructure */