m68k: mcf5445x: move CPU type to Kconfig and refactor config.mk

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

diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index de063b70d6f664c1437c0daf69e51eb5c344b6e0..be1750f62780b009e4b530c81c5b3850a8e92cd7 100644 (file)
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -18,8 +18,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MCF5441x        /* define processor family */
-#define CONFIG_M54418          /* define processor type */
 #define CONFIG_M54418TWR       /* M54418TWR board */
 
 #define CONFIG_MCFUART
@@ -77,7 +75,6 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define NAND_MAX_CHIPS                 CONFIG_SYS_MAX_NAND_DEVICE
 #define CONFIG_SYS_NAND_SELECT_DEVICE
-#define        CONFIG_SYS_64BIT_VSPRINTF       /* needed for nand_util.c */
 #endif
 
 /* Network configuration */
@@ -268,10 +265,8 @@
 /* End of used area in internal SRAM */
 #define CONFIG_SYS_INIT_RAM_SIZE       0x10000
 #define CONFIG_SYS_INIT_RAM_CTRL       0x221
-/* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE       256
 #define CONFIG_SYS_GBL_DATA_OFFSET     ((CONFIG_SYS_INIT_RAM_SIZE - \
-                                       CONFIG_SYS_GBL_DATA_SIZE) - 32)
+                                       GENERATED_GBL_DATA_SIZE) - 32)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 #define CONFIG_SYS_SBFHDR_DATA_OFFSET  (CONFIG_SYS_INIT_RAM_SIZE - 32)