New board support: Nokia RX-51 aka N900

[karo-tx-uboot.git] / include / configs / csb472.h

diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index ad8811f6c4cd7c208d53e55c603f5a54f6a8a716..aed5fa6a453e806759cfdf933c9fc525bd5f5bd7 100644 (file)
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -122,9 +122,6 @@
  *
  */
 #undef CONFIG_SYS_HUSH_PARSER                  /* use "hush" command parser */
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "    /* hush shell secondary prompt */
-#endif
 
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory */
 #define CONFIG_SYS_PROMPT              "=> "   /* Monitor Command Prompt */
@@ -192,7 +189,6 @@
 #define CONFIG_PHY_CMD_DELAY   40      /* PHY COMMAND delay            */
                                        /* 32usec min. for LXT971A      */
 #define CONFIG_PHY_RESET_DELAY 300     /* PHY RESET recovery delay     */
-#define CONFIG_NET_MULTI
 
 /*
  * RTC configuration
@@ -292,9 +288,8 @@
  *
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_OCM_DATA_ADDR /* inside of on-chip SRAM */
-#define CONFIG_SYS_INIT_RAM_END        CONFIG_SYS_OCM_DATA_SIZE /* End of used area in RAM */
-#define CONFIG_SYS_GBL_DATA_SIZE       128 /* byte size reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       CONFIG_SYS_OCM_DATA_SIZE /* Size of used area in RAM */
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 /*
@@ -303,13 +298,4 @@
  */
 #define CONFIG_I2CFAST         1       /* enable "i2cfast" env. setting     */
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- *
- */
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM          0x02    /* Software reboot */
-
 #endif /* __CONFIG_H */