summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaohui Xie <Shaohui.Xie@freescale.com>2012-06-28 23:35:34 +0000
committerAndy Fleming <afleming@freescale.com>2012-08-08 17:13:38 -0500
commit0f57f6a3fe26a9c2d69b34e9caf8f83082d77636 (patch)
tree40b4d523ad3b7fd7d5b59a0d1cb8af2fd961dd9e
parent535a159ab677d553652843b1bd1c16106c42f66f (diff)
downloadu-boot-imx-0f57f6a3fe26a9c2d69b34e9caf8f83082d77636.zip
u-boot-imx-0f57f6a3fe26a9c2d69b34e9caf8f83082d77636.tar.gz
u-boot-imx-0f57f6a3fe26a9c2d69b34e9caf8f83082d77636.tar.bz2
powerpc/corenet: fix compile error when CONFIG_SYS_NO_FLASH is defined
ENV location compile logic is wrong, and when CONFIG_SYS_NO_FLASH is defined and non-NOR u-boot is building, it will cause compile error. Also, add CONFIG_SYS_FLASH_USE_BUFFER_WRITE for p2041, which will improve NOR flash write performance. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
-rw-r--r--include/configs/P2041RDB.h5
-rw-r--r--include/configs/corenet_ds.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 1251b5c..1c0eb74 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -73,10 +73,13 @@
#define CONFIG_ENV_OVERWRITE
#ifdef CONFIG_SYS_NO_FLASH
+#ifndef CONFIG_RAMBOOT_PBL
#define CONFIG_ENV_IS_NOWHERE
+#endif
#else
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
#endif
#if defined(CONFIG_SPIFLASH)
@@ -101,6 +104,8 @@
#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#define CONFIG_ENV_OFFSET (5 * CONFIG_SYS_NAND_BLOCK_SIZE)
+#elif defined(CONFIG_ENV_IS_NOWHERE)
+ #define CONFIG_ENV_SIZE 0x2000
#else
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE \
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 52a5ba9..5f66212 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -77,7 +77,7 @@
#define CONFIG_ENV_OVERWRITE
#ifdef CONFIG_SYS_NO_FLASH
-#ifndef CONFIG_SRIOBOOT_SLAVE
+#if !defined(CONFIG_SRIOBOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL)
#define CONFIG_ENV_IS_NOWHERE
#endif
#else