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

[oweals/u-boot.git] / include / configs / NETPHONE.h

diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index a147aff40714a658c2bad6f2e7b5c51ff1bda7ef..2d04d89251c18c91b29a7f759d9a0199c89a027a 100644 (file)
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -514,7 +514,6 @@
 #define ADDR_COLUMN_PAGE       3
 #define NAND_ChipID_UNKNOWN    0x00
 #define NAND_MAX_FLOORS                1
-#define NAND_MAX_CHIPS         1
 
 /* ALE = PD17, CLE = PE18, CE = PE20, F_RY_BY = PE31 */
 #define NAND_DISABLE_CE(nand) \
@@ -799,7 +798,7 @@ typedef unsigned int led_id_t;
 #define CONFIG_CDP_DEVICE_ID_PREFIX    "NP"    /* netphone */
 #define CONFIG_CDP_PORT_ID             "eth%d"
 #define CONFIG_CDP_CAPABILITIES                0x00000010
-#define CONFIG_CDP_VERSION             "u-boot" " " __DATE__ " " __TIME__
+#define CONFIG_CDP_VERSION             "u-boot" " " U_BOOT_DATE " " U_BOOT_TIME
 #define CONFIG_CDP_PLATFORM            "Intracom NetPhone"
 #define CONFIG_CDP_TRIGGER             0x20020001
 #define CONFIG_CDP_POWER_CONSUMPTION   4300    /* 90 mA @ 48V */