mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
15a14cf166
The QorIQ LS1012A processor, optimized for battery-backed or USB-powered, integrates a single ARM Cortex-A53 core with a hardware packet forwarding engine and high-speed interfaces to deliver line-rate networking performance. QorIQ LS1012A Reference Design System (LS1012ARDB) is a high-performance development platform, with a complete debugging environment. The LS1012ARDB board supports the QorIQ LS1012A processor and is optimized to support the high-bandwidth DDR3L memory and a full complement of high-speed SerDes ports. LEDE/OPENWRT will auto strip executable program file while make. So we need select CONFIG_NO_STRIP=y while make menuconfig to avoid the ppfe network fiemware be destroyed, then run make to build ls1012ardb firmware. The fsl-quadspi flash with jffs2 fs is unstable and arise some failed message. This issue have noticed the IP owner for investigate, hope he can solve it earlier. So the ls1012ardb now also provide a xx-firmware.ext4.bin as default firmware, and the uboot bootcmd will run wrtboot_ext4rfs for "rootfstype=ext4" bootargs. Signed-off-by: Yutang Jiang <yutang.jiang@nxp.com>
111 lines
3.6 KiB
Diff
111 lines
3.6 KiB
Diff
From 0878404f549021e7fe0a49ae0454cf53fd452add Mon Sep 17 00:00:00 2001
|
|
From: Yunhui Cui <yunhui.cui@nxp.com>
|
|
Date: Tue, 2 Feb 2016 12:00:27 +0800
|
|
Subject: [PATCH 103/113] mtd: spi-nor: Support R/W for S25FS-S family flash
|
|
|
|
With the physical sectors combination, S25FS-S family flash
|
|
requires some special operations for read/write functions.
|
|
|
|
Signed-off-by: Yunhui Cui <yunhui.cui@nxp.com>
|
|
---
|
|
drivers/mtd/spi-nor/spi-nor.c | 60 +++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 60 insertions(+)
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -40,6 +40,10 @@
|
|
#define SPI_NOR_MAX_ID_LEN 6
|
|
#define SPI_NOR_MAX_ADDR_WIDTH 4
|
|
#define SPI_NOR_MICRON_WRITE_ENABLE 0x7f
|
|
+/* Added for S25FS-S family flash */
|
|
+#define SPINOR_CONFIG_REG3_OFFSET 0x800004
|
|
+#define CR3V_4KB_ERASE_UNABLE 0x8
|
|
+#define SPINOR_S25FS_FAMILY_ID 0x81
|
|
|
|
struct flash_info {
|
|
char *name;
|
|
@@ -73,6 +77,8 @@ struct flash_info {
|
|
};
|
|
|
|
#define JEDEC_MFR(info) ((info)->id[0])
|
|
+#define EXT_ID(info) ((info)->id[5])
|
|
+
|
|
|
|
static const struct flash_info *spi_nor_match_id(const char *name);
|
|
|
|
@@ -784,6 +790,7 @@ static const struct flash_info spi_nor_i
|
|
*/
|
|
{ "s25sl032p", INFO(0x010215, 0x4d00, 64 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
{ "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
+ { "s25fs256s1", INFO6(0x010219, 0x4d0181, 64 * 1024, 512, 0)},
|
|
{ "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) },
|
|
{ "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
{ "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
@@ -908,6 +915,53 @@ static const struct flash_info *spi_nor_
|
|
return ERR_PTR(-ENODEV);
|
|
}
|
|
|
|
+/*
|
|
+ * The S25FS-S family physical sectors may be configured as a
|
|
+ * hybrid combination of eight 4-kB parameter sectors
|
|
+ * at the top or bottom of the address space with all
|
|
+ * but one of the remaining sectors being uniform size.
|
|
+ * The Parameter Sector Erase commands (20h or 21h) must
|
|
+ * be used to erase the 4-kB parameter sectors individually.
|
|
+ * The Sector (uniform sector) Erase commands (D8h or DCh)
|
|
+ * must be used to erase any of the remaining
|
|
+ * sectors, including the portion of highest or lowest address
|
|
+ * sector that is not overlaid by the parameter sectors.
|
|
+ * The uniform sector erase command has no effect on parameter sectors.
|
|
+ */
|
|
+static int spansion_s25fs_disable_4kb_erase(struct spi_nor *nor)
|
|
+{
|
|
+ struct fsl_qspi *q;
|
|
+ u32 cr3v_addr = SPINOR_CONFIG_REG3_OFFSET;
|
|
+ u8 cr3v = 0x0;
|
|
+ int ret = 0x0;
|
|
+
|
|
+ q = nor->priv;
|
|
+
|
|
+ nor->cmd_buf[2] = cr3v_addr >> 16;
|
|
+ nor->cmd_buf[1] = cr3v_addr >> 8;
|
|
+ nor->cmd_buf[0] = cr3v_addr >> 0;
|
|
+
|
|
+ ret = nor->read_reg(nor, SPINOR_OP_SPANSION_RDAR, &cr3v, 1);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ if (cr3v & CR3V_4KB_ERASE_UNABLE)
|
|
+ return 0;
|
|
+ ret = nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ cr3v = CR3V_4KB_ERASE_UNABLE;
|
|
+ nor->program_opcode = SPINOR_OP_SPANSION_WRAR;
|
|
+ nor->write(nor, cr3v_addr, 1, &cr3v);
|
|
+
|
|
+ ret = nor->read_reg(nor, SPINOR_OP_SPANSION_RDAR, &cr3v, 1);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ if (!(cr3v & CR3V_4KB_ERASE_UNABLE))
|
|
+ return -EPERM;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
|
|
size_t *retlen, u_char *buf)
|
|
{
|
|
@@ -1246,6 +1300,12 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
write_sr(nor, ret);
|
|
}
|
|
|
|
+ if (EXT_ID(info) == SPINOR_S25FS_FAMILY_ID) {
|
|
+ ret = spansion_s25fs_disable_4kb_erase(nor);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
if (!mtd->name)
|
|
mtd->name = dev_name(dev);
|
|
mtd->priv = nor;
|