Avoid initrd and logbuffer area overlaps

[u-boot] / include / configs / mx1fs2.h

diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h
index 61a3b29612ef944fd214217a739073f3cbcccb18..d527d098f5774ae43cdf81239bf67d787596d2ba 100644 (file)
--- a/include/configs/mx1fs2.h
+++ b/include/configs/mx1fs2.h
@@ -34,22 +34,30 @@
 #undef _CONFIG_UART4 /* internal uart 4 */
 #undef CONFIG_SILENT_CONSOLE  /* use this to disable output */
 
+
 /*
- * 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_COMMANDS                (CONFIG_CMD_DFL          \
-                               & ~CFG_CMD_LOADS         \
-                               & ~CFG_CMD_CONSOLE       \
-                               & ~CFG_CMD_AUTOSCRIPT    \
-                               & ~CFG_CMD_NET           \
-                               & ~CFG_CMD_PING          \
-                               & ~CFG_CMD_DHCP          \
-                               | CFG_CMD_JFFS2          \
-                               )
-
-#include <cmd_confdefs.h>
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_JFFS2
+
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_CONSOLE
+#undef CONFIG_CMD_AUTOSCRIPT
+#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_PING
+#undef CONFIG_CMD_DHCP
+
 
 /*
  * Boot options. Setting delay to -1 stops autostart count down.
@@ -87,7 +95,6 @@
 #define         CONFIG_INITRD_TAG           1     /* send initrd params        */
 #undef CONFIG_VFD                       /* do not send framebuffer setup    */
 
-#define CFG_JFFS_CUSTOM_PART
 /*
  * Malloc pool need to host env + 128 Kb reserve for other allocations.
  */
@@ -113,8 +120,6 @@
 #define PRECHARGE_CMD 0x910a8300
 #define AUTOREFRESH_CMD 0xa10a8300
 
-#define CONFIG_INIT_CRITICAL
-
 #define BUS32BIT_VERSION
 /*
  * SDRAM Memory Map
@@ -138,10 +143,6 @@
 #define MX1FS2_FLASH_INTERLEAVE 2      /* ... made of 2 chips */
 #define MX1FS2_FLASH_BANK_SIZE 0x02000000  /* size of one flash bank*/
 #define MX1FS2_FLASH_SECT_SIZE 0x00020000  /* size of erase sector */
-#define MX1FS2_JFFS2_PART0_START 0x10200000
-#define MX1FS2_JFFS2_PART0_SIZE         0x00500000
-#define MX1FS2_JFFS2_PART1_START 0x10700000
-#define MX1FS2_JFFS2_PART1_SIZE         0x00900000
 #else
 #define MX1FS2_FLASH_BUS_WIDTH 2       /* we use 16 bit FLASH memory...     */
 #define MX1FS2_FLASH_INTERLEAVE 1      /* ... made of 1 chip */
@@ -167,11 +168,30 @@
  * 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
-#define CFG_JFFS2_NUM_BANKS            1
+
+/*
+ * JFFS2 partitions
+ */
+/* 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       0x00050000
+*/
+
+/* mtdparts command line support */
+/* Note: fake mtd_id used, no linux mtd map file */
+#define CONFIG_JFFS2_CMDLINE
+#define MTDIDS_DEFAULT         "nor0=mx1fs2-0"
+
+#ifdef BUS32BIT_VERSION
+#define MTDPARTS_DEFAULT       "mtdparts=mx1fs2-0:2m@5m(part0),5m@9m(part1)"
+#else
+#define MTDPARTS_DEFAULT       "mtdparts=mx1fs2-0:-@320k(jffs2)"
+#endif
 
 /*
  * Environment setup. Definitions of monitor location and size with