summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYuan Yao <yao.yuan@nxp.com>2016-06-08 18:24:53 +0800
committerYork Sun <york.sun@nxp.com>2016-06-10 13:44:59 -0700
commit82d13340e9d051f193d46596343aa692b0acd92c (patch)
tree1a122a896bbb80d6aea43b2b267d5b0274124ccf /include
parent916d9f099edcb2a020ec3f291f0fa0e6fab0f9a5 (diff)
configs: ls2080a_common: Remove duplicate NOR configs
The NOR flash related configure options appear in ls2080aqds.h and ls2080ardb.h, and the two files both includ ls2080a_common.h. This patch remove the duplicated options in ls2080a_common.h. Signed-off-by: Yuan Yao <yao.yuan@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/ls2080a_common.h7
-rw-r--r--include/configs/ls2080a_simu.h7
2 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 2bf524f69af..2314b445728 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -138,13 +138,6 @@
#define CONFIG_SYS_FLASH1_BASE_PHYS 0xC0000000
#define CONFIG_SYS_FLASH1_BASE_PHYS_EARLY 0x8000000
-#ifndef CONFIG_SYS_NO_FLASH
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
-#define CONFIG_SYS_FLASH_QUIET_TEST
-#endif
-
#ifndef __ASSEMBLY__
unsigned long long get_qixis_addr(void);
#endif
diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h
index 7563aafbc62..7f245b5fad7 100644
--- a/include/configs/ls2080a_simu.h
+++ b/include/configs/ls2080a_simu.h
@@ -30,6 +30,13 @@
#define CONFIG_SYS_NOR0_CSPR_EXT (0x0)
#define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024)
+#ifndef CONFIG_SYS_NO_FLASH
+#define CONFIG_FLASH_CFI_DRIVER
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
+#define CONFIG_SYS_FLASH_QUIET_TEST
+#endif
+
/*
* NOR Flash Timing Params
*/