Commit 0f57f6a3 authored by Shaohui Xie's avatar Shaohui Xie Committed by Andy Fleming
Browse files

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: default avatarShaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: default avatarAndy Fleming <afleming@freescale.com>
parent 535a159a
...@@ -73,10 +73,13 @@ ...@@ -73,10 +73,13 @@
#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OVERWRITE
#ifdef CONFIG_SYS_NO_FLASH #ifdef CONFIG_SYS_NO_FLASH
#ifndef CONFIG_RAMBOOT_PBL
#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#endif
#else #else
#define CONFIG_FLASH_CFI_DRIVER #define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_CFI
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
#endif #endif
#if defined(CONFIG_SPIFLASH) #if defined(CONFIG_SPIFLASH)
...@@ -101,6 +104,8 @@ ...@@ -101,6 +104,8 @@
#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#define CONFIG_ENV_OFFSET (5 * 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 #else
#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE \ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE \
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OVERWRITE
#ifdef CONFIG_SYS_NO_FLASH #ifdef CONFIG_SYS_NO_FLASH
#ifndef CONFIG_SRIOBOOT_SLAVE #if !defined(CONFIG_SRIOBOOT_SLAVE) && !defined(CONFIG_RAMBOOT_PBL)
#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#endif #endif
#else #else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment