Merge branch 'master' of /home/wd/git/u-boot/custodians

[platform/kernel/u-boot.git] / include / configs / integratorcp.h

diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index a517429..6dbe4b3 100644 (file)
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -47,7 +47,7 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128*1024)
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
@@ -61,7 +61,7 @@
 /*
  * NS16550 Configuration
  */
-#define CFG_PL011_SERIAL
+#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK     14745600
 #define CONFIG_PL01x_PORTS     { (void *)CFG_SERIAL0, (void *)CFG_SERIAL1 }
 #define CONFIG_CONS_INDEX      0
@@ -72,6 +72,15 @@
 
 
 /*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
  * Command line configuration.
  */
 #define CONFIG_CMD_BDI
@@ -84,8 +93,6 @@
 #define CONFIG_CMD_PING
 
 
-/* #define CONFIG_BOOTP_MASK   CONFIG_BOOTP_DEFAULT */
-
 #if 0
 #define CONFIG_BOOTDELAY       2
 #define CONFIG_BOOTARGS        "root=/dev/nfs nfsroot=<IP address>:/<exported rootfs>  mem=128M ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
@@ -133,7 +140,7 @@ SIB at Block62 End Block62 address 0x24f80000
  */
 #define CONFIG_NR_DRAM_BANKS   1               /* we have 1 bank of DRAM */
 #define PHYS_SDRAM_1           0x00000000      /* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE      0x08000000      /* 128 MB */
+#define PHYS_SDRAM_1_SIZE      0x08000000      /* 128 MB */
 
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
@@ -149,42 +156,42 @@ SIB at Block62 End Block62 address 0x24f80000
 
  */
 #define CFG_FLASH_BASE         0x24000000
-#define CFG_MAX_FLASH_SECT     64
+#define CFG_MAX_FLASH_SECT     64
 #define CFG_MAX_FLASH_BANKS    1               /* max number of memory banks */
-#define PHYS_FLASH_SIZE        0x01000000      /* 16MB */
+#define PHYS_FLASH_SIZE                0x01000000      /* 16MB */
 #define CFG_FLASH_ERASE_TOUT   (2*CFG_HZ)      /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ)      /* Timeout for Flash Write */
 
 #define CFG_MONITOR_LEN                0x00100000
-#define CFG_ENV_IS_IN_FLASH    (1)
+#define CONFIG_ENV_IS_IN_FLASH 1
 
 /*
  * Move up the U-Boot & monitor area if more flash is fitted.
  * If this U-Boot is to be run on Integrators with varying flash sizes,
- * drivers/cfi_flash.c::flash_init() can read the Integrator CP_FLASHPROG
- * register and dynamically assign CFG_ENV_ADDR & CFG_MONITOR_BASE
+ * drivers/mtd/cfi_flash.c::flash_init() can read the Integrator CP_FLASHPROG
+ * register and dynamically assign CONFIG_ENV_ADDR & CFG_MONITOR_BASE
  * - CFG_MONITOR_BASE is set to indicate that the environment is not
  * embedded in the boot monitor(s) area
  */
 #if ( PHYS_FLASH_SIZE == 0x04000000 )
 
-#define CFG_ENV_ADDR           0x27F00000
+#define CONFIG_ENV_ADDR                0x27F00000
 #define CFG_MONITOR_BASE       0x27F40000
 
 #elif (PHYS_FLASH_SIZE == 0x02000000 )
 
-#define CFG_ENV_ADDR           0x25F00000
+#define CONFIG_ENV_ADDR                0x25F00000
 #define CFG_MONITOR_BASE       0x25F40000
 
 #else
 
-#define CFG_ENV_ADDR           0x24F00000
+#define CONFIG_ENV_ADDR                0x24F00000
 #define CFG_MONITOR_BASE       0x27F40000
 
 #endif
 
-#define CFG_ENV_SECT_SIZE      0x40000         /* 256KB */
-#define CFG_ENV_SIZE           8192            /* 8KB */
+#define CONFIG_ENV_SECT_SIZE   0x40000         /* 256KB */
+#define CONFIG_ENV_SIZE                8192            /* 8KB */
 /*-----------------------------------------------------------------------
  * CP control registers
  */