pl011: Convert CONFIG_PL011_SERIAL to Kconfig

[u-boot] / include / configs / vexpress_common.h

diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index bcaf5c9426a023089a45119341dce986262e8b70..94a352fef7d5f23e311b3dbae07cca7c4a79d58e 100644 (file)
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -55,7 +55,6 @@
 #define V2M_NOR1               (V2M_PA_CS1)
 #define V2M_SRAM               (V2M_PA_CS2)
 #define V2M_VIDEO_SRAM         (V2M_PA_CS3 + 0x00000000)
-#define V2M_LAN9118            (V2M_PA_CS3 + 0x02000000)
 #define V2M_ISP1761            (V2M_PA_CS3 + 0x03000000)
 
 /* Common peripherals relative to CS7. */
@@ -133,13 +132,7 @@
 #define CONFIG_SYS_TIMER_COUNTER       (V2M_TIMER01 + 0x4)
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 
-/* SMSC9115 Ethernet from SMSC9118 family */
-#define CONFIG_SMC911X                 1
-#define CONFIG_SMC911X_32_BIT          1
-#define CONFIG_SMC911X_BASE            V2M_LAN9118
-
 /* PL011 Serial Configuration */
-#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK             24000000
 #define CONFIG_PL01x_PORTS             {(void *)CONFIG_SYS_SERIAL0, \
                                         (void *)CONFIG_SYS_SERIAL1}
@@ -183,10 +176,6 @@
 #include <config_distro_defaults.h>
 
 /* Basic environment settings */
-#define CONFIG_BOOTCOMMAND \
-       "run distro_bootcmd; " \
-       "run bootflash; "
-
 #define BOOT_TARGET_DEVICES(func) \
         func(MMC, mmc, 1) \
         func(MMC, mmc, 0) \