From: Yuan Yao <yao.yuan@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v6 03/10] configs: ls2080a_common: Remove duplicate NOR configs
Date: Wed, 8 Jun 2016 18:24:53 +0800 [thread overview]
Message-ID: <1465381500-34476-4-git-send-email-yao.yuan@freescale.com> (raw)
In-Reply-To: <1465381500-34476-1-git-send-email-yao.yuan@freescale.com>
From: Yuan Yao <yao.yuan@nxp.com>
The NOR flash related configure options also appear in ls2080aqds.h and
ls2080ardb.h, and the two files all have included ls2080a_common.h.
This patch remove the duplicated options in ls2080a_common.h.
Signed-off-by: Yuan Yao <yao.yuan@nxp.com>
---
include/configs/ls2080a_common.h | 7 -------
include/configs/ls2080a_simu.h | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index c78aeb5..48b1e15 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 7563aaf..7f245b5 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
*/
--
2.1.0.27.g96db324
next prev parent reply other threads:[~2016-06-08 10:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-08 10:24 [U-Boot] [PATCH v6 00/10] armv8: ls2080aqds: Enable QSPI boot support Yuan Yao
2016-06-08 10:24 ` [U-Boot] [PATCH v6 01/10] drivers: i2c: mxc: Add early init Yuan Yao
2016-06-10 22:24 ` York Sun
2016-06-08 10:24 ` [U-Boot] [PATCH v6 02/10] armv8: ls2080aqds: Select QSPI CLK div via SCFG Yuan Yao
2016-06-08 10:24 ` Yuan Yao [this message]
2016-06-08 10:24 ` [U-Boot] [PATCH v6 04/10] armv8: ls2080aqds: disable IFC NOR & QIXIS when QSPI enable Yuan Yao
2016-06-08 10:24 ` [U-Boot] [PATCH v6 05/10] configs: ls2080aqds: Enable QSPI flash support Yuan Yao
2016-06-08 10:24 ` [U-Boot] [PATCH v6 06/10] dm: dts: ls2080aqds: Add QSPI dts node Yuan Yao
2016-06-08 10:24 ` [U-Boot] [PATCH v6 07/10] armv8: ls2080aqds: Config QSPI pin mux via FPGA in NAND boot Yuan Yao
2016-06-08 10:24 ` [U-Boot] [PATCH v6 08/10] configs: ls2080a: Increase load image len " Yuan Yao
2016-06-08 10:24 ` [U-Boot] [PATCH v6 09/10] ls2080aqds_nand_defconfig: Enable QSPI & its dependence Yuan Yao
2016-06-08 10:25 ` [U-Boot] [PATCH v6 10/10] armv8: ls2080aqds: Enable QSPI boot support Yuan Yao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465381500-34476-4-git-send-email-yao.yuan@freescale.com \
--to=yao.yuan@freescale.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.