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

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

diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h
index 61c5547c55c7232906a6d68b5d6ca24b1b1722bd..4a2702791285abbc42692f01382567a4b14fdd1c 100644 (file)
--- a/include/configs/NETTA2.h
+++ b/include/configs/NETTA2.h
@@ -515,7 +515,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) \
@@ -750,7 +749,7 @@ typedef unsigned int led_id_t;
 #define CONFIG_CDP_DEVICE_ID_PREFIX    "NT"    /* netta2 */
 #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 NetTA2"
 #define CONFIG_CDP_TRIGGER             0x20020001
 #define CONFIG_CDP_POWER_CONSUMPTION   4300    /* 90 mA @ 48V */