rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

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

diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index 7d232ca..9d2051d 100644 (file)
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -27,12 +27,6 @@
 #define __CONFIG_H
 
 /*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL            /* undef for developing */
-
-/*
  * High Level Configuration Options
  * (easy to change)
  */
@@ -40,6 +34,7 @@
 #define CONFIG_OMAP            1       /* in a TI OMAP core */
 #define CONFIG_OMAP1610                1       /* which is in a 1610 */
 #define CONFIG_H2_OMAP1610     1       /* on an H2 Board */
+#define CONFIG_MACH_OMAP_H2            /* Select board mach-type */
 
 /* input clock of PLL */
 /* the OMAP1610 H2 has 12MHz input clock */
@@ -51,6 +46,7 @@
 
 #define CONFIG_CMDLINE_TAG     1       /* enable passing of ATAGs */
 #define CONFIG_SETUP_MEMORY_TAGS       1
+#define CONFIG_INITRD_TAG              1
 
 /*
  * Size of malloc() pool
@@ -85,23 +81,32 @@
 #define CONFIG_BAUDRATE        115200
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 }
 
-#define CONFIG_COMMANDS        (CONFIG_CMD_DFL | CFG_CMD_DHCP)
-#define CONFIG_BOOTP_MASK      CONFIG_BOOTP_DEFAULT
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_DHCP
+
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+
+
 #include <configs/omap1510.h>
 
 #define CONFIG_BOOTDELAY       3
-#define CONFIG_BOOTARGS        "mem=32M console=ttyS0,115200n8 noinitrd \
-                               root=/dev/nfs rw nfsroot=157.87.82.48:\
-                               /home/a0875451/mwd/myfs/target ip=dhcp"
-#define CONFIG_NETMASK 255.255.254.0   /* talk on MY local net */
-#define CONFIG_IPADDR  156.117.97.156  /* static IP I currently own */
-#define CONFIG_SERVERIP        156.117.97.139  /* current IP of my dev pc */
-#define CONFIG_BOOTFILE        "uImage"        /* file to load */
-
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#define CONFIG_BOOTARGS        "console=ttyS0,115200n8 noinitrd root=/dev/nfs ip=dhcp"
+#define CONFIG_BOOTCOMMAND      "bootp;tftp;bootm"
+#define CFG_AUTOLOAD            "n"             /* No autoload */
+
+#if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   115200  /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  1       /* which serial port to use */
 #endif
@@ -145,18 +150,29 @@
 /*-----------------------------------------------------------------------
  * Physical Memory Map
  */
-#define CONFIG_NR_DRAM_BANKS   1       /* we have 1 bank of DRAM */
-#define PHYS_SDRAM_1   0x10000000      /* SDRAM Bank #1 */
+#define CONFIG_NR_DRAM_BANKS   1               /* we have 1 bank of DRAM */
+#define PHYS_SDRAM_1           0x10000000      /* SDRAM Bank #1 */
 #define PHYS_SDRAM_1_SIZE      0x02000000      /* 32 MB */
 
-#ifdef CONFIG_CS0_BOOT
-#define PHYS_FLASH_1   0x0C000000
-#endif
-#ifdef CONFIG_CS3_BOOT
-#define PHYS_FLASH_1   0x00000000
+#define PHYS_FLASH_1_BM1       0x00000000      /* Flash Bank #1 if booting from flash */
+#define PHYS_FLASH_1_BM0       0x0C000000      /* Flash Bank #1 if booting from RAM */
+
+#ifdef CONFIG_CS_AUTOBOOT                      /* Determine CS assignment in runtime */
+
+#ifndef __ASSEMBLY__
+extern unsigned long omap_flash_base;          /* set in flash__init */
 #endif
+#define CFG_FLASH_BASE         omap_flash_base
 
-#define CFG_FLASH_BASE PHYS_FLASH_1
+#elif defined(CONFIG_CS0_BOOT)
+
+#define CFG_FLASH_BASE         PHYS_FLASH_1_BM0
+
+#else
+
+#define CFG_FLASH_BASE         PHYS_FLASH_1_BM1
+
+#endif
 
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
@@ -171,7 +187,7 @@
 #define CFG_FLASH_ERASE_TOUT   (20*CFG_HZ)     /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (20*CFG_HZ)     /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CFG_ENV_SIZE   0x20000 /* Total Size of Environment Sector */
 #define CFG_ENV_OFFSET 0x20000 /* environment starts here */