Socrates: config file cleanup.

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

diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h
index c88c4ab5ce2c29e1a15814b482f6e1c2c482e738..f2efe9f410ba87f52fb2361fac7d13d07f588fac 100644 (file)
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2003 ETC s.r.o.
  *
  * This program is free software; you can redistribute it and/or
@@ -36,23 +36,29 @@
 
 
 /*
- * Definition of u-boot build in commands. Check out CONFIG_CMD_DFL if
- * neccessary in include/cmd_confdefs.h file. (Un)comment for getting
- * functionality or size of u-boot code.
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
  */
-#define CONFIG_COMMANDS         (CONFIG_CMD_DFL                \
-                               & ~CFG_CMD_NET          \
-                               & ~CFG_CMD_LOADS        \
-                               & ~CFG_CMD_CONSOLE      \
-                               & ~CFG_CMD_AUTOSCRIPT   \
-/*                             | CFG_CMD_JFFS2 */      \
-                               )
-#include <cmd_confdefs.h>
+#include <config_cmd_default.h>
+
+#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_CONSOLE
+#undef CONFIG_CMD_AUTOSCRIPT
+
 
 /*
  * Boot options. Setting delay to -1 stops autostart count down.
  * NOTE: Sending parameters to kernel depends on kernel version and
- * 2.4.19-rmk6-pxa1 patch used while my u-boot coding didn't accept 
+ * 2.4.19-rmk6-pxa1 patch used while my u-boot coding didn't accept
  * parameters at all! Do not get confused by them so.
  */
 #define CONFIG_BOOTDELAY   -1
@@ -71,7 +77,7 @@
 #define CFG_BARGSIZE            CFG_CBSIZE            /* boot args buf size  */
 
 #define CFG_MEMTEST_START       0xa0400000            /* memtest test area   */
-#define CFG_MEMTEST_END         0xa0800000      
+#define CFG_MEMTEST_END         0xa0800000
 
 #undef  CFG_CLKS_IN_HZ                       /* use HZ for freq. display     */
 
@@ -93,6 +99,7 @@
  * Malloc pool need to host env + 128 Kb reserve for other allocations.
  */
 #define CFG_MALLOC_LEN   (CFG_ENV_SIZE + (128<<10) )
+#define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_STACKSIZE        (120<<10)      /* stack size */
 
@@ -125,10 +132,10 @@
 /*
  * Configuration for FLASH memory
  */
-#define CFG_MAX_FLASH_BANKS            1       /* FLASH banks count (not chip count)*/
-#define CFG_MAX_FLASH_SECT             128     /* number of sector in FLASH bank    */
-#define WEP_FLASH_BUS_WIDTH    4       /* we use 32 bit FLASH memory...     */
-#define WEP_FLASH_INTERLEAVE   2       /* ... made of 2 chips */ 
+#define CFG_MAX_FLASH_BANKS    1       /* FLASH banks count (not chip count)*/
+#define CFG_MAX_FLASH_SECT     128     /* number of sector in FLASH bank    */
+#define WEP_FLASH_BUS_WIDTH    4       /* we use 32 bit FLASH memory...     */
+#define WEP_FLASH_INTERLEAVE   2       /* ... made of 2 chips */
 #define WEP_FLASH_BANK_SIZE  0x2000000  /* size of one flash bank*/
 #define WEP_FLASH_SECT_SIZE  0x0040000  /* size of erase sector */
 #define WEP_FLASH_BASE       0x0000000  /* location of flash memory */
@@ -137,9 +144,9 @@
 
 /* This should be defined if CFI FLASH device is present. Actually benefit
    is not so clear to me. In other words we can provide more informations
-   to user, but this expects more complex flash handling we do not provide 
+   to user, but this expects more complex flash handling we do not provide
    now.*/
-#undef  CFG_FLASH_CFI  
+#undef  CFG_FLASH_CFI
 
 #define CFG_FLASH_ERASE_TOUT    (2*CFG_HZ)    /* timeout for Erase operation */
 #define CFG_FLASH_WRITE_TOUT    (2*CFG_HZ)    /* timeout for Write operation */
@@ -151,7 +158,7 @@
  * Right now there is no gain for user, but later on booting kernel might be
  * possible. Consider using XIP kernel running from flash to save RAM
  * footprint.
- * NOTE: Enable CFG_CMD_JFFS2 for JFFS2 support.
+ * NOTE: Enable CONFIG_CMD_JFFS2 for JFFS2 support.
  */
 #define CFG_JFFS2_FIRST_BANK           0
 #define CFG_JFFS2_FIRST_SECTOR         5
@@ -173,7 +180,7 @@
 #define CFG_MONITOR_LEN                0x20000         /* 128kb ( 1 flash sector )  */
 #define CFG_ENV_IS_IN_FLASH    1
 #define CFG_ENV_ADDR           0x20000         /* absolute address for now  */
-#define CFG_ENV_SIZE           0x2000          
+#define CFG_ENV_SIZE           0x2000
 
 #undef  CONFIG_ENV_OVERWRITE                    /* env is not writable now   */
 
@@ -185,4 +192,3 @@
 #define CFG_LOAD_ADDR        0x40000
 
 #endif  /* __CONFIG_H */
-