Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index b75dbeef6220a7e26dba8184459529c1d767e6d5..816c571511f9b749c0abcee78c2661faeb717a64 100644 (file)
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -102,7 +102,7 @@
        "run mmcboot;" \
        "run nandboot;"
 
-/* NS16550 Configuration: primary UART via FDTI */
+/* NS16550 Configuration: primary UART via FTDI */
 #define CONFIG_SYS_NS16550_COM1                0x44e09000
 #define CONFIG_BAUDRATE                        115200
 
@@ -149,7 +149,6 @@
                                          174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,\
                                          194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209}
 
-
 #define CONFIG_SYS_NAND_ECCSIZE                512
 #define CONFIG_SYS_NAND_ECCBYTES       26
 #define CONFIG_SYS_NAND_ECCSTEPS       8
@@ -162,11 +161,8 @@
 /* #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 */
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x200000
 
-
-
 #define CONFIG_CMD_MTDPARTS
 
-#define CONFIG_CMD_ASKENV /* monitor functions : ask for env variable */
 #define CONFIG_VERSION_VARIABLE /* monitor functions :  u-boot version */
 #define CONFIG_CMD_DIAG /* monitor functions : Diagnostics */
 
@@ -204,7 +200,6 @@
 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
 
 #if defined(CONFIG_USB_MUSB_HOST)
-#define CONFIG_CMD_USB
 #define CONFIG_USB_STORAGE
 #endif
 
@@ -218,7 +213,6 @@
 #define CONFIG_NET_MULTI
 
 /* Network */
-#define CONFIG_CMD_MII
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_RESET       1
 #define CONFIG_PHY_NATSEMI