rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index f884519..f9535c9 100644 (file)
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -31,16 +31,10 @@
 #define __CONFIG_H
 
 /*
- * If we are developing, we might want to start U-Boot 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)
  */
-#define CONFIG_PXA250          1       /* This is an PXA250 CPU            */
+#define CONFIG_PXA250          1       /* This is an PXA250 CPU            */
 #define CONFIG_INNOKOM         1       /* on an Auerswald Innokom board    */
 
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff      */
@@ -60,10 +54,34 @@
 #define CONFIG_BAUDRATE                19200
 #define CONFIG_MISC_INIT_R     1       /* we have a misc_init_r() function */
 
-#define CONFIG_COMMANDS (CFG_CMD_BDI|CFG_CMD_LOADB|CFG_CMD_IMI|CFG_CMD_FLASH|CFG_CMD_MEMORY|CFG_CMD_NET|CFG_CMD_ENV|CFG_CMD_RUN|CFG_CMD_ASKENV|CFG_CMD_ECHO|CFG_CMD_I2C|CFG_CMD_DHCP|CFG_CMD_CACHE)
-/* CONFIG_CMD_DFL|CFG_CMD_I2C|CFG_CMD_EEPROM|CFG_CMD_NET|CFG_CMD_JFFS2|CFG_CMD_DHCP) */
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any)   */
-#include <cmd_confdefs.h>
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_BDI
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ECHO
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IMI
+#define CONFIG_CMD_LOADB
+#define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_RUN
+
 
 #define CONFIG_BOOTDELAY       3
 /* #define CONFIG_BOOTARGS     "root=/dev/nfs ip=bootp console=ttyS0,19200" */
@@ -118,14 +136,14 @@
 /*
  * I2C bus
  */
-#define CONFIG_HARD_I2C                1
-#define CFG_I2C_SPEED                  50000
-#define CFG_I2C_SLAVE                  0xfe
+#define CONFIG_HARD_I2C                        1
+#define CFG_I2C_SPEED                  50000
+#define CFG_I2C_SLAVE                  0xfe
 
-#define CFG_ENV_IS_IN_EEPROM           1
+#define CONFIG_ENV_IS_IN_EEPROM                1
 
-#define CFG_ENV_OFFSET                 0x00    /* environment starts here  */
-#define CFG_ENV_SIZE                   1024    /* 1 KiB                    */
+#define CONFIG_ENV_OFFSET                      0x00    /* environment starts here  */
+#define CONFIG_ENV_SIZE                        1024    /* 1 KiB                    */
 #define CFG_I2C_EEPROM_ADDR            0x50    /* A0 = 0 (hardwired)       */
 #define CFG_EEPROM_PAGE_WRITE_BITS     5       /* 5 bits = 32 octets       */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 15      /* between stop and start   */
@@ -170,14 +188,42 @@
 
 #define CFG_FLASH_BASE          PHYS_FLASH_1
 
-
 /*
- * JFFS2 Partitions
+ * JFFS2 partitions
+ *
  */
-#define CFG_JFFS_CUSTOM_PART   1               /* see board/innokom/flash.c */
-#define CONFIG_MTD_INNOKOM_16MB 1              /* development flash         */
-#undef  CONFIG_MTD_INNOKOM_64MB                        /* production flash          */
+/* development flash */
+#define CONFIG_MTD_INNOKOM_16MB        1
+#undef CONFIG_MTD_INNOKOM_64MB
+
+/* production flash */
+/*
+#define CONFIG_MTD_INNOKOM_64MB        1
+#undef CONFIG_MTD_INNOKOM_16MB
+*/
 
+/* No command line, one static partition, whole device */
+#undef CONFIG_JFFS2_CMDLINE
+#define CONFIG_JFFS2_DEV               "nor0"
+#define CONFIG_JFFS2_PART_SIZE         0xFFFFFFFF
+#define CONFIG_JFFS2_PART_OFFSET       0x00000000
+
+/* mtdparts command line support */
+/* Note: fake mtd_id used, no linux mtd map file */
+/*
+#define CONFIG_JFFS2_CMDLINE
+#define MTDIDS_DEFAULT         "nor0=innokom-0"
+*/
+
+/* development flash */
+/*
+#define MTDPARTS_DEFAULT       "mtdparts=innokom-0:256k(uboot),768k(kernel),8m(user),7m(data)"
+*/
+
+/* production flash */
+/*
+#define MTDPARTS_DEFAULT       "mtdparts=innokom-0:256k(uboot),768k(kernel),16256k(user1),16256k(user2),32m(data)"
+*/
 
 /*
  * GPIO settings