Merge branch 'master' of git://git.denx.de/u-boot-video

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

diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index 831af6a7d251123eefcaa76215b0482270fed38b..8afc3c03dbfaa9c437966832a0b70c50df4f758d 100644 (file)
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -225,9 +225,7 @@
 #define CONFIG_CMD_NAND                        /* enable NAND support */
 #define CONFIG_NAND_MPC5121_NFC
 #define CONFIG_SYS_NAND_BASE            0x40000000
-
 #define CONFIG_SYS_MAX_NAND_DEVICE      1
-#define NAND_MAX_CHIPS                  CONFIG_SYS_MAX_NAND_DEVICE
 #define CONFIG_SYS_NAND_SELECT_DEVICE  /* driver supports mutipl. chips */
 
 /*
@@ -344,7 +342,6 @@
  * Ethernet configuration
  */
 #define CONFIG_MPC512x_FEC     1
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_ADDR                0x1F
 #define CONFIG_MII             1       /* MII PHY management   */
 #define CONFIG_FEC_AN_TIMEOUT  1