summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorShaohui Xie <b21989@freescale.com>2011-05-12 18:46:40 +0800
committerKumar Gala <galak@kernel.crashing.org>2011-05-18 09:15:25 -0500
commitbe827c7ab033c972c87f9b1f36a0d574a14b2acb (patch)
tree29868a034626e275c242dc21f94cea23e88501c8 /include/configs
parent2dd3095d878e7066bda003a63ea8b232c19a7041 (diff)
downloadu-boot-imx-be827c7ab033c972c87f9b1f36a0d574a14b2acb.zip
u-boot-imx-be827c7ab033c972c87f9b1f36a0d574a14b2acb.tar.gz
u-boot-imx-be827c7ab033c972c87f9b1f36a0d574a14b2acb.tar.bz2
powerpc/85xx: add support for env in MMC/SPI on corenet ds boards
Signed-off-by: Shaohui Xie <b21989@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/corenet_ds.h30
1 files changed, 22 insertions, 8 deletions
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 561f3c2..9ba032b 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -68,17 +68,34 @@
#define CONFIG_ENV_OVERWRITE
-#if defined(CONFIG_RAMBOOT_PBL)
- #define CONFIG_SYS_NO_FLASH /* Store ENV in memory only */
-#endif
-
#ifdef CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_IS_NOWHERE
#else
-#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
+#endif
+
+#if defined(CONFIG_SPIFLASH)
+#define CONFIG_SYS_EXTRA_ENV_RELOC
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_SPI_BUS 0
+#define CONFIG_ENV_SPI_CS 0
+#define CONFIG_ENV_SPI_MAX_HZ 10000000
+#define CONFIG_ENV_SPI_MODE 0
+#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
+#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
+#define CONFIG_ENV_SECT_SIZE 0x10000
+#elif defined(CONFIG_SDCARD)
+#define CONFIG_SYS_EXTRA_ENV_RELOC
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV 0
+#define CONFIG_ENV_SIZE 0x2000
+#define CONFIG_ENV_OFFSET (512 * 1097)
+#else
+#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE 0x2000
+#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
#endif
#define CONFIG_SYS_CLK_FREQ get_board_sys_clk() /* sysclk for MPC85xx */
@@ -513,9 +530,6 @@
/*
* Environment
*/
-#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
-
#define CONFIG_LOADS_ECHO /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */