* [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support
@ 2016-07-12 18:28 Ladislav Michl
2016-07-12 18:28 ` [U-Boot] [PATCH v5 01/26] mtd: Sort subsystem directories aplhabeticaly in Makefile Ladislav Michl
` (25 more replies)
0 siblings, 26 replies; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Core of this patch serie is based on Thomas's patchset:
https://patchwork.ozlabs.org/patch/367305/
https://patchwork.ozlabs.org/patch/367306/
This serie contains also changes needed to let single binary running
on IGEPv2 board equipped either with NAND or OneNAND flash memory:
igep0020_nand_defconfig is dropped and igep0020_defconfig modified
to support both flash memories. As many flash manipulatioin routines
do not expect flash reading failure (as chip is not present), fix
them too.
Now, first four flash sectors contains SPL as this is what Boot ROM
code expects and loads. The rest of flash is UBI managed: U-Boot,
its environment, kernel and rootfs are stored in UBI volumes.
As enviroment is stored in UBI volume, we need to know how is flash
partitioned very early. Also various board modifications come with
different geometry flash memories. To let this work two changes are
introduced: mtdpart code uses default partitions unless it is
explicitely told to do otherwise and support for runtime generated
default partitions has been added.
Changes in v5:
- dual license GPL/BSD
Changes in v4:
- drop unused name field from ubispl_load structure
- ipl_load returns lenght read
Changes in v3:
- move vol_id check to ubi_scan_vid_hdr to verify it has meaningfull value
before testing ubi->toload
- fixed checkpatch errors except those present also in linux code
Changes in v2:
- rename nand_spl_read_flash to nand_spl_read_block and optimize it.
- fixes ubi_calc_fm_size to include also sizeof(struct ubi_fm_sb)
- dropped private copy of ubi-media.h
- ubi-wrapper.h now contains only needed definitions from ubi.h
and ubi-user.h
- used return values from errno.h
Ladislav Michl (24):
mtd: Sort subsystem directories aplhabeticaly in Makefile
onenand_spl_simple: Add a simple OneNAND read function
spl: support loading from UBI volumes
spl: zImage support in Falcon mode
armv7: add reset timeout to identify_nand_chip
armv7: make gpmc_cfg const
armv7: armv7: introduce set_gpmc_cs0
armv7: simplify identify_nand_chip
mtd: OneNAND: add timeout to wait ready loops
mtd: OneNAND: allow board init function fail
mtd: OneNAND: initialize mtd->writebufsize to let UBI work
cmd: mtdparts: fix mtdparts variable presence confusion in
mtdparts_init
cmd: mtdparts: fix null pointer dereference in parse_mtdparts
cmd: mtdparts: consolidate mtdparts reading from env
cmd: mtdparts: use defaults by default
cmd: mtdparts: support runtime generated mtdparts
igep00x0: move sysinfo into C file
igep00x0: reorder lan9221 code to remove ifdefs
igep00x0: remove useless setup_net_chip declaration
igep00x0: remove unused empty function omap_rev_string()
igep00x0: runtime flash detection
igep00x0: UBIize
igep00x0: generate default mtdparts according NAND chip used
igep00x0: Falcon mode
Thomas Gleixner (2):
nand_spl_simple: Add a simple NAND read function
spl: Lightweight UBI and UBI fastmap support
README | 4 +
arch/arm/cpu/armv7/omap-common/mem-common.c | 156 +++--
arch/arm/cpu/armv7/omap3/spl_id_nand.c | 57 +-
arch/arm/include/asm/arch-omap3/sys_proto.h | 7 +-
arch/arm/lib/Makefile | 2 +
arch/arm/lib/bootm.c | 32 -
arch/arm/lib/zimage.c | 40 ++
board/isee/igep00x0/igep00x0.c | 164 +++--
board/isee/igep00x0/igep00x0.h | 20 -
board/micronas/vct/ebi_onenand.c | 4 +-
board/samsung/goni/onenand.c | 4 +-
board/samsung/smdkc100/onenand.c | 4 +-
board/samsung/universal_c210/onenand.c | 4 +-
cmd/mtdparts.c | 92 +--
common/spl/Makefile | 3 +
common/spl/spl.c | 29 +
common/spl/spl_ubi.c | 78 +++
configs/igep0020_defconfig | 4 +-
configs/igep0020_nand_defconfig | 27 -
doc/README.ubispl | 141 +++++
drivers/Makefile | 5 +-
drivers/mtd/nand/nand_spl_simple.c | 62 ++
drivers/mtd/nand/omap_gpmc.c | 3 +-
drivers/mtd/onenand/onenand_base.c | 31 +-
drivers/mtd/onenand/onenand_spl.c | 48 ++
drivers/mtd/onenand/onenand_uboot.c | 30 +-
drivers/mtd/ubispl/Makefile | 1 +
drivers/mtd/ubispl/ubi-wrapper.h | 106 ++++
drivers/mtd/ubispl/ubispl.c | 926 ++++++++++++++++++++++++++++
drivers/mtd/ubispl/ubispl.h | 136 ++++
include/configs/omap3_igep00x0.h | 86 ++-
include/linux/mtd/omap_gpmc.h | 3 +-
include/nand.h | 1 +
include/onenand_uboot.h | 3 +-
include/spl.h | 4 +
include/ubispl.h | 90 +++
36 files changed, 2056 insertions(+), 351 deletions(-)
create mode 100644 arch/arm/lib/zimage.c
create mode 100644 common/spl/spl_ubi.c
delete mode 100644 configs/igep0020_nand_defconfig
create mode 100644 doc/README.ubispl
create mode 100644 drivers/mtd/ubispl/Makefile
create mode 100644 drivers/mtd/ubispl/ubi-wrapper.h
create mode 100644 drivers/mtd/ubispl/ubispl.c
create mode 100644 drivers/mtd/ubispl/ubispl.h
create mode 100644 include/ubispl.h
--
2.1.4
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 01/26] mtd: Sort subsystem directories aplhabeticaly in Makefile
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 02/26] nand_spl_simple: Add a simple NAND read function Ladislav Michl
` (24 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/Makefile b/drivers/Makefile
index 1723958..b3ac8a6 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -19,14 +19,14 @@ obj-$(CONFIG_ARMADA_38X) += ddr/marvell/a38x/
obj-$(CONFIG_ARMADA_XP) += ddr/marvell/axp/
obj-$(CONFIG_ALTERA_SDRAM) += ddr/altera/
obj-$(CONFIG_SPL_SERIAL_SUPPORT) += serial/
-obj-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += mtd/spi/
obj-$(CONFIG_SPL_SPI_SUPPORT) += spi/
obj-$(CONFIG_SPL_POWER_SUPPORT) += power/ power/pmic/
obj-$(CONFIG_SPL_POWER_SUPPORT) += power/regulator/
+obj-$(CONFIG_SPL_DRIVERS_MISC_SUPPORT) += misc/
obj-$(CONFIG_SPL_MTD_SUPPORT) += mtd/
obj-$(CONFIG_SPL_NAND_SUPPORT) += mtd/nand/
-obj-$(CONFIG_SPL_DRIVERS_MISC_SUPPORT) += misc/
obj-$(CONFIG_SPL_ONENAND_SUPPORT) += mtd/onenand/
+obj-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += mtd/spi/
obj-$(CONFIG_SPL_DMA_SUPPORT) += dma/
obj-$(CONFIG_SPL_ETH_SUPPORT) += net/
obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 02/26] nand_spl_simple: Add a simple NAND read function
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
2016-07-12 18:28 ` [U-Boot] [PATCH v5 01/26] mtd: Sort subsystem directories aplhabeticaly in Makefile Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 03/26] onenand_spl_simple: Add a simple OneNAND " Ladislav Michl
` (23 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
From: Thomas Gleixner <tglx@linutronix.de>
To support UBI in SPL we need a simple NAND read function. Add one to
nand_spl_simple and keep it as simple as it goes.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Acked-by: Scott Wood <oss@buserror.net>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- Rename nand_spl_read_flash to nand_spl_read_block and optimize it.
drivers/mtd/nand/nand_spl_simple.c | 62 ++++++++++++++++++++++++++++++++++++++
include/nand.h | 1 +
2 files changed, 63 insertions(+)
diff --git a/drivers/mtd/nand/nand_spl_simple.c b/drivers/mtd/nand/nand_spl_simple.c
index 60a7607..55f48d3 100644
--- a/drivers/mtd/nand/nand_spl_simple.c
+++ b/drivers/mtd/nand/nand_spl_simple.c
@@ -209,6 +209,68 @@ static int nand_read_page(int block, int page, void *dst)
}
#endif
+#ifdef CONFIG_SPL_UBI
+/*
+ * Temporary storage for non NAND page aligned and non NAND page sized
+ * reads. Note: This does not support runtime detected FLASH yet, but
+ * that should be reasonably easy to fix by making the buffer large
+ * enough :)
+ */
+static u8 scratch_buf[CONFIG_SYS_NAND_PAGE_SIZE];
+
+/**
+ * nand_spl_read_block - Read data from physical eraseblock into a buffer
+ * @block: Number of the physical eraseblock
+ * @offset: Data offset from the start of @peb
+ * @len: Data size to read
+ * @dst: Address of the destination buffer
+ *
+ * This could be further optimized if we'd have a subpage read
+ * function in the simple code. On NAND which allows subpage reads
+ * this would spare quite some time to readout e.g. the VID header of
+ * UBI.
+ *
+ * Notes:
+ * @offset + @len are not allowed to be larger than a physical
+ * erase block. No sanity check done for simplicity reasons.
+ *
+ * To support runtime detected flash this needs to be extended by
+ * information about the actual flash geometry, but thats beyond the
+ * scope of this effort and for most applications where fast boot is
+ * required it is not an issue anyway.
+ */
+int nand_spl_read_block(int block, int offset, int len, void *dst)
+{
+ int page, read;
+
+ /* Calculate the page number */
+ page = offset / CONFIG_SYS_NAND_PAGE_SIZE;
+
+ /* Offset to the start of a flash page */
+ offset = offset % CONFIG_SYS_NAND_PAGE_SIZE;
+
+ while (len) {
+ /*
+ * Non page aligned reads go to the scratch buffer.
+ * Page aligned reads go directly to the destination.
+ */
+ if (offset || len < CONFIG_SYS_NAND_PAGE_SIZE) {
+ nand_read_page(block, page, scratch_buf);
+ read = min(len, CONFIG_SYS_NAND_PAGE_SIZE - offset);
+ memcpy(dst, scratch_buf + offset, read);
+ offset = 0;
+ } else {
+ nand_read_page(block, page, dst);
+ read = CONFIG_SYS_NAND_PAGE_SIZE;
+ }
+ page++;
+ len -= read;
+ dst += read;
+ }
+ return 0;
+}
+#endif
+
int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
{
unsigned int block, lastblock;
diff --git a/include/nand.h b/include/nand.h
index a4f0f92..627b217 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -122,6 +122,7 @@ int nand_unlock(struct mtd_info *mtd, loff_t start, size_t length,
int nand_get_lock_status(struct mtd_info *mtd, loff_t offset);
int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst);
+int nand_spl_read_block(int block, int offset, int len, void *dst);
void nand_deselect(void);
#ifdef CONFIG_SYS_NAND_SELECT_DEVICE
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 03/26] onenand_spl_simple: Add a simple OneNAND read function
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
2016-07-12 18:28 ` [U-Boot] [PATCH v5 01/26] mtd: Sort subsystem directories aplhabeticaly in Makefile Ladislav Michl
2016-07-12 18:28 ` [U-Boot] [PATCH v5 02/26] nand_spl_simple: Add a simple NAND read function Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 04/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (22 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/mtd/onenand/onenand_spl.c | 48 +++++++++++++++++++++++++++++++++++++++
include/onenand_uboot.h | 1 +
2 files changed, 49 insertions(+)
diff --git a/drivers/mtd/onenand/onenand_spl.c b/drivers/mtd/onenand/onenand_spl.c
index fe6b7d9..1925f41 100644
--- a/drivers/mtd/onenand/onenand_spl.c
+++ b/drivers/mtd/onenand/onenand_spl.c
@@ -93,6 +93,54 @@ static int onenand_spl_read_page(uint32_t block, uint32_t page, uint32_t *buf,
return 0;
}
+#ifdef CONFIG_SPL_UBI
+/* Temporary storage for non page aligned and non page sized reads. */
+static u8 scratch_buf[PAGE_4K];
+
+/**
+ * onenand_spl_read_block - Read data from physical eraseblock into a buffer
+ * @block: Number of the physical eraseblock
+ * @offset: Data offset from the start of @peb
+ * @len: Data size to read
+ * @dst: Address of the destination buffer
+ *
+ * Notes:
+ * @offset + @len are not allowed to be larger than a physical
+ * erase block. No sanity check done for simplicity reasons.
+ */
+int onenand_spl_read_block(int block, int offset, int len, void *dst)
+{
+ int page, read, psize;
+
+ psize = onenand_spl_get_geometry();
+ /* Calculate the page number */
+ page = offset / psize;
+ /* Offset to the start of a flash page */
+ offset = offset % psize;
+
+ while (len) {
+ /*
+ * Non page aligned reads go to the scratch buffer.
+ * Page aligned reads go directly to the destination.
+ */
+ if (offset || len < psize) {
+ onenand_spl_read_page(block, page,
+ (uint32_t *)scratch_buf, psize);
+ read = min(len, psize - offset);
+ memcpy(dst, scratch_buf + offset, read);
+ offset = 0;
+ } else {
+ onenand_spl_read_page(block, page, dst, psize);
+ read = psize;
+ }
+ page++;
+ len -= read;
+ dst += read;
+ }
+ return 0;
+}
+#endif
+
void onenand_spl_load_image(uint32_t offs, uint32_t size, void *dst)
{
uint32_t *addr = (uint32_t *)dst;
diff --git a/include/onenand_uboot.h b/include/onenand_uboot.h
index fd01040..d69e0d2 100644
--- a/include/onenand_uboot.h
+++ b/include/onenand_uboot.h
@@ -49,6 +49,7 @@ extern int flexonenand_set_boundary(struct mtd_info *mtd, int die,
int boundary, int lock);
/* SPL */
+int onenand_spl_read_block(int block, int offset, int len, void *dst);
void onenand_spl_load_image(uint32_t offs, uint32_t size, void *dst);
#endif /* __UBOOT_ONENAND_H */
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 04/26] spl: Lightweight UBI and UBI fastmap support
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (2 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 03/26] onenand_spl_simple: Add a simple OneNAND " Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 05/26] spl: support loading from UBI volumes Ladislav Michl
` (21 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
From: Thomas Gleixner <tglx@linutronix.de>
Booting a payload out of NAND FLASH from the SPL is a crux today, as
it requires hard partioned FLASH. Not a brilliant idea with the
reliability of todays NAND FLASH chips.
The upstream UBI + UBI fastmap implementation which is about to
brought to u-boot is too heavy weight for SPLs as it provides way more
functionality than needed for a SPL and does not even fit into the
restricted SPL areas which are loaded from the SoC boot ROM.
So this provides a fast and lightweight implementation of UBI scanning
and UBI fastmap attach. The scan and logical to physical block mapping
code is developed from scratch, while the fastmap implementation is
lifted from the linux kernel source and stripped down to fit the SPL
needs.
The text foot print on the board which I used for development is:
6854 0 0 6854 1abd
drivers/mtd/ubispl/built-in.o
Attaching a NAND chip with 4096 physical eraseblocks (4 blocks are
reserved for the SPL) takes:
In full scan mode: 1172ms
In fastmap mode: 95ms
The code requires quite some storage. The largest and unknown part of
it is the number of fastmap blocks to read. Therefor the data
structure is not put into the BSS. The code requires a pointer to free
memory handed in which is initialized by the UBI attach code itself.
See doc/README.ubispl for further information on how to use it.
This shares the ubi-media.h and crc32 implementation of drivers/mtd/ubi
There is no way to share the fastmap code, as UBISPL only utilizes the
slightly modified functions ubi_attach_fastmap() and ubi_scan_fastmap()
from the original kernel ubi fastmap implementation.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Acked-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
Changes in v5:
- dual license GPL/BSD
Changes in v4:
- drop unused name field from ubispl_load structure
- ipl_load returns lenght read
Changes in v3:
- move vol_id check to ubi_scan_vid_hdr to verify it has meaningfull value
before testing ubi->toload
- fixed checkpatch errors except those present also in linux code
Changes in v2:
- fixes ubi_calc_fm_size to include also sizeof(struct ubi_fm_sb)
- dropped private copy of ubi-media.h
- ubi-wrapper.h now contains only needed definitions from ubi.h
and ubi-user.h
- used return values from errno.h
README | 4 +
doc/README.ubispl | 141 ++++++
drivers/Makefile | 1 +
drivers/mtd/ubispl/Makefile | 1 +
drivers/mtd/ubispl/ubi-wrapper.h | 106 +++++
drivers/mtd/ubispl/ubispl.c | 926 +++++++++++++++++++++++++++++++++++++++
drivers/mtd/ubispl/ubispl.h | 136 ++++++
include/ubispl.h | 90 ++++
8 files changed, 1405 insertions(+)
create mode 100644 doc/README.ubispl
create mode 100644 drivers/mtd/ubispl/Makefile
create mode 100644 drivers/mtd/ubispl/ubi-wrapper.h
create mode 100644 drivers/mtd/ubispl/ubispl.c
create mode 100644 drivers/mtd/ubispl/ubispl.h
create mode 100644 include/ubispl.h
diff --git a/README b/README
index 26d5ad2..00f818a 100644
--- a/README
+++ b/README
@@ -3583,6 +3583,10 @@ FIT uImage format:
Support for NAND boot using simple NAND drivers that
expose the cmd_ctrl() interface.
+ CONFIG_SPL_UBI
+ Support for a lightweight UBI (fastmap) scanner and
+ loader
+
CONFIG_SPL_MTD_SUPPORT
Support for the MTD subsystem within SPL. Useful for
environment on NAND support within SPL.
diff --git a/doc/README.ubispl b/doc/README.ubispl
new file mode 100644
index 0000000..ff008bc
--- /dev/null
+++ b/doc/README.ubispl
@@ -0,0 +1,141 @@
+Lightweight UBI and UBI fastmap support
+
+# Copyright (C) Thomas Gleixner <tglx@linutronix.de>
+#
+# SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
+
+Scans the UBI information and loads the requested static volumes into
+memory.
+
+Configuration Options:
+
+ CONFIG_SPL_UBI
+ Enables the SPL UBI support
+
+ CONFIG_SPL_UBI_MAX_VOL_LEBS
+ The maximum number of logical eraseblocks which a static volume
+ to load can contain. Used for sizing the scan data structure
+
+ CONFIG_SPL_UBI_MAX_PEB_SIZE
+ The maximum physical erase block size. Either a compile time
+ constant or runtime detection. Used for sizing the scan data
+ structure
+
+ CONFIG_SPL_UBI_MAX_PEBS
+ The maximum physical erase block count. Either a compile time
+ constant or runtime detection. Used for sizing the scan data
+ structure
+
+ CONFIG_SPL_UBI_VOL_IDS
+ The maximum volume ids which can be loaded. Used for sizing the
+ scan data structure.
+
+Usage notes:
+
+In the board config file define for example:
+
+#define CONFIG_SPL_UBI
+#define CONFIG_SPL_UBI_MAX_VOL_LEBS 256
+#define CONFIG_SPL_UBI_MAX_PEB_SIZE (256*1024)
+#define CONFIG_SPL_UBI_MAX_PEBS 4096
+#define CONFIG_SPL_UBI_VOL_IDS 8
+
+The size requirement is roughly as follows:
+
+ 2k for the basic data structure
+ + CONFIG_SPL_UBI_VOL_IDS * CONFIG_SPL_UBI_MAX_VOL_LEBS * 8
+ + CONFIG_SPL_UBI_MAX_PEBS * 64
+ + CONFIG_SPL_UBI_MAX_PEB_SIZE * UBI_FM_MAX_BLOCKS
+
+The last one is big, but I really don't care in that stage. Real world
+implementations only use the first couple of blocks, but the code
+handles up to UBI_FM_MAX_BLOCKS.
+
+Given the above configuration example the requirement is about 5M
+which is usually not a problem to reserve in the RAM along with the
+other areas like the kernel/dts load address.
+
+So something like this will do the trick:
+
+#define SPL_FINFO_ADDR 0x80800000
+#define SPL_DTB_LOAD_ADDR 0x81800000
+#define SPL_KERNEL_LOAD_ADDR 0x82000000
+
+In the board file, implement the following:
+
+static struct ubispl_load myvolumes[] = {
+ {
+ .vol_id = 0, /* kernel volume */
+ .load_addr = (void *)SPL_KERNEL_LOAD_ADDR,
+ },
+ {
+ .vol_id = 1, /* DT blob */
+ .load_addr = (void *)SPL_DTB_LOAD_ADDR,
+ }
+};
+
+int spl_start_uboot(void)
+{
+ struct ubispl_info info;
+
+ info.ubi = (struct ubi_scan_info *) SPL_FINFO_ADDR;
+ info.fastmap = 1;
+ info.read = nand_spl_read_flash;
+
+#if COMPILE_TIME_DEFINED
+ /*
+ * MY_NAND_NR_SPL_PEBS is the number of physical erase blocks
+ * in the FLASH which are reserved for the SPL. Think about
+ * mtd partitions:
+ *
+ * part_spl { .start = 0, .end = 4 }
+ * part_ubi { .start = 4, .end = NR_PEBS }
+ */
+ info.peb_offset = MY_NAND_NR_SPL_PEBS;
+ info.peb_size = CONFIG_SYS_NAND_BLOCK_SIZE;
+ info.vid_offset = MY_NAND_UBI_VID_OFFS;
+ info.leb_start = MY_NAND_UBI_DATA_OFFS;
+ info.peb_count = MY_NAND_UBI_NUM_PEBS;
+#else
+ get_flash_info(&flash_info);
+ info.peb_offset = MY_NAND_NR_SPL_PEBS;
+ info.peb_size = flash_info.peb_size;
+
+ /*
+ * The VID and Data offset depend on the capability of the
+ * FLASH chip to do subpage writes.
+ *
+ * If the flash chip supports subpage writes, then the VID
+ * header starts at the second subpage. So for 2k pages size
+ * with 4 subpages the VID offset is 512. The DATA offset is 2k.
+ *
+ * If the flash chip does not support subpage writes then the
+ * VID offset is FLASH_PAGE_SIZE and the DATA offset
+ * 2 * FLASH_PAGE_SIZE
+ */
+ info.vid_offset = flash_info.vid_offset;
+ info.leb_start = flash_info.data_offset;
+
+ /*
+ * The flash reports the total number of erase blocks, so
+ * we need to subtract the number of blocks which are reserved
+ * for the SPL itself and not managed by UBI.
+ */
+ info.peb_count = flash_info.peb_count - MY_NAND_NR_SPL_PEBS;
+#endif
+
+ ret = ubispl_load_volumes(&info, myvolumes, ARRAY_SIZE(myvolumes);
+
+ ....
+
+}
+
+Note: you can load any payload that way. You can even load u-boot from
+UBI, so the only non UBI managed FLASH area is the one which is
+reserved for the SPL itself and read from the SoC ROM.
+
+And you can do fallback scenarios:
+
+ if (ubispl_load_volumes(&info, volumes0, ARRAY_SIZE(volumes0)))
+ if (ubispl_load_volumes(&info, volumes1, ARRAY_SIZE(volumes1)))
+ ubispl_load_volumes(&info, vol_uboot, ARRAY_SIZE(vol_uboot));
diff --git a/drivers/Makefile b/drivers/Makefile
index b3ac8a6..ad5cbae 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_SPL_MTD_SUPPORT) += mtd/
obj-$(CONFIG_SPL_NAND_SUPPORT) += mtd/nand/
obj-$(CONFIG_SPL_ONENAND_SUPPORT) += mtd/onenand/
obj-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += mtd/spi/
+obj-$(CONFIG_SPL_UBI) += mtd/ubispl/
obj-$(CONFIG_SPL_DMA_SUPPORT) += dma/
obj-$(CONFIG_SPL_ETH_SUPPORT) += net/
obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/
diff --git a/drivers/mtd/ubispl/Makefile b/drivers/mtd/ubispl/Makefile
new file mode 100644
index 0000000..740dbed
--- /dev/null
+++ b/drivers/mtd/ubispl/Makefile
@@ -0,0 +1 @@
+obj-y += ubispl.o ../ubi/crc32.o
diff --git a/drivers/mtd/ubispl/ubi-wrapper.h b/drivers/mtd/ubispl/ubi-wrapper.h
new file mode 100644
index 0000000..72b9dcb
--- /dev/null
+++ b/drivers/mtd/ubispl/ubi-wrapper.h
@@ -0,0 +1,106 @@
+/*
+ * The parts taken from the kernel implementation are:
+ *
+ * Copyright (c) International Business Machines Corp., 2006
+ *
+ * UBISPL specific defines:
+ *
+ * Copyright (c) Thomas Gleixner <tglx@linutronix.de>
+ *
+ * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
+ */
+
+/*
+ * Contains various defines copy&pasted from ubi.h and ubi-user.h to make
+ * the upstream fastboot code happy.
+ */
+#ifndef __UBOOT_UBI_WRAPPER_H
+#define __UBOOT_UBI_WRAPPER_H
+
+/*
+ * Error codes returned by the I/O sub-system.
+ *
+ * UBI_IO_FF: the read region of flash contains only 0xFFs
+ * UBI_IO_FF_BITFLIPS: the same as %UBI_IO_FF, but also also there was a data
+ * integrity error reported by the MTD driver
+ * (uncorrectable ECC error in case of NAND)
+ * UBI_IO_BAD_HDR: the EC or VID header is corrupted (bad magic or CRC)
+ * UBI_IO_BAD_HDR_EBADMSG: the same as %UBI_IO_BAD_HDR, but also there was a
+ * data integrity error reported by the MTD driver
+ * (uncorrectable ECC error in case of NAND)
+ * UBI_IO_BITFLIPS: bit-flips were detected and corrected
+ *
+ * UBI_FASTMAP_ANCHOR: u-boot SPL add on to tell the caller that the fastmap
+ * anchor block has been found
+ *
+ * Note, it is probably better to have bit-flip and ebadmsg as flags which can
+ * be or'ed with other error code. But this is a big change because there are
+ * may callers, so it does not worth the risk of introducing a bug
+ */
+enum {
+ UBI_IO_FF = 1,
+ UBI_IO_FF_BITFLIPS,
+ UBI_IO_BAD_HDR,
+ UBI_IO_BAD_HDR_EBADMSG,
+ UBI_IO_BITFLIPS,
+ UBI_FASTMAP_ANCHOR,
+};
+
+/*
+ * UBI volume type constants.
+ *
+ * @UBI_DYNAMIC_VOLUME: dynamic volume
+ * @UBI_STATIC_VOLUME: static volume
+ */
+enum {
+ UBI_DYNAMIC_VOLUME = 3,
+ UBI_STATIC_VOLUME = 4,
+};
+
+/*
+ * Return codes of the fastmap sub-system
+ *
+ * UBI_NO_FASTMAP: No fastmap super block was found
+ * UBI_BAD_FASTMAP: A fastmap was found but it's unusable
+ */
+enum {
+ UBI_NO_FASTMAP = 1,
+ UBI_BAD_FASTMAP,
+};
+
+/**
+ * struct ubi_fastmap_layout - in-memory fastmap data structure.
+ * @e: PEBs used by the current fastmap
+ * @to_be_tortured: if non-zero tortured this PEB
+ * @used_blocks: number of used PEBs
+ * @max_pool_size: maximal size of the user pool
+ * @max_wl_pool_size: maximal size of the pool used by the WL sub-system
+ */
+struct ubi_fastmap_layout {
+ struct ubi_wl_entry *e[UBI_FM_MAX_BLOCKS];
+ int to_be_tortured[UBI_FM_MAX_BLOCKS];
+ int used_blocks;
+ int max_pool_size;
+ int max_wl_pool_size;
+};
+
+/**
+ * struct ubi_fm_pool - in-memory fastmap pool
+ * @pebs: PEBs in this pool
+ * @used: number of used PEBs
+ * @size: total number of PEBs in this pool
+ * @max_size: maximal size of the pool
+ *
+ * A pool gets filled with up to max_size.
+ * If all PEBs within the pool are used a new fastmap will be written
+ * to the flash and the pool gets refilled with empty PEBs.
+ *
+ */
+struct ubi_fm_pool {
+ int pebs[UBI_FM_MAX_POOL_SIZE];
+ int used;
+ int size;
+ int max_size;
+};
+
+#endif
diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c
new file mode 100644
index 0000000..a81a8e7
--- /dev/null
+++ b/drivers/mtd/ubispl/ubispl.c
@@ -0,0 +1,926 @@
+/*
+ * Copyright (c) Thomas Gleixner <tglx@linutronix.de>
+ *
+ * The parts taken from the kernel implementation are:
+ *
+ * Copyright (c) International Business Machines Corp., 2006
+ *
+ * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <ubispl.h>
+
+#include <linux/crc32.h>
+
+#include "ubispl.h"
+
+/**
+ * ubi_calc_fm_size - calculates the fastmap size in bytes for an UBI device.
+ * @ubi: UBI device description object
+ */
+static size_t ubi_calc_fm_size(struct ubi_scan_info *ubi)
+{
+ size_t size;
+
+ size = sizeof(struct ubi_fm_sb) +
+ sizeof(struct ubi_fm_hdr) +
+ sizeof(struct ubi_fm_scan_pool) +
+ sizeof(struct ubi_fm_scan_pool) +
+ (ubi->peb_count * sizeof(struct ubi_fm_ec)) +
+ (sizeof(struct ubi_fm_eba) +
+ (ubi->peb_count * sizeof(__be32))) +
+ sizeof(struct ubi_fm_volhdr) * UBI_MAX_VOLUMES;
+ return roundup(size, ubi->leb_size);
+}
+
+static int ubi_io_read(struct ubi_scan_info *ubi, void *buf, int pnum,
+ unsigned long from, unsigned long len)
+{
+ return ubi->read(pnum + ubi->peb_offset, from, len, buf);
+}
+
+static int ubi_io_is_bad(struct ubi_scan_info *ubi, int peb)
+{
+ return peb >= ubi->peb_count || peb < 0;
+}
+
+static int ubi_io_read_vid_hdr(struct ubi_scan_info *ubi, int pnum,
+ struct ubi_vid_hdr *vh, int unused)
+{
+ u32 magic;
+ int res;
+
+ /* No point in rescanning a corrupt block */
+ if (test_bit(pnum, ubi->corrupt))
+ return UBI_IO_BAD_HDR;
+ /*
+ * If the block has been scanned already, no need to rescan
+ */
+ if (test_and_set_bit(pnum, ubi->scanned))
+ return 0;
+
+ res = ubi_io_read(ubi, vh, pnum, ubi->vid_offset, sizeof(*vh));
+
+ /*
+ * Bad block, unrecoverable ECC error, skip the block
+ */
+ if (res) {
+ ubi_dbg("Skipping bad or unreadable block %d", pnum);
+ vh->magic = 0;
+ generic_set_bit(pnum, ubi->corrupt);
+ return res;
+ }
+
+ /* Magic number available ? */
+ magic = be32_to_cpu(vh->magic);
+ if (magic != UBI_VID_HDR_MAGIC) {
+ generic_set_bit(pnum, ubi->corrupt);
+ if (magic == 0xffffffff)
+ return UBI_IO_FF;
+ ubi_msg("Bad magic in block 0%d %08x", pnum, magic);
+ return UBI_IO_BAD_HDR;
+ }
+
+ /* Header CRC correct ? */
+ if (crc32(UBI_CRC32_INIT, vh, UBI_VID_HDR_SIZE_CRC) !=
+ be32_to_cpu(vh->hdr_crc)) {
+ ubi_msg("Bad CRC in block 0%d", pnum);
+ generic_set_bit(pnum, ubi->corrupt);
+ return UBI_IO_BAD_HDR;
+ }
+
+ ubi_dbg("RV: pnum: %i sqnum %llu", pnum, be64_to_cpu(vh->sqnum));
+
+ return 0;
+}
+
+static int ubi_rescan_fm_vid_hdr(struct ubi_scan_info *ubi,
+ struct ubi_vid_hdr *vh,
+ u32 fm_pnum, u32 fm_vol_id, u32 fm_lnum)
+{
+ int res;
+
+ if (ubi_io_is_bad(ubi, fm_pnum))
+ return -EINVAL;
+
+ res = ubi_io_read_vid_hdr(ubi, fm_pnum, vh, 0);
+ if (!res) {
+ /* Check volume id, volume type and lnum */
+ if (be32_to_cpu(vh->vol_id) == fm_vol_id &&
+ vh->vol_type == UBI_VID_STATIC &&
+ be32_to_cpu(vh->lnum) == fm_lnum)
+ return 0;
+ ubi_dbg("RS: PEB %u vol: %u : %u typ %u lnum %u %u",
+ fm_pnum, fm_vol_id, vh->vol_type,
+ be32_to_cpu(vh->vol_id),
+ fm_lnum, be32_to_cpu(vh->lnum));
+ }
+ return res;
+}
+
+/* Insert the logic block into the volume info */
+static int ubi_add_peb_to_vol(struct ubi_scan_info *ubi,
+ struct ubi_vid_hdr *vh, u32 vol_id,
+ u32 pnum, u32 lnum)
+{
+ struct ubi_vol_info *vi = ubi->volinfo + vol_id;
+ u32 *ltp;
+
+ /*
+ * If the volume is larger than expected, yell and give up :(
+ */
+ if (lnum >= UBI_MAX_VOL_LEBS) {
+ ubi_warn("Vol: %u LEB %d > %d", vol_id, lnum, UBI_MAX_VOL_LEBS);
+ return -EINVAL;
+ }
+
+ ubi_dbg("SC: Add PEB %u to Vol %u as LEB %u fnd %d sc %d",
+ pnum, vol_id, lnum, !!test_bit(lnum, vi->found),
+ !!test_bit(pnum, ubi->scanned));
+
+ /* Points to the translation entry */
+ ltp = vi->lebs_to_pebs + lnum;
+
+ /* If the block is already assigned, check sqnum */
+ if (__test_and_set_bit(lnum, vi->found)) {
+ u32 cur_pnum = *ltp;
+ struct ubi_vid_hdr *cur = ubi->blockinfo + cur_pnum;
+
+ /*
+ * If the current block hase not yet been scanned, we
+ * need to do that. The other block might be stale or
+ * the current block corrupted and the FM not yet
+ * updated.
+ */
+ if (!test_bit(cur_pnum, ubi->scanned)) {
+ /*
+ * If the scan fails, we use the valid block
+ */
+ if (ubi_rescan_fm_vid_hdr(ubi, cur, cur_pnum, vol_id,
+ lnum)) {
+ *ltp = pnum;
+ return 0;
+ }
+ }
+
+ /*
+ * Should not happen ....
+ */
+ if (test_bit(cur_pnum, ubi->corrupt)) {
+ *ltp = pnum;
+ return 0;
+ }
+
+ ubi_dbg("Vol %u LEB %u PEB %u->sqnum %llu NPEB %u->sqnum %llu",
+ vol_id, lnum, cur_pnum, be64_to_cpu(cur->sqnum), pnum,
+ be64_to_cpu(vh->sqnum));
+
+ /*
+ * Compare sqnum and take the newer one
+ */
+ if (be64_to_cpu(cur->sqnum) < be64_to_cpu(vh->sqnum))
+ *ltp = pnum;
+ } else {
+ *ltp = pnum;
+ if (lnum > vi->last_block)
+ vi->last_block = lnum;
+ }
+
+ return 0;
+}
+
+static int ubi_scan_vid_hdr(struct ubi_scan_info *ubi, struct ubi_vid_hdr *vh,
+ u32 pnum)
+{
+ u32 vol_id, lnum;
+ int res;
+
+ if (ubi_io_is_bad(ubi, pnum))
+ return -EINVAL;
+
+ res = ubi_io_read_vid_hdr(ubi, pnum, vh, 0);
+ if (res)
+ return res;
+
+ /* Get volume id */
+ vol_id = be32_to_cpu(vh->vol_id);
+
+ /* If this is the fastmap anchor, return right away */
+ if (vol_id == UBI_FM_SB_VOLUME_ID)
+ return ubi->fm_enabled ? UBI_FASTMAP_ANCHOR : 0;
+
+ /* We only care about static volumes with an id < UBI_SPL_VOL_IDS */
+ if (vol_id >= UBI_SPL_VOL_IDS || vh->vol_type != UBI_VID_STATIC)
+ return 0;
+
+ /* We are only interested in the volumes to load */
+ if (!test_bit(vol_id, ubi->toload))
+ return 0;
+
+ lnum = be32_to_cpu(vh->lnum);
+ return ubi_add_peb_to_vol(ubi, vh, vol_id, pnum, lnum);
+}
+
+static int assign_aeb_to_av(struct ubi_scan_info *ubi, u32 pnum, u32 lnum,
+ u32 vol_id, u32 vol_type, u32 used)
+{
+ struct ubi_vid_hdr *vh;
+
+ if (ubi_io_is_bad(ubi, pnum))
+ return -EINVAL;
+
+ ubi->fastmap_pebs++;
+
+ if (vol_id >= UBI_SPL_VOL_IDS || vol_type != UBI_STATIC_VOLUME)
+ return 0;
+
+ /* We are only interested in the volumes to load */
+ if (!test_bit(vol_id, ubi->toload))
+ return 0;
+
+ vh = ubi->blockinfo + pnum;
+
+ return ubi_scan_vid_hdr(ubi, vh, pnum);
+}
+
+static int scan_pool(struct ubi_scan_info *ubi, __be32 *pebs, int pool_size)
+{
+ struct ubi_vid_hdr *vh;
+ u32 pnum;
+ int i;
+
+ ubi_dbg("Scanning pool size: %d", pool_size);
+
+ for (i = 0; i < pool_size; i++) {
+ pnum = be32_to_cpu(pebs[i]);
+
+ if (ubi_io_is_bad(ubi, pnum)) {
+ ubi_err("FM: Bad PEB in fastmap pool! %u", pnum);
+ return UBI_BAD_FASTMAP;
+ }
+
+ vh = ubi->blockinfo + pnum;
+ /*
+ * We allow the scan to fail here. The loader will notice
+ * and look for a replacement.
+ */
+ ubi_scan_vid_hdr(ubi, vh, pnum);
+ }
+ return 0;
+}
+
+/*
+ * Fastmap code is stolen from Linux kernel and this stub structure is used
+ * to make it happy.
+ */
+struct ubi_attach_info {
+ int i;
+};
+
+static int ubi_attach_fastmap(struct ubi_scan_info *ubi,
+ struct ubi_attach_info *ai,
+ struct ubi_fastmap_layout *fm)
+{
+ struct ubi_fm_hdr *fmhdr;
+ struct ubi_fm_scan_pool *fmpl1, *fmpl2;
+ struct ubi_fm_ec *fmec;
+ struct ubi_fm_volhdr *fmvhdr;
+ struct ubi_fm_eba *fm_eba;
+ int ret, i, j, pool_size, wl_pool_size;
+ size_t fm_pos = 0, fm_size = ubi->fm_size;
+ void *fm_raw = ubi->fm_buf;
+
+ memset(ubi->fm_used, 0, sizeof(ubi->fm_used));
+
+ fm_pos += sizeof(struct ubi_fm_sb);
+ if (fm_pos >= fm_size)
+ goto fail_bad;
+
+ fmhdr = (struct ubi_fm_hdr *)(fm_raw + fm_pos);
+ fm_pos += sizeof(*fmhdr);
+ if (fm_pos >= fm_size)
+ goto fail_bad;
+
+ if (be32_to_cpu(fmhdr->magic) != UBI_FM_HDR_MAGIC) {
+ ubi_err("bad fastmap header magic: 0x%x, expected: 0x%x",
+ be32_to_cpu(fmhdr->magic), UBI_FM_HDR_MAGIC);
+ goto fail_bad;
+ }
+
+ fmpl1 = (struct ubi_fm_scan_pool *)(fm_raw + fm_pos);
+ fm_pos += sizeof(*fmpl1);
+ if (fm_pos >= fm_size)
+ goto fail_bad;
+ if (be32_to_cpu(fmpl1->magic) != UBI_FM_POOL_MAGIC) {
+ ubi_err("bad fastmap pool magic: 0x%x, expected: 0x%x",
+ be32_to_cpu(fmpl1->magic), UBI_FM_POOL_MAGIC);
+ goto fail_bad;
+ }
+
+ fmpl2 = (struct ubi_fm_scan_pool *)(fm_raw + fm_pos);
+ fm_pos += sizeof(*fmpl2);
+ if (fm_pos >= fm_size)
+ goto fail_bad;
+ if (be32_to_cpu(fmpl2->magic) != UBI_FM_POOL_MAGIC) {
+ ubi_err("bad fastmap pool magic: 0x%x, expected: 0x%x",
+ be32_to_cpu(fmpl2->magic), UBI_FM_POOL_MAGIC);
+ goto fail_bad;
+ }
+
+ pool_size = be16_to_cpu(fmpl1->size);
+ wl_pool_size = be16_to_cpu(fmpl2->size);
+ fm->max_pool_size = be16_to_cpu(fmpl1->max_size);
+ fm->max_wl_pool_size = be16_to_cpu(fmpl2->max_size);
+
+ if (pool_size > UBI_FM_MAX_POOL_SIZE || pool_size < 0) {
+ ubi_err("bad pool size: %i", pool_size);
+ goto fail_bad;
+ }
+
+ if (wl_pool_size > UBI_FM_MAX_POOL_SIZE || wl_pool_size < 0) {
+ ubi_err("bad WL pool size: %i", wl_pool_size);
+ goto fail_bad;
+ }
+
+ if (fm->max_pool_size > UBI_FM_MAX_POOL_SIZE ||
+ fm->max_pool_size < 0) {
+ ubi_err("bad maximal pool size: %i", fm->max_pool_size);
+ goto fail_bad;
+ }
+
+ if (fm->max_wl_pool_size > UBI_FM_MAX_POOL_SIZE ||
+ fm->max_wl_pool_size < 0) {
+ ubi_err("bad maximal WL pool size: %i", fm->max_wl_pool_size);
+ goto fail_bad;
+ }
+
+ /* read EC values from free list */
+ for (i = 0; i < be32_to_cpu(fmhdr->free_peb_count); i++) {
+ fmec = (struct ubi_fm_ec *)(fm_raw + fm_pos);
+ fm_pos += sizeof(*fmec);
+ if (fm_pos >= fm_size)
+ goto fail_bad;
+ }
+
+ /* read EC values from used list */
+ for (i = 0; i < be32_to_cpu(fmhdr->used_peb_count); i++) {
+ fmec = (struct ubi_fm_ec *)(fm_raw + fm_pos);
+ fm_pos += sizeof(*fmec);
+ if (fm_pos >= fm_size)
+ goto fail_bad;
+
+ generic_set_bit(be32_to_cpu(fmec->pnum), ubi->fm_used);
+ }
+
+ /* read EC values from scrub list */
+ for (i = 0; i < be32_to_cpu(fmhdr->scrub_peb_count); i++) {
+ fmec = (struct ubi_fm_ec *)(fm_raw + fm_pos);
+ fm_pos += sizeof(*fmec);
+ if (fm_pos >= fm_size)
+ goto fail_bad;
+ }
+
+ /* read EC values from erase list */
+ for (i = 0; i < be32_to_cpu(fmhdr->erase_peb_count); i++) {
+ fmec = (struct ubi_fm_ec *)(fm_raw + fm_pos);
+ fm_pos += sizeof(*fmec);
+ if (fm_pos >= fm_size)
+ goto fail_bad;
+ }
+
+ /* Iterate over all volumes and read their EBA table */
+ for (i = 0; i < be32_to_cpu(fmhdr->vol_count); i++) {
+ u32 vol_id, vol_type, used, reserved;
+
+ fmvhdr = (struct ubi_fm_volhdr *)(fm_raw + fm_pos);
+ fm_pos += sizeof(*fmvhdr);
+ if (fm_pos >= fm_size)
+ goto fail_bad;
+
+ if (be32_to_cpu(fmvhdr->magic) != UBI_FM_VHDR_MAGIC) {
+ ubi_err("bad fastmap vol header magic: 0x%x, " \
+ "expected: 0x%x",
+ be32_to_cpu(fmvhdr->magic), UBI_FM_VHDR_MAGIC);
+ goto fail_bad;
+ }
+
+ vol_id = be32_to_cpu(fmvhdr->vol_id);
+ vol_type = fmvhdr->vol_type;
+ used = be32_to_cpu(fmvhdr->used_ebs);
+
+ fm_eba = (struct ubi_fm_eba *)(fm_raw + fm_pos);
+ fm_pos += sizeof(*fm_eba);
+ fm_pos += (sizeof(__be32) * be32_to_cpu(fm_eba->reserved_pebs));
+ if (fm_pos >= fm_size)
+ goto fail_bad;
+
+ if (be32_to_cpu(fm_eba->magic) != UBI_FM_EBA_MAGIC) {
+ ubi_err("bad fastmap EBA header magic: 0x%x, " \
+ "expected: 0x%x",
+ be32_to_cpu(fm_eba->magic), UBI_FM_EBA_MAGIC);
+ goto fail_bad;
+ }
+
+ reserved = be32_to_cpu(fm_eba->reserved_pebs);
+ ubi_dbg("FA: vol %u used %u res: %u", vol_id, used, reserved);
+ for (j = 0; j < reserved; j++) {
+ int pnum = be32_to_cpu(fm_eba->pnum[j]);
+
+ if ((int)be32_to_cpu(fm_eba->pnum[j]) < 0)
+ continue;
+
+ if (!__test_and_clear_bit(pnum, ubi->fm_used))
+ continue;
+
+ /*
+ * We only handle static volumes so used_ebs
+ * needs to be handed in. And we do not assign
+ * the reserved blocks
+ */
+ if (j >= used)
+ continue;
+
+ ret = assign_aeb_to_av(ubi, pnum, j, vol_id,
+ vol_type, used);
+ if (!ret)
+ continue;
+
+ /*
+ * Nasty: The fastmap claims that the volume
+ * has one block more than it, but that block
+ * is always empty and the other blocks have
+ * the correct number of total LEBs in the
+ * headers. Deal with it.
+ */
+ if (ret != UBI_IO_FF && j != used - 1)
+ goto fail_bad;
+ ubi_dbg("FA: Vol: %u Ignoring empty LEB %d of %d",
+ vol_id, j, used);
+ }
+ }
+
+ ret = scan_pool(ubi, fmpl1->pebs, pool_size);
+ if (ret)
+ goto fail;
+
+ ret = scan_pool(ubi, fmpl2->pebs, wl_pool_size);
+ if (ret)
+ goto fail;
+
+#ifdef CHECKME
+ /*
+ * If fastmap is leaking PEBs (must not happen), raise a
+ * fat warning and fall back to scanning mode.
+ * We do this here because in ubi_wl_init() it's too late
+ * and we cannot fall back to scanning.
+ */
+ if (WARN_ON(count_fastmap_pebs(ai) != ubi->peb_count -
+ ai->bad_peb_count - fm->used_blocks))
+ goto fail_bad;
+#endif
+
+ return 0;
+
+fail_bad:
+ ret = UBI_BAD_FASTMAP;
+fail:
+ return ret;
+}
+
+static int ubi_scan_fastmap(struct ubi_scan_info *ubi,
+ struct ubi_attach_info *ai,
+ int fm_anchor)
+{
+ struct ubi_fm_sb *fmsb, *fmsb2;
+ struct ubi_vid_hdr *vh;
+ struct ubi_fastmap_layout *fm;
+ int i, used_blocks, pnum, ret = 0;
+ size_t fm_size;
+ __be32 crc, tmp_crc;
+ unsigned long long sqnum = 0;
+
+ fmsb = &ubi->fm_sb;
+ fm = &ubi->fm_layout;
+
+ ret = ubi_io_read(ubi, fmsb, fm_anchor, ubi->leb_start, sizeof(*fmsb));
+ if (ret && ret != UBI_IO_BITFLIPS)
+ goto free_fm_sb;
+ else if (ret == UBI_IO_BITFLIPS)
+ fm->to_be_tortured[0] = 1;
+
+ if (be32_to_cpu(fmsb->magic) != UBI_FM_SB_MAGIC) {
+ ubi_err("bad super block magic: 0x%x, expected: 0x%x",
+ be32_to_cpu(fmsb->magic), UBI_FM_SB_MAGIC);
+ ret = UBI_BAD_FASTMAP;
+ goto free_fm_sb;
+ }
+
+ if (fmsb->version != UBI_FM_FMT_VERSION) {
+ ubi_err("bad fastmap version: %i, expected: %i",
+ fmsb->version, UBI_FM_FMT_VERSION);
+ ret = UBI_BAD_FASTMAP;
+ goto free_fm_sb;
+ }
+
+ used_blocks = be32_to_cpu(fmsb->used_blocks);
+ if (used_blocks > UBI_FM_MAX_BLOCKS || used_blocks < 1) {
+ ubi_err("number of fastmap blocks is invalid: %i", used_blocks);
+ ret = UBI_BAD_FASTMAP;
+ goto free_fm_sb;
+ }
+
+ fm_size = ubi->leb_size * used_blocks;
+ if (fm_size != ubi->fm_size) {
+ ubi_err("bad fastmap size: %zi, expected: %zi", fm_size,
+ ubi->fm_size);
+ ret = UBI_BAD_FASTMAP;
+ goto free_fm_sb;
+ }
+
+ vh = &ubi->fm_vh;
+
+ for (i = 0; i < used_blocks; i++) {
+ pnum = be32_to_cpu(fmsb->block_loc[i]);
+
+ if (ubi_io_is_bad(ubi, pnum)) {
+ ret = UBI_BAD_FASTMAP;
+ goto free_hdr;
+ }
+
+#ifdef LATER
+ int image_seq;
+ ret = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
+ if (ret && ret != UBI_IO_BITFLIPS) {
+ ubi_err("unable to read fastmap block# %i EC (PEB: %i)",
+ i, pnum);
+ if (ret > 0)
+ ret = UBI_BAD_FASTMAP;
+ goto free_hdr;
+ } else if (ret == UBI_IO_BITFLIPS)
+ fm->to_be_tortured[i] = 1;
+
+ image_seq = be32_to_cpu(ech->image_seq);
+ if (!ubi->image_seq)
+ ubi->image_seq = image_seq;
+ /*
+ * Older UBI implementations have image_seq set to zero, so
+ * we shouldn't fail if image_seq == 0.
+ */
+ if (image_seq && (image_seq != ubi->image_seq)) {
+ ubi_err("wrong image seq:%d instead of %d",
+ be32_to_cpu(ech->image_seq), ubi->image_seq);
+ ret = UBI_BAD_FASTMAP;
+ goto free_hdr;
+ }
+#endif
+ ret = ubi_io_read_vid_hdr(ubi, pnum, vh, 0);
+ if (ret && ret != UBI_IO_BITFLIPS) {
+ ubi_err("unable to read fastmap block# %i (PEB: %i)",
+ i, pnum);
+ goto free_hdr;
+ }
+
+ /*
+ * Mainline code rescans the anchor header. We've done
+ * that already so we merily copy it over.
+ */
+ if (pnum == fm_anchor)
+ memcpy(vh, ubi->blockinfo + pnum, sizeof(*fm));
+
+ if (i == 0) {
+ if (be32_to_cpu(vh->vol_id) != UBI_FM_SB_VOLUME_ID) {
+ ubi_err("bad fastmap anchor vol_id: 0x%x," \
+ " expected: 0x%x",
+ be32_to_cpu(vh->vol_id),
+ UBI_FM_SB_VOLUME_ID);
+ ret = UBI_BAD_FASTMAP;
+ goto free_hdr;
+ }
+ } else {
+ if (be32_to_cpu(vh->vol_id) != UBI_FM_DATA_VOLUME_ID) {
+ ubi_err("bad fastmap data vol_id: 0x%x," \
+ " expected: 0x%x",
+ be32_to_cpu(vh->vol_id),
+ UBI_FM_DATA_VOLUME_ID);
+ ret = UBI_BAD_FASTMAP;
+ goto free_hdr;
+ }
+ }
+
+ if (sqnum < be64_to_cpu(vh->sqnum))
+ sqnum = be64_to_cpu(vh->sqnum);
+
+ ret = ubi_io_read(ubi, ubi->fm_buf + (ubi->leb_size * i), pnum,
+ ubi->leb_start, ubi->leb_size);
+ if (ret && ret != UBI_IO_BITFLIPS) {
+ ubi_err("unable to read fastmap block# %i (PEB: %i, " \
+ "err: %i)", i, pnum, ret);
+ goto free_hdr;
+ }
+ }
+
+ fmsb2 = (struct ubi_fm_sb *)(ubi->fm_buf);
+ tmp_crc = be32_to_cpu(fmsb2->data_crc);
+ fmsb2->data_crc = 0;
+ crc = crc32(UBI_CRC32_INIT, ubi->fm_buf, fm_size);
+ if (crc != tmp_crc) {
+ ubi_err("fastmap data CRC is invalid");
+ ubi_err("CRC should be: 0x%x, calc: 0x%x", tmp_crc, crc);
+ ret = UBI_BAD_FASTMAP;
+ goto free_hdr;
+ }
+
+ fmsb2->sqnum = sqnum;
+
+ fm->used_blocks = used_blocks;
+
+ ret = ubi_attach_fastmap(ubi, ai, fm);
+ if (ret) {
+ if (ret > 0)
+ ret = UBI_BAD_FASTMAP;
+ goto free_hdr;
+ }
+
+ ubi->fm = fm;
+ ubi->fm_pool.max_size = ubi->fm->max_pool_size;
+ ubi->fm_wl_pool.max_size = ubi->fm->max_wl_pool_size;
+ ubi_msg("attached by fastmap %uMB %u blocks",
+ ubi->fsize_mb, ubi->peb_count);
+ ubi_dbg("fastmap pool size: %d", ubi->fm_pool.max_size);
+ ubi_dbg("fastmap WL pool size: %d", ubi->fm_wl_pool.max_size);
+
+out:
+ if (ret)
+ ubi_err("Attach by fastmap failed, doing a full scan!");
+ return ret;
+
+free_hdr:
+free_fm_sb:
+ goto out;
+}
+
+/*
+ * Scan the flash and attempt to attach via fastmap
+ */
+static void ipl_scan(struct ubi_scan_info *ubi)
+{
+ unsigned int pnum;
+ int res;
+
+ /*
+ * Scan first for the fastmap super block
+ */
+ for (pnum = 0; pnum < UBI_FM_MAX_START; pnum++) {
+ res = ubi_scan_vid_hdr(ubi, ubi->blockinfo + pnum, pnum);
+ /*
+ * We ignore errors here as we are meriliy scanning
+ * the headers.
+ */
+ if (res != UBI_FASTMAP_ANCHOR)
+ continue;
+
+ /*
+ * If fastmap is disabled, continue scanning. This
+ * might happen because the previous attempt failed or
+ * the caller disabled it right away.
+ */
+ if (!ubi->fm_enabled)
+ continue;
+
+ /*
+ * Try to attach the fastmap, if that fails continue
+ * scanning.
+ */
+ if (!ubi_scan_fastmap(ubi, NULL, pnum))
+ return;
+ /*
+ * Fastmap failed. Clear everything we have and start
+ * over. We are paranoid and do not trust anything.
+ */
+ memset(ubi->volinfo, 0, sizeof(ubi->volinfo));
+ pnum = 0;
+ break;
+ }
+
+ /*
+ * Continue scanning, ignore errors, we might find what we are
+ * looking for,
+ */
+ for (; pnum < ubi->peb_count; pnum++)
+ ubi_scan_vid_hdr(ubi, ubi->blockinfo + pnum, pnum);
+}
+
+/*
+ * Load a logical block of a volume into memory
+ */
+static int ubi_load_block(struct ubi_scan_info *ubi, uint8_t *laddr,
+ struct ubi_vol_info *vi, u32 vol_id, u32 lnum,
+ u32 last)
+{
+ struct ubi_vid_hdr *vh, *vrepl;
+ u32 pnum, crc, dlen;
+
+retry:
+ /*
+ * If this is a fastmap run, we try to rescan full, otherwise
+ * we simply give up.
+ */
+ if (!test_bit(lnum, vi->found)) {
+ ubi_warn("LEB %d of %d is missing", lnum, last);
+ return -EINVAL;
+ }
+
+ pnum = vi->lebs_to_pebs[lnum];
+
+ ubi_dbg("Load vol %u LEB %u PEB %u", vol_id, lnum, pnum);
+
+ if (ubi_io_is_bad(ubi, pnum)) {
+ ubi_warn("Corrupted mapping block %d PB %d\n", lnum, pnum);
+ return -EINVAL;
+ }
+
+ if (test_bit(pnum, ubi->corrupt))
+ goto find_other;
+
+ /*
+ * Lets try to read that block
+ */
+ vh = ubi->blockinfo + pnum;
+
+ if (!test_bit(pnum, ubi->scanned)) {
+ ubi_warn("Vol: %u LEB %u PEB %u not yet scanned", vol_id,
+ lnum, pnum);
+ if (ubi_rescan_fm_vid_hdr(ubi, vh, pnum, vol_id, lnum))
+ goto find_other;
+ }
+
+ /*
+ * Check, if the total number of blocks is correct
+ */
+ if (be32_to_cpu(vh->used_ebs) != last) {
+ ubi_dbg("Block count missmatch.");
+ ubi_dbg("vh->used_ebs: %d nrblocks: %d",
+ be32_to_cpu(vh->used_ebs), last);
+ generic_set_bit(pnum, ubi->corrupt);
+ goto find_other;
+ }
+
+ /*
+ * Get the data length of this block.
+ */
+ dlen = be32_to_cpu(vh->data_size);
+
+ /*
+ * Read the data into RAM. We ignore the return value
+ * here as the only thing which might go wrong are
+ * bitflips. Try nevertheless.
+ */
+ ubi_io_read(ubi, laddr, pnum, ubi->leb_start, dlen);
+
+ /* Calculate CRC over the data */
+ crc = crc32(UBI_CRC32_INIT, laddr, dlen);
+
+ if (crc != be32_to_cpu(vh->data_crc)) {
+ ubi_warn("Vol: %u LEB %u PEB %u data CRC failure", vol_id,
+ lnum, pnum);
+ generic_set_bit(pnum, ubi->corrupt);
+ goto find_other;
+ }
+
+ /* We are good. Return the data length we read */
+ return dlen;
+
+find_other:
+ ubi_dbg("Find replacement for LEB %u PEB %u", lnum, pnum);
+ generic_clear_bit(lnum, vi->found);
+ vrepl = NULL;
+
+ for (pnum = 0; pnum < ubi->peb_count; pnum++) {
+ struct ubi_vid_hdr *tmp = ubi->blockinfo + pnum;
+ u32 t_vol_id = be32_to_cpu(tmp->vol_id);
+ u32 t_lnum = be32_to_cpu(tmp->lnum);
+
+ if (test_bit(pnum, ubi->corrupt))
+ continue;
+
+ if (t_vol_id != vol_id || t_lnum != lnum)
+ continue;
+
+ if (!test_bit(pnum, ubi->scanned)) {
+ ubi_warn("Vol: %u LEB %u PEB %u not yet scanned",
+ vol_id, lnum, pnum);
+ if (ubi_rescan_fm_vid_hdr(ubi, tmp, pnum, vol_id, lnum))
+ continue;
+ }
+
+ /*
+ * We found one. If its the first, assign it otherwise
+ * compare the sqnum
+ */
+ generic_set_bit(lnum, vi->found);
+
+ if (!vrepl) {
+ vrepl = tmp;
+ continue;
+ }
+
+ if (be64_to_cpu(vrepl->sqnum) < be64_to_cpu(tmp->sqnum))
+ vrepl = tmp;
+ }
+
+ if (vrepl) {
+ /* Update the vi table */
+ pnum = vrepl - ubi->blockinfo;
+ vi->lebs_to_pebs[lnum] = pnum;
+ ubi_dbg("Trying PEB %u for LEB %u", pnum, lnum);
+ vh = vrepl;
+ }
+ goto retry;
+}
+
+/*
+ * Load a volume into RAM
+ */
+static int ipl_load(struct ubi_scan_info *ubi, const u32 vol_id, uint8_t *laddr)
+{
+ struct ubi_vol_info *vi;
+ u32 lnum, last, len;
+
+ if (vol_id >= UBI_SPL_VOL_IDS)
+ return -EINVAL;
+
+ len = 0;
+ vi = ubi->volinfo + vol_id;
+ last = vi->last_block + 1;
+
+ /* Read the blocks to RAM, check CRC */
+ for (lnum = 0 ; lnum < last; lnum++) {
+ int res = ubi_load_block(ubi, laddr, vi, vol_id, lnum, last);
+
+ if (res < 0) {
+ ubi_warn("Failed to load volume %u", vol_id);
+ return res;
+ }
+ /* res is the data length of the read block */
+ laddr += res;
+ len += res;
+ }
+ return len;
+}
+
+int ubispl_load_volumes(struct ubispl_info *info, struct ubispl_load *lvols,
+ int nrvols)
+{
+ struct ubi_scan_info *ubi = info->ubi;
+ int res, i, fastmap = info->fastmap;
+ u32 fsize;
+
+retry:
+ /*
+ * We do a partial initializiation of @ubi. Cleaning fm_buf is
+ * not necessary.
+ */
+ memset(ubi, 0, offsetof(struct ubi_scan_info, fm_buf));
+
+ ubi->read = info->read;
+
+ /* Precalculate the offsets */
+ ubi->vid_offset = info->vid_offset;
+ ubi->leb_start = info->leb_start;
+ ubi->leb_size = info->peb_size - ubi->leb_start;
+ ubi->peb_count = info->peb_count;
+ ubi->peb_offset = info->peb_offset;
+
+ fsize = info->peb_size * info->peb_count;
+ ubi->fsize_mb = fsize >> 20;
+
+ /* Fastmap init */
+ ubi->fm_size = ubi_calc_fm_size(ubi);
+ ubi->fm_enabled = fastmap;
+
+ for (i = 0; i < nrvols; i++) {
+ struct ubispl_load *lv = lvols + i;
+
+ generic_set_bit(lv->vol_id, ubi->toload);
+ }
+
+ ipl_scan(ubi);
+
+ for (i = 0; i < nrvols; i++) {
+ struct ubispl_load *lv = lvols + i;
+
+ ubi_msg("Loading VolId #%d", lv->vol_id);
+ res = ipl_load(ubi, lv->vol_id, lv->load_addr);
+ if (res < 0) {
+ if (fastmap) {
+ fastmap = 0;
+ goto retry;
+ }
+ ubi_warn("Failed");
+ return res;
+ }
+ }
+ return 0;
+}
diff --git a/drivers/mtd/ubispl/ubispl.h b/drivers/mtd/ubispl/ubispl.h
new file mode 100644
index 0000000..9227881
--- /dev/null
+++ b/drivers/mtd/ubispl/ubispl.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) Thomas Gleixner <tglx@linutronix.de>
+ *
+ * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
+ */
+
+#ifndef _UBOOT_MTD_UBISPL_H
+#define _UBOOT_MTD_UBISPL_H
+
+#include "../ubi/ubi-media.h"
+#include "ubi-wrapper.h"
+
+/*
+ * The maximum number of volume ids we scan. So you can load volume id
+ * 0 to (CONFIG_SPL_UBI_VOL_ID_MAX - 1)
+ */
+#define UBI_SPL_VOL_IDS CONFIG_SPL_UBI_VOL_IDS
+/*
+ * The size of the read buffer for the fastmap blocks. In theory up to
+ * UBI_FM_MAX_BLOCKS * CONFIG_SPL_MAX_PEB_SIZE. In practice today
+ * one or two blocks.
+ */
+#define UBI_FM_BUF_SIZE (UBI_FM_MAX_BLOCKS*CONFIG_SPL_UBI_MAX_PEB_SIZE)
+/*
+ * The size of the bitmaps for the attach/ scan
+ */
+#define UBI_FM_BM_SIZE ((CONFIG_SPL_UBI_MAX_PEBS / BITS_PER_LONG) + 1)
+/*
+ * The maximum number of logical erase blocks per loadable volume
+ */
+#define UBI_MAX_VOL_LEBS CONFIG_SPL_UBI_MAX_VOL_LEBS
+/*
+ * The bitmap size for the above to denote the found blocks inside the volume
+ */
+#define UBI_VOL_BM_SIZE ((UBI_MAX_VOL_LEBS / BITS_PER_LONG) + 1)
+
+/**
+ * struct ubi_vol_info - UBISPL internal volume represenation
+ * @last_block: The last block (highest LEB) found for this volume
+ * @found: Bitmap to mark found LEBS
+ * @lebs_to_pebs: LEB to PEB translation table
+ */
+struct ubi_vol_info {
+ u32 last_block;
+ unsigned long found[UBI_VOL_BM_SIZE];
+ u32 lebs_to_pebs[UBI_MAX_VOL_LEBS];
+};
+
+/**
+ * struct ubi_scan_info - UBISPL internal data for FM attach and full scan
+ *
+ * @read: Read function to access the flash provided by the caller
+ * @peb_count: Number of physical erase blocks in the UBI FLASH area
+ * aka MTD partition.
+ * @peb_offset: Offset of PEB0 in the UBI FLASH area (aka MTD partition)
+ * to the real start of the FLASH in erase blocks.
+ * @fsize_mb: Size of the scanned FLASH area in MB (stats only)
+ * @vid_offset: Offset from the start of a PEB to the VID header
+ * @leb_start: Offset from the start of a PEB to the data area
+ * @leb_size: Size of the data area
+ *
+ * @fastmap_pebs: Counter of PEBs "attached" by fastmap
+ * @fastmap_anchor: The anchor PEB of the fastmap
+ * @fm_sb: The fastmap super block data
+ * @fm_vh: The fastmap VID header
+ * @fm: Pointer to the fastmap layout
+ * @fm_layout: The fastmap layout itself
+ * @fm_pool: The pool of PEBs to scan at fastmap attach time
+ * @fm_wl_pool: The pool of PEBs scheduled for wearleveling
+ *
+ * @fm_enabled: Indicator whether fastmap attachment is enabled.
+ * @fm_used: Bitmap to indicate the PEBS covered by fastmap
+ * @scanned: Bitmap to indicate the PEBS of which the VID header
+ * hase been physically scanned.
+ * @corrupt: Bitmap to indicate corrupt blocks
+ * @toload: Bitmap to indicate the volumes which should be loaded
+ *
+ * @blockinfo: The vid headers of the scanned blocks
+ * @volinfo: The volume information of the interesting (toload)
+ * volumes
+ *
+ * @fm_buf: The large fastmap attach buffer
+ */
+struct ubi_scan_info {
+ ubispl_read_flash read;
+ unsigned int fsize_mb;
+ unsigned int peb_count;
+ unsigned int peb_offset;
+
+ unsigned long vid_offset;
+ unsigned long leb_start;
+ unsigned long leb_size;
+
+ /* Fastmap: The upstream required fields */
+ int fastmap_pebs;
+ int fastmap_anchor;
+ size_t fm_size;
+ struct ubi_fm_sb fm_sb;
+ struct ubi_vid_hdr fm_vh;
+ struct ubi_fastmap_layout *fm;
+ struct ubi_fastmap_layout fm_layout;
+ struct ubi_fm_pool fm_pool;
+ struct ubi_fm_pool fm_wl_pool;
+
+ /* Fastmap: UBISPL specific data */
+ int fm_enabled;
+ unsigned long fm_used[UBI_FM_BM_SIZE];
+ unsigned long scanned[UBI_FM_BM_SIZE];
+ unsigned long corrupt[UBI_FM_BM_SIZE];
+ unsigned long toload[UBI_FM_BM_SIZE];
+
+ /* Data for storing the VID and volume information */
+ struct ubi_vol_info volinfo[UBI_SPL_VOL_IDS];
+ struct ubi_vid_hdr blockinfo[CONFIG_SPL_UBI_MAX_PEBS];
+
+ /* The large buffer for the fastmap */
+ uint8_t fm_buf[UBI_FM_BUF_SIZE];
+};
+
+#ifdef CFG_DEBUG
+#define ubi_dbg(fmt, ...) printf("UBI: debug:" fmt "\n", ##__VA_ARGS__)
+#else
+#define ubi_dbg(fmt, ...)
+#endif
+
+#ifdef CONFIG_UBI_SILENCE_MSG
+#define ubi_msg(fmt, ...)
+#else
+#define ubi_msg(fmt, ...) printf("UBI: " fmt "\n", ##__VA_ARGS__)
+#endif
+/* UBI warning messages */
+#define ubi_warn(fmt, ...) printf("UBI warning: " fmt "\n", ##__VA_ARGS__)
+/* UBI error messages */
+#define ubi_err(fmt, ...) printf("UBI error: " fmt "\n", ##__VA_ARGS__)
+
+#endif
diff --git a/include/ubispl.h b/include/ubispl.h
new file mode 100644
index 0000000..944653e
--- /dev/null
+++ b/include/ubispl.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) Thomas Gleixner <tglx@linutronix.de>
+ *
+ * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
+ */
+#ifndef __UBOOT_UBISPL_H
+#define __UBOOT_UBISPL_H
+
+/*
+ * The following CONFIG options are relevant for UBISPL
+ *
+ * #define CONFIG_SPL_UBI_MAX_VOL_LEBS 256
+ *
+ * Defines the maximum number of logical erase blocks per loadable
+ * (static) volume to size the ubispl internal arrays.
+ *
+ * #define CONFIG_SPL_UBI_MAX_PEB_SIZE (256*1024)
+ *
+ * Defines the maximum physical erase block size to size the fastmap
+ * buffer for ubispl.
+ *
+ * #define CONFIG_SPL_UBI_MAX_PEBS 4096
+ *
+ * Define the maximum number of physical erase blocks to size the
+ * ubispl internal arrays.
+ *
+ * #define CONFIG_SPL_UBI_VOL_IDS 8
+ *
+ * Defines the maximum number of volumes in which UBISPL is
+ * interested. Limits the amount of memory for the scan data and
+ * speeds up the scan process as we simply ignore stuff which we dont
+ * want to load from the SPL anyway. So the volumes which can be
+ * loaded in the above example are ids 0 - 7
+ */
+
+/*
+ * The struct definition is in drivers/mtd/ubispl/ubispl.h. It does
+ * not fit into the BSS due to the large buffer requirement of the
+ * upstream fastmap code. So the caller of ubispl_load_volumes needs
+ * to hand in a pointer to a free memory area where ubispl will place
+ * its data. The area is not required to be initialized.
+ */
+struct ubi_scan_info;
+
+typedef int (*ubispl_read_flash)(int pnum, int offset, int len, void *dst);
+
+/**
+ * struct ubispl_info - description structure for fast ubi scan
+ * @ubi: Pointer to memory space for ubi scan info structure
+ * @peb_size: Physical erase block size
+ * @vid_offset: Offset of the VID header
+ * @leb_start: Start of the logical erase block, i.e. offset of data
+ * @peb_count: Number of physical erase blocks in the UBI FLASH area
+ * aka MTD partition.
+ * @peb_offset: Offset of PEB0 in the UBI FLASH area (aka MTD partition)
+ * to the real start of the FLASH in erase blocks.
+ * @fastmap: Enable fastmap attachment
+ * @read: Read function to access the flash
+ */
+struct ubispl_info {
+ struct ubi_scan_info *ubi;
+ u32 peb_size;
+ u32 vid_offset;
+ u32 leb_start;
+ u32 peb_count;
+ u32 peb_offset;
+ int fastmap;
+ ubispl_read_flash read;
+};
+
+/**
+ * struct ubispl_load - structure to describe a volume to load
+ * @vol_id: Volume id
+ * @load_addr: Load address of the volume
+ */
+struct ubispl_load {
+ int vol_id;
+ void *load_addr;
+};
+
+/**
+ * ubispl_load_volumes - Scan flash and load volumes
+ * @info: Pointer to the ubi scan info structure
+ * @lovls: Pointer to array of volumes to load
+ * @nrvols: Array size of @lovls
+ */
+int ubispl_load_volumes(struct ubispl_info *info,
+ struct ubispl_load *lvols, int nrvols);
+
+#endif
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 05/26] spl: support loading from UBI volumes
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (3 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 04/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 06/26] spl: zImage support in Falcon mode Ladislav Michl
` (20 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Add support for loading from UBI volumes on the top of NAND
and OneNAND.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
---
Changes in v5:
- dual license GPL/BSD
Changes in v4: None
Changes in v3: None
Changes in v2: None
common/spl/Makefile | 3 ++
common/spl/spl.c | 6 ++++
common/spl/spl_ubi.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++
include/spl.h | 4 +++
4 files changed, 91 insertions(+)
create mode 100644 common/spl/spl_ubi.c
diff --git a/common/spl/Makefile b/common/spl/Makefile
index 2e0f695..b15f0f6 100644
--- a/common/spl/Makefile
+++ b/common/spl/Makefile
@@ -13,8 +13,11 @@ obj-$(CONFIG_SPL_FRAMEWORK) += spl.o
obj-$(CONFIG_SPL_LOAD_FIT) += spl_fit.o
obj-$(CONFIG_SPL_NOR_SUPPORT) += spl_nor.o
obj-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o
+ifndef CONFIG_SPL_UBI
obj-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o
obj-$(CONFIG_SPL_ONENAND_SUPPORT) += spl_onenand.o
+endif
+obj-$(CONFIG_SPL_UBI) += spl_ubi.o
obj-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o
obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 840910a..ef113f6 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -330,6 +330,11 @@ static int spl_load_image(u32 boot_device)
case BOOT_DEVICE_MMC2_2:
return spl_mmc_load_image(boot_device);
#endif
+#ifdef CONFIG_SPL_UBI
+ case BOOT_DEVICE_NAND:
+ case BOOT_DEVICE_ONENAND:
+ return spl_ubi_load_image(boot_device);
+#else
#ifdef CONFIG_SPL_NAND_SUPPORT
case BOOT_DEVICE_NAND:
return spl_nand_load_image();
@@ -338,6 +343,7 @@ static int spl_load_image(u32 boot_device)
case BOOT_DEVICE_ONENAND:
return spl_onenand_load_image();
#endif
+#endif
#ifdef CONFIG_SPL_NOR_SUPPORT
case BOOT_DEVICE_NOR:
return spl_nor_load_image();
diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c
new file mode 100644
index 0000000..f97e1ef
--- /dev/null
+++ b/common/spl/spl_ubi.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2016
+ * Ladislav Michl <ladis@linux-mips.org>
+ *
+ * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
+ */
+
+#include <common.h>
+#include <config.h>
+#include <nand.h>
+#include <onenand_uboot.h>
+#include <ubispl.h>
+#include <spl.h>
+
+int spl_ubi_load_image(u32 boot_device)
+{
+ struct image_header *header;
+ struct ubispl_info info;
+ struct ubispl_load volumes[2];
+ int ret = 1;
+
+ switch (boot_device) {
+#ifdef CONFIG_SPL_NAND_SUPPORT
+ case BOOT_DEVICE_NAND:
+ nand_init();
+ info.read = nand_spl_read_block;
+ info.peb_size = CONFIG_SYS_NAND_BLOCK_SIZE;
+ break;
+#endif
+#ifdef CONFIG_SPL_ONENAND_SUPPORT
+ case BOOT_DEVICE_ONENAND:
+ info.read = onenand_spl_read_block;
+ info.peb_size = CONFIG_SYS_ONENAND_BLOCK_SIZE;
+ break;
+#endif
+ default:
+ goto out;
+ }
+ info.ubi = (struct ubi_scan_info *)CONFIG_SPL_UBI_INFO_ADDR;
+ info.fastmap = 1;
+
+ info.peb_offset = CONFIG_SPL_UBI_PEB_OFFSET;
+ info.vid_offset = CONFIG_SPL_UBI_VID_OFFSET;
+ info.leb_start = CONFIG_SPL_UBI_LEB_START;
+ info.peb_count = CONFIG_SPL_UBI_MAX_PEBS - info.peb_offset;
+
+#ifdef CONFIG_SPL_OS_BOOT
+ if (!spl_start_uboot()) {
+ volumes[0].vol_id = CONFIG_SPL_UBI_LOAD_KERNEL_ID;
+ volumes[0].load_addr = (void *)CONFIG_SYS_LOAD_ADDR;
+ volumes[1].vol_id = CONFIG_SPL_UBI_LOAD_ARGS_ID;
+ volumes[1].load_addr = (void *)CONFIG_SYS_SPL_ARGS_ADDR;
+
+ ret = ubispl_load_volumes(&info, volumes, 2);
+ if (!ret) {
+ header = (struct image_header *)volumes[0].load_addr;
+ spl_parse_image_header(header);
+ puts("Linux loaded.\n");
+ goto out;
+ }
+ puts("Loading Linux failed, falling back to U-Boot.\n");
+ }
+#endif
+ header = (struct image_header *)
+ (CONFIG_SYS_TEXT_BASE - sizeof(struct image_header));
+ volumes[0].vol_id = CONFIG_SPL_UBI_LOAD_MONITOR_ID;
+ volumes[0].load_addr = (void *)header;
+
+ ret = ubispl_load_volumes(&info, volumes, 1);
+ if (!ret)
+ spl_parse_image_header(header);
+out:
+#ifdef CONFIG_SPL_NAND_SUPPORT
+ if (boot_device == BOOT_DEVICE_NAND)
+ nand_deselect();
+#endif
+ return ret;
+}
diff --git a/include/spl.h b/include/spl.h
index 2360466..8afa085 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -71,6 +71,7 @@ void spl_set_header_raw_uboot(void);
int spl_parse_image_header(const struct image_header *header);
void spl_board_prepare_for_linux(void);
void spl_board_prepare_for_boot(void);
+int spl_board_ubi_load_image(u32 boot_device);
void __noreturn jump_to_image_linux(void *arg);
int spl_start_uboot(void);
void spl_display_print(void);
@@ -84,6 +85,9 @@ int spl_onenand_load_image(void);
/* NOR SPL functions */
int spl_nor_load_image(void);
+/* UBI SPL functions */
+int spl_ubi_load_image(u32 boot_device);
+
/* MMC SPL functions */
int spl_mmc_load_image(u32 boot_device);
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 06/26] spl: zImage support in Falcon mode
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (4 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 05/26] spl: support loading from UBI volumes Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot,v5,06/26] " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 07/26] armv7: add reset timeout to identify_nand_chip Ladislav Michl
` (19 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Other payload than uImage is currently considered to be raw U-Boot
image. Check also for zImage in Falcon mode.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm/lib/Makefile | 2 ++
arch/arm/lib/bootm.c | 32 --------------------------------
arch/arm/lib/zimage.c | 40 ++++++++++++++++++++++++++++++++++++++++
common/spl/spl.c | 23 +++++++++++++++++++++++
4 files changed, 65 insertions(+), 32 deletions(-)
create mode 100644 arch/arm/lib/zimage.c
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 0e05e87..8d89c94 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -27,11 +27,13 @@ endif
obj-$(CONFIG_CPU_V7M) += cmd_boot.o
obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_CMD_BOOTM) += zimage.o
obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
obj-$(CONFIG_USE_ARCH_MEMSET) += memset.o
obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
else
obj-$(CONFIG_SPL_FRAMEWORK) += spl.o
+obj-$(CONFIG_SPL_FRAMEWORK) += zimage.o
endif
obj-$(CONFIG_SEMIHOSTING) += semihosting.o
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 0838d89..c20ef22 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -358,38 +358,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
return 0;
}
-#ifdef CONFIG_CMD_BOOTZ
-
-struct zimage_header {
- uint32_t code[9];
- uint32_t zi_magic;
- uint32_t zi_start;
- uint32_t zi_end;
-};
-
-#define LINUX_ARM_ZIMAGE_MAGIC 0x016f2818
-
-int bootz_setup(ulong image, ulong *start, ulong *end)
-{
- struct zimage_header *zi;
-
- zi = (struct zimage_header *)map_sysmem(image, 0);
- if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC) {
- puts("Bad Linux ARM zImage magic!\n");
- return 1;
- }
-
- *start = zi->zi_start;
- *end = zi->zi_end;
-
- printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n", image, *start,
- *end);
-
- return 0;
-}
-
-#endif /* CONFIG_CMD_BOOTZ */
-
#if defined(CONFIG_BOOTM_VXWORKS)
void boot_prep_vxworks(bootm_headers_t *images)
{
diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c
new file mode 100644
index 0000000..1e811a8
--- /dev/null
+++ b/arch/arm/lib/zimage.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2016
+ * Ladislav Michl <ladis@linux-mips.org>
+ *
+ * bootz code:
+ * Copyright (C) 2012 Marek Vasut <marek.vasut@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+#include <common.h>
+
+#define LINUX_ARM_ZIMAGE_MAGIC 0x016f2818
+
+struct arm_z_header {
+ uint32_t code[9];
+ uint32_t zi_magic;
+ uint32_t zi_start;
+ uint32_t zi_end;
+} __attribute__ ((__packed__));
+
+int bootz_setup(ulong image, ulong *start, ulong *end)
+{
+ struct arm_z_header *zi = (struct arm_z_header *)image;
+
+ if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC) {
+#ifndef CONFIG_SPL_FRAMEWORK
+ puts("Bad Linux ARM zImage magic!\n");
+#endif
+ return 1;
+ }
+
+ *start = zi->zi_start;
+ *end = zi->zi_end;
+#ifndef CONFIG_SPL_FRAMEWORK
+ printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n",
+ image, *start, *end);
+#endif
+
+ return 0;
+}
diff --git a/common/spl/spl.c b/common/spl/spl.c
index ef113f6..25d989b 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -57,6 +57,15 @@ __weak int spl_start_uboot(void)
puts("SPL: Direct Linux boot not active!\n");
return 1;
}
+
+/*
+ * Weak default function for arch specific zImage check. Return zero
+ * and fill start and end address if image is recognized.
+ */
+int __weak bootz_setup(ulong image, ulong *start, ulong *end)
+{
+ return 1;
+}
#endif
/*
@@ -125,6 +134,20 @@ int spl_parse_image_header(const struct image_header *header)
/* Signature not found, proceed to other boot methods. */
return -EINVAL;
#else
+#ifdef CONFIG_SPL_OS_BOOT
+ ulong start, end;
+
+ if (!bootz_setup((ulong)header, &start, &end)) {
+ spl_image.name = "Linux";
+ spl_image.os = IH_OS_LINUX;
+ spl_image.load_addr = CONFIG_SYS_LOAD_ADDR;
+ spl_image.entry_point = CONFIG_SYS_LOAD_ADDR;
+ spl_image.size = end - start;
+ debug("spl: payload zImage, load addr: 0x%x size: %d\n",
+ spl_image.load_addr, spl_image.size);
+ return 0;
+ }
+#endif
/* Signature not found - assume u-boot.bin */
debug("mkimage signature not found - ih_magic = %x\n",
header->ih_magic);
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 07/26] armv7: add reset timeout to identify_nand_chip
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (5 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 06/26] spl: zImage support in Falcon mode Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 08/26] armv7: make gpmc_cfg const Ladislav Michl
` (18 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
identify_nand_chip hangs forever in loop when NAND is not present.
As IGEPv2 comes either with NAND or OneNAND flash, add reset timeout
to let function fail gracefully allowing caller to know NAND is
not present. On NAND equipped board, reset succeeds on first read,
so 1000 loops seems to be safe timeout.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm/cpu/armv7/omap3/spl_id_nand.c | 32 +++++++++++++----------------
arch/arm/include/asm/arch-omap3/sys_proto.h | 2 +-
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap3/spl_id_nand.c b/arch/arm/cpu/armv7/omap3/spl_id_nand.c
index db6de09..26d3aa4 100644
--- a/arch/arm/cpu/armv7/omap3/spl_id_nand.c
+++ b/arch/arm/cpu/armv7/omap3/spl_id_nand.c
@@ -20,29 +20,16 @@
static struct gpmc *gpmc_config = (struct gpmc *)GPMC_BASE;
-/* nand_command: Send a flash command to the flash chip */
-static void nand_command(u8 command)
-{
- writeb(command, &gpmc_config->cs[0].nand_cmd);
-
- if (command == NAND_CMD_RESET) {
- unsigned char ret_val;
- writeb(NAND_CMD_STATUS, &gpmc_config->cs[0].nand_cmd);
- do {
- /* Wait until ready */
- ret_val = readl(&gpmc_config->cs[0].nand_dat);
- } while ((ret_val & NAND_STATUS_READY) != NAND_STATUS_READY);
- }
-}
-
/*
* Many boards will want to know the results of the NAND_CMD_READID command
* in order to decide what to do about DDR initialization. This function
* allows us to do that very early and to pass those results back to the
* board so it can make whatever decisions need to be made.
*/
-void identify_nand_chip(int *mfr, int *id)
+int identify_nand_chip(int *mfr, int *id)
{
+ int loops = 1000;
+
/* Make sure that we have setup GPMC for NAND correctly. */
writel(M_NAND_GPMC_CONFIG1, &gpmc_config->cs[0].config1);
writel(M_NAND_GPMC_CONFIG2, &gpmc_config->cs[0].config2);
@@ -62,8 +49,15 @@ void identify_nand_chip(int *mfr, int *id)
sdelay(2000);
/* Issue a RESET and then READID */
- nand_command(NAND_CMD_RESET);
- nand_command(NAND_CMD_READID);
+ writeb(NAND_CMD_RESET, &gpmc_config->cs[0].nand_cmd);
+ writeb(NAND_CMD_STATUS, &gpmc_config->cs[0].nand_cmd);
+ while ((readl(&gpmc_config->cs[0].nand_dat) & NAND_STATUS_READY)
+ != NAND_STATUS_READY) {
+ sdelay(100);
+ if (--loops == 0)
+ return 1;
+ }
+ writeb(NAND_CMD_READID, &gpmc_config->cs[0].nand_cmd);
/* Set the address to read to 0x0 */
writeb(0x0, &gpmc_config->cs[0].nand_adr);
@@ -71,4 +65,6 @@ void identify_nand_chip(int *mfr, int *id)
/* Read off the manufacturer and device id. */
*mfr = readb(&gpmc_config->cs[0].nand_dat);
*id = readb(&gpmc_config->cs[0].nand_dat);
+
+ return 0;
}
diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
index 24563c0..1be2b15 100644
--- a/arch/arm/include/asm/arch-omap3/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
@@ -40,7 +40,7 @@ void sdrc_init(void);
void do_sdrc_init(u32, u32);
void get_board_mem_timings(struct board_sdrc_timings *timings);
-void identify_nand_chip(int *mfr, int *id);
+int identify_nand_chip(int *mfr, int *id);
void emif4_init(void);
void gpmc_init(void);
void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 08/26] armv7: make gpmc_cfg const
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (6 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 07/26] armv7: add reset timeout to identify_nand_chip Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot,v5,08/26] " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 09/26] armv7: armv7: introduce set_gpmc_cs0 Ladislav Michl
` (17 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm/cpu/armv7/omap-common/mem-common.c | 8 +++-----
arch/arm/include/asm/arch-omap3/sys_proto.h | 4 ++--
drivers/mtd/nand/omap_gpmc.c | 3 ++-
include/linux/mtd/omap_gpmc.h | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap-common/mem-common.c b/arch/arm/cpu/armv7/omap-common/mem-common.c
index fc4290c..136a032 100644
--- a/arch/arm/cpu/armv7/omap-common/mem-common.c
+++ b/arch/arm/cpu/armv7/omap-common/mem-common.c
@@ -21,7 +21,7 @@
#include <command.h>
#include <linux/mtd/omap_gpmc.h>
-struct gpmc *gpmc_cfg;
+const struct gpmc *gpmc_cfg = (struct gpmc *)GPMC_BASE;
#if defined(CONFIG_OMAP34XX)
/********************************************************
@@ -50,8 +50,8 @@ u32 mem_ok(u32 cs)
}
#endif
-void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
- u32 size)
+void enable_gpmc_cs_config(const u32 *gpmc_config, const struct gpmc_cs *cs,
+ u32 base, u32 size)
{
writel(0, &cs->config7);
sdelay(1000);
@@ -75,8 +75,6 @@ void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
*****************************************************/
void gpmc_init(void)
{
- /* putting a blanket check on GPMC based on ZeBu for now */
- gpmc_cfg = (struct gpmc *)GPMC_BASE;
#if defined(CONFIG_NOR)
/* configure GPMC for NOR */
const u32 gpmc_regs[GPMC_MAX_REG] = { STNOR_GPMC_CONFIG1,
diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
index 1be2b15..4c5aa99 100644
--- a/arch/arm/include/asm/arch-omap3/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
@@ -43,8 +43,8 @@ void get_board_mem_timings(struct board_sdrc_timings *timings);
int identify_nand_chip(int *mfr, int *id);
void emif4_init(void);
void gpmc_init(void);
-void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
- u32 size);
+void enable_gpmc_cs_config(const u32 *gpmc_config, const struct gpmc_cs *cs,
+ u32 base, u32 size);
void watchdog_init(void);
void set_muxconf_regs(void);
diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c
index 67f293d..6e201d6 100644
--- a/drivers/mtd/nand/omap_gpmc.c
+++ b/drivers/mtd/nand/omap_gpmc.c
@@ -264,7 +264,8 @@ static int omap_calculate_ecc(struct mtd_info *mtd, const uint8_t *dat,
{
struct nand_chip *chip = mtd_to_nand(mtd);
struct omap_nand_info *info = nand_get_controller_data(chip);
- uint32_t *ptr, val = 0;
+ const uint32_t *ptr;
+ uint32_t val = 0;
int8_t i = 0, j;
switch (info->ecc_scheme) {
diff --git a/include/linux/mtd/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h
index 3a75674..f49ea3d 100644
--- a/include/linux/mtd/omap_gpmc.h
+++ b/include/linux/mtd/omap_gpmc.h
@@ -92,6 +92,6 @@ struct gpmc {
};
/* Used for board specific gpmc initialization */
-extern struct gpmc *gpmc_cfg;
+extern const struct gpmc *gpmc_cfg;
#endif /* __ASM_OMAP_GPMC_H */
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 09/26] armv7: armv7: introduce set_gpmc_cs0
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (7 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 08/26] armv7: make gpmc_cfg const Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 10/26] armv7: simplify identify_nand_chip Ladislav Michl
` (16 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Allow boards to runtime detect flash type.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm/cpu/armv7/omap-common/mem-common.c | 148 +++++++++++++++++-----------
arch/arm/include/asm/arch-omap3/sys_proto.h | 1 +
include/linux/mtd/omap_gpmc.h | 1 +
3 files changed, 92 insertions(+), 58 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap-common/mem-common.c b/arch/arm/cpu/armv7/omap-common/mem-common.c
index 136a032..d72e82e 100644
--- a/arch/arm/cpu/armv7/omap-common/mem-common.c
+++ b/arch/arm/cpu/armv7/omap-common/mem-common.c
@@ -20,9 +20,20 @@
#include <asm/arch/sys_proto.h>
#include <command.h>
#include <linux/mtd/omap_gpmc.h>
+#include <jffs2/load_kernel.h>
const struct gpmc *gpmc_cfg = (struct gpmc *)GPMC_BASE;
+#if defined(CONFIG_NOR)
+char gpmc_cs0_flash = MTD_DEV_TYPE_NOR;
+#elif defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND)
+char gpmc_cs0_flash = MTD_DEV_TYPE_NAND;
+#elif defined(CONFIG_CMD_ONENAND)
+char gpmc_cs0_flash = MTD_DEV_TYPE_ONENAND;
+#else
+char gpmc_cs0_flash = -1;
+#endif
+
#if defined(CONFIG_OMAP34XX)
/********************************************************
* mem_ok() - test used to see if timings are correct
@@ -68,6 +79,81 @@ void enable_gpmc_cs_config(const u32 *gpmc_config, const struct gpmc_cs *cs,
sdelay(2000);
}
+void set_gpmc_cs0(int flash_type)
+{
+ const u32 *gpmc_regs;
+ u32 base, size;
+#if defined(CONFIG_NOR)
+ const u32 gpmc_regs_nor[GPMC_MAX_REG] = {
+ STNOR_GPMC_CONFIG1,
+ STNOR_GPMC_CONFIG2,
+ STNOR_GPMC_CONFIG3,
+ STNOR_GPMC_CONFIG4,
+ STNOR_GPMC_CONFIG5,
+ STNOR_GPMC_CONFIG6,
+ STNOR_GPMC_CONFIG7
+ };
+#endif
+#if defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND)
+ const u32 gpmc_regs_nand[GPMC_MAX_REG] = {
+ M_NAND_GPMC_CONFIG1,
+ M_NAND_GPMC_CONFIG2,
+ M_NAND_GPMC_CONFIG3,
+ M_NAND_GPMC_CONFIG4,
+ M_NAND_GPMC_CONFIG5,
+ M_NAND_GPMC_CONFIG6,
+ 0
+ };
+#endif
+#if defined(CONFIG_CMD_ONENAND)
+ const u32 gpmc_regs_onenand[GPMC_MAX_REG] = {
+ ONENAND_GPMC_CONFIG1,
+ ONENAND_GPMC_CONFIG2,
+ ONENAND_GPMC_CONFIG3,
+ ONENAND_GPMC_CONFIG4,
+ ONENAND_GPMC_CONFIG5,
+ ONENAND_GPMC_CONFIG6,
+ 0
+ };
+#endif
+
+ switch (flash_type) {
+#if defined(CONFIG_NOR)
+ case MTD_DEV_TYPE_NOR:
+ gpmc_regs = gpmc_regs_nor;
+ base = CONFIG_SYS_FLASH_BASE;
+ size = (CONFIG_SYS_FLASH_SIZE > 0x08000000) ? GPMC_SIZE_256M :
+ ((CONFIG_SYS_FLASH_SIZE > 0x04000000) ? GPMC_SIZE_128M :
+ ((CONFIG_SYS_FLASH_SIZE > 0x02000000) ? GPMC_SIZE_64M :
+ ((CONFIG_SYS_FLASH_SIZE > 0x01000000) ? GPMC_SIZE_32M :
+ GPMC_SIZE_16M)));
+ break;
+#endif
+#if defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND)
+ case MTD_DEV_TYPE_NAND:
+ gpmc_regs = gpmc_regs_nand;
+ base = CONFIG_SYS_NAND_BASE;
+ size = GPMC_SIZE_16M;
+ break;
+#endif
+#if defined(CONFIG_CMD_ONENAND)
+ case MTD_DEV_TYPE_ONENAND:
+ gpmc_regs = gpmc_regs_onenand;
+ base = CONFIG_SYS_ONENAND_BASE;
+ size = GPMC_SIZE_128M;
+ break;
+#endif
+ default:
+ /* disable the GPMC0 config set by ROM code */
+ writel(0, &gpmc_cfg->cs[0].config7);
+ sdelay(1000);
+ return;
+ }
+
+ /* enable chip-select specific configurations */
+ enable_gpmc_cs_config(gpmc_regs, &gpmc_cfg->cs[0], base, size);
+}
+
/*****************************************************
* gpmc_init(): init gpmc bus
* Init GPMC for x16, MuxMode (SDRAM in x32).
@@ -75,68 +161,14 @@ void enable_gpmc_cs_config(const u32 *gpmc_config, const struct gpmc_cs *cs,
*****************************************************/
void gpmc_init(void)
{
-#if defined(CONFIG_NOR)
-/* configure GPMC for NOR */
- const u32 gpmc_regs[GPMC_MAX_REG] = { STNOR_GPMC_CONFIG1,
- STNOR_GPMC_CONFIG2,
- STNOR_GPMC_CONFIG3,
- STNOR_GPMC_CONFIG4,
- STNOR_GPMC_CONFIG5,
- STNOR_GPMC_CONFIG6,
- STNOR_GPMC_CONFIG7
- };
- u32 base = CONFIG_SYS_FLASH_BASE;
- u32 size = (CONFIG_SYS_FLASH_SIZE > 0x08000000) ? GPMC_SIZE_256M :
- /* > 64MB */ ((CONFIG_SYS_FLASH_SIZE > 0x04000000) ? GPMC_SIZE_128M :
- /* > 32MB */ ((CONFIG_SYS_FLASH_SIZE > 0x02000000) ? GPMC_SIZE_64M :
- /* > 16MB */ ((CONFIG_SYS_FLASH_SIZE > 0x01000000) ? GPMC_SIZE_32M :
- /* min 16MB */ GPMC_SIZE_16M)));
-#elif defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND)
-/* configure GPMC for NAND */
- const u32 gpmc_regs[GPMC_MAX_REG] = { M_NAND_GPMC_CONFIG1,
- M_NAND_GPMC_CONFIG2,
- M_NAND_GPMC_CONFIG3,
- M_NAND_GPMC_CONFIG4,
- M_NAND_GPMC_CONFIG5,
- M_NAND_GPMC_CONFIG6,
- 0
- };
- u32 base = CONFIG_SYS_NAND_BASE;
- u32 size = GPMC_SIZE_16M;
-
-#elif defined(CONFIG_CMD_ONENAND)
- const u32 gpmc_regs[GPMC_MAX_REG] = { ONENAND_GPMC_CONFIG1,
- ONENAND_GPMC_CONFIG2,
- ONENAND_GPMC_CONFIG3,
- ONENAND_GPMC_CONFIG4,
- ONENAND_GPMC_CONFIG5,
- ONENAND_GPMC_CONFIG6,
- 0
- };
- u32 size = GPMC_SIZE_128M;
- u32 base = CONFIG_SYS_ONENAND_BASE;
-#else
- const u32 gpmc_regs[GPMC_MAX_REG] = { 0, 0, 0, 0, 0, 0, 0 };
- u32 size = 0;
- u32 base = 0;
-#endif
/* global settings */
writel(0x00000008, &gpmc_cfg->sysconfig);
writel(0x00000000, &gpmc_cfg->irqstatus);
writel(0x00000000, &gpmc_cfg->irqenable);
/* disable timeout, set a safe reset value */
writel(0x00001ff0, &gpmc_cfg->timeout_control);
-#ifdef CONFIG_NOR
- writel(0x00000200, &gpmc_cfg->config);
-#else
- writel(0x00000012, &gpmc_cfg->config);
-#endif
- /*
- * Disable the GPMC0 config set by ROM code
- */
- writel(0, &gpmc_cfg->cs[0].config7);
- sdelay(1000);
- /* enable chip-select specific configurations */
- if (base != 0)
- enable_gpmc_cs_config(gpmc_regs, &gpmc_cfg->cs[0], base, size);
+ writel(gpmc_cs0_flash == MTD_DEV_TYPE_NOR ?
+ 0x00000200 : 0x00000012, &gpmc_cfg->config);
+
+ set_gpmc_cs0(gpmc_cs0_flash);
}
diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
index 4c5aa99..5979340 100644
--- a/arch/arm/include/asm/arch-omap3/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
@@ -45,6 +45,7 @@ void emif4_init(void);
void gpmc_init(void);
void enable_gpmc_cs_config(const u32 *gpmc_config, const struct gpmc_cs *cs,
u32 base, u32 size);
+void set_gpmc_cs0(int flash_type);
void watchdog_init(void);
void set_muxconf_regs(void);
diff --git a/include/linux/mtd/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h
index f49ea3d..be3ce9d 100644
--- a/include/linux/mtd/omap_gpmc.h
+++ b/include/linux/mtd/omap_gpmc.h
@@ -93,5 +93,6 @@ struct gpmc {
/* Used for board specific gpmc initialization */
extern const struct gpmc *gpmc_cfg;
+extern char gpmc_cs0_flash;
#endif /* __ASM_OMAP_GPMC_H */
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 10/26] armv7: simplify identify_nand_chip
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (8 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 09/26] armv7: armv7: introduce set_gpmc_cs0 Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot,v5,10/26] " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 11/26] mtd: OneNAND: add timeout to wait ready loops Ladislav Michl
` (15 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Use newly introduced function
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm/cpu/armv7/omap3/spl_id_nand.c | 35 +++++++++++-----------------------
1 file changed, 11 insertions(+), 24 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap3/spl_id_nand.c b/arch/arm/cpu/armv7/omap3/spl_id_nand.c
index 26d3aa4..0e2f0a2 100644
--- a/arch/arm/cpu/armv7/omap3/spl_id_nand.c
+++ b/arch/arm/cpu/armv7/omap3/spl_id_nand.c
@@ -13,13 +13,13 @@
*/
#include <common.h>
+#include <jffs2/load_kernel.h>
#include <linux/mtd/nand.h>
+#include <linux/mtd/omap_gpmc.h>
#include <asm/io.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/mem.h>
-static struct gpmc *gpmc_config = (struct gpmc *)GPMC_BASE;
-
/*
* Many boards will want to know the results of the NAND_CMD_READID command
* in order to decide what to do about DDR initialization. This function
@@ -31,40 +31,27 @@ int identify_nand_chip(int *mfr, int *id)
int loops = 1000;
/* Make sure that we have setup GPMC for NAND correctly. */
- writel(M_NAND_GPMC_CONFIG1, &gpmc_config->cs[0].config1);
- writel(M_NAND_GPMC_CONFIG2, &gpmc_config->cs[0].config2);
- writel(M_NAND_GPMC_CONFIG3, &gpmc_config->cs[0].config3);
- writel(M_NAND_GPMC_CONFIG4, &gpmc_config->cs[0].config4);
- writel(M_NAND_GPMC_CONFIG5, &gpmc_config->cs[0].config5);
- writel(M_NAND_GPMC_CONFIG6, &gpmc_config->cs[0].config6);
-
- /*
- * Enable the config. The CS size goes in bits 11:8. We set
- * bit 6 to enable the CS and the base address goes into bits 5:0.
- */
- writel((GPMC_SIZE_128M << 8) | (GPMC_CS_ENABLE << 6) |
- ((NAND_BASE >> 24) & GPMC_BASEADDR_MASK),
- &gpmc_config->cs[0].config7);
+ set_gpmc_cs0(MTD_DEV_TYPE_NAND);
sdelay(2000);
/* Issue a RESET and then READID */
- writeb(NAND_CMD_RESET, &gpmc_config->cs[0].nand_cmd);
- writeb(NAND_CMD_STATUS, &gpmc_config->cs[0].nand_cmd);
- while ((readl(&gpmc_config->cs[0].nand_dat) & NAND_STATUS_READY)
- != NAND_STATUS_READY) {
+ writeb(NAND_CMD_RESET, &gpmc_cfg->cs[0].nand_cmd);
+ writeb(NAND_CMD_STATUS, &gpmc_cfg->cs[0].nand_cmd);
+ while ((readl(&gpmc_cfg->cs[0].nand_dat) & NAND_STATUS_READY)
+ != NAND_STATUS_READY) {
sdelay(100);
if (--loops == 0)
return 1;
}
- writeb(NAND_CMD_READID, &gpmc_config->cs[0].nand_cmd);
+ writeb(NAND_CMD_READID, &gpmc_cfg->cs[0].nand_cmd);
/* Set the address to read to 0x0 */
- writeb(0x0, &gpmc_config->cs[0].nand_adr);
+ writeb(0x0, &gpmc_cfg->cs[0].nand_adr);
/* Read off the manufacturer and device id. */
- *mfr = readb(&gpmc_config->cs[0].nand_dat);
- *id = readb(&gpmc_config->cs[0].nand_dat);
+ *mfr = readb(&gpmc_cfg->cs[0].nand_dat);
+ *id = readb(&gpmc_cfg->cs[0].nand_dat);
return 0;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 11/26] mtd: OneNAND: add timeout to wait ready loops
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (9 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 10/26] armv7: simplify identify_nand_chip Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 12/26] mtd: OneNAND: allow board init function fail Ladislav Michl
` (14 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Add timeout to onenand_wait ready loop as it hangs here indefinitely
when chip not present. Once there, do the same for onenand_bbt_wait
as well (note: recent Linux driver code does the same)
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/mtd/onenand/onenand_base.c | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 03deabc..d194d97 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -20,6 +20,7 @@
*/
#include <common.h>
+#include <watchdog.h>
#include <linux/compat.h>
#include <linux/mtd/mtd.h>
#include "linux/mtd/flashchip.h"
@@ -467,15 +468,18 @@ static int onenand_read_ecc(struct onenand_chip *this)
static int onenand_wait(struct mtd_info *mtd, int state)
{
struct onenand_chip *this = mtd->priv;
- unsigned int flags = ONENAND_INT_MASTER;
unsigned int interrupt = 0;
unsigned int ctrl;
- while (1) {
+ /* Wait at most 20ms ... */
+ u32 timeo = (CONFIG_SYS_HZ * 20) / 1000;
+ u32 time_start = get_timer(0);
+ do {
+ WATCHDOG_RESET();
+ if (get_timer(time_start) > timeo)
+ return -EIO;
interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
- if (interrupt & flags)
- break;
- }
+ } while ((interrupt & ONENAND_INT_MASTER) == 0);
ctrl = this->read_word(this->base + ONENAND_REG_CTRL_STATUS);
@@ -1154,15 +1158,18 @@ int onenand_read_oob(struct mtd_info *mtd, loff_t from,
static int onenand_bbt_wait(struct mtd_info *mtd, int state)
{
struct onenand_chip *this = mtd->priv;
- unsigned int flags = ONENAND_INT_MASTER;
unsigned int interrupt;
unsigned int ctrl;
- while (1) {
+ /* Wait at most 20ms ... */
+ u32 timeo = (CONFIG_SYS_HZ * 20) / 1000;
+ u32 time_start = get_timer(0);
+ do {
+ WATCHDOG_RESET();
+ if (get_timer(time_start) > timeo)
+ return ONENAND_BBT_READ_FATAL_ERROR;
interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
- if (interrupt & flags)
- break;
- }
+ } while ((interrupt & ONENAND_INT_MASTER) == 0);
/* To get correct interrupt status in timeout case */
interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
@@ -2536,7 +2543,8 @@ static int onenand_chip_probe(struct mtd_info *mtd)
this->write_word(ONENAND_CMD_RESET, this->base + ONENAND_BOOTRAM);
/* Wait reset */
- this->wait(mtd, FL_RESETING);
+ if (this->wait(mtd, FL_RESETING))
+ return -ENXIO;
/* Restore system configuration 1 */
this->write_word(syscfg, this->base + ONENAND_REG_SYS_CFG1);
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 12/26] mtd: OneNAND: allow board init function fail
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (10 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 11/26] mtd: OneNAND: add timeout to wait ready loops Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 13/26] mtd: OneNAND: initialize mtd->writebufsize to let UBI work Ladislav Michl
` (13 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
board/micronas/vct/ebi_onenand.c | 4 +++-
board/samsung/goni/onenand.c | 4 +++-
board/samsung/smdkc100/onenand.c | 4 +++-
board/samsung/universal_c210/onenand.c | 4 +++-
drivers/mtd/onenand/onenand_uboot.c | 30 +++++++++++++++---------------
include/onenand_uboot.h | 2 +-
6 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/board/micronas/vct/ebi_onenand.c b/board/micronas/vct/ebi_onenand.c
index 62eb648..ef892ca 100644
--- a/board/micronas/vct/ebi_onenand.c
+++ b/board/micronas/vct/ebi_onenand.c
@@ -169,7 +169,7 @@ static int ebi_write_bufferram(struct mtd_info *mtd, loff_t addr, int area,
return 0;
}
-void onenand_board_init(struct mtd_info *mtd)
+int onenand_board_init(struct mtd_info *mtd)
{
struct onenand_chip *chip = mtd->priv;
@@ -181,4 +181,6 @@ void onenand_board_init(struct mtd_info *mtd)
chip->read_bufferram = ebi_read_bufferram;
chip->write_bufferram = ebi_write_bufferram;
+
+ return 0;
}
diff --git a/board/samsung/goni/onenand.c b/board/samsung/goni/onenand.c
index b74d8e8..cbe1d12f 100644
--- a/board/samsung/goni/onenand.c
+++ b/board/samsung/goni/onenand.c
@@ -11,11 +11,13 @@
#include <linux/mtd/samsung_onenand.h>
#include <onenand_uboot.h>
-void onenand_board_init(struct mtd_info *mtd)
+int onenand_board_init(struct mtd_info *mtd)
{
struct onenand_chip *this = mtd->priv;
this->base = (void *)CONFIG_SYS_ONENAND_BASE;
this->options |= ONENAND_RUNTIME_BADBLOCK_CHECK;
this->chip_probe = s5pc110_chip_probe;
+
+ return 0;
}
diff --git a/board/samsung/smdkc100/onenand.c b/board/samsung/smdkc100/onenand.c
index 577c1a5..994d91d 100644
--- a/board/samsung/smdkc100/onenand.c
+++ b/board/samsung/smdkc100/onenand.c
@@ -16,7 +16,7 @@
#include <asm/io.h>
#include <asm/arch/clock.h>
-void onenand_board_init(struct mtd_info *mtd)
+int onenand_board_init(struct mtd_info *mtd)
{
struct onenand_chip *this = mtd->priv;
struct s5pc100_clock *clk =
@@ -65,4 +65,6 @@ void onenand_board_init(struct mtd_info *mtd)
writel(value, &onenand->int_err_mask);
s3c_onenand_init(mtd);
+
+ return 0;
}
diff --git a/board/samsung/universal_c210/onenand.c b/board/samsung/universal_c210/onenand.c
index 28bc811..147a95e 100644
--- a/board/samsung/universal_c210/onenand.c
+++ b/board/samsung/universal_c210/onenand.c
@@ -10,11 +10,13 @@
#include <linux/mtd/onenand.h>
#include <linux/mtd/samsung_onenand.h>
-void onenand_board_init(struct mtd_info *mtd)
+int onenand_board_init(struct mtd_info *mtd)
{
struct onenand_chip *this = mtd->priv;
this->base = (void *)CONFIG_SYS_ONENAND_BASE;
this->options |= ONENAND_RUNTIME_BADBLOCK_CHECK;
this->chip_probe = s5pc210_chip_probe;
+
+ return 0;
}
diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c
index ae60c3b..c15ec9d 100644
--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@@ -24,33 +24,33 @@ static __attribute__((unused)) char dev_name[] = "onenand0";
void onenand_init(void)
{
+ int err = 0;
memset(&onenand_mtd, 0, sizeof(struct mtd_info));
memset(&onenand_chip, 0, sizeof(struct onenand_chip));
onenand_mtd.priv = &onenand_chip;
#ifdef CONFIG_USE_ONENAND_BOARD_INIT
- /*
- * It's used for some board init required
- */
- onenand_board_init(&onenand_mtd);
+ /* It's used for some board init required */
+ err = onenand_board_init(&onenand_mtd);
#else
onenand_chip.base = (void *) CONFIG_SYS_ONENAND_BASE;
#endif
- onenand_scan(&onenand_mtd, 1);
+ if (!err && !(onenand_scan(&onenand_mtd, 1))) {
- if (onenand_chip.device_id & DEVICE_IS_FLEXONENAND)
- puts("Flex-");
- puts("OneNAND: ");
- print_size(onenand_chip.chipsize, "\n");
+ if (onenand_chip.device_id & DEVICE_IS_FLEXONENAND)
+ puts("Flex-");
+ puts("OneNAND: ");
#ifdef CONFIG_MTD_DEVICE
- /*
- * Add MTD device so that we can reference it later
- * via the mtdcore infrastructure (e.g. ubi).
- */
- onenand_mtd.name = dev_name;
- add_mtd_device(&onenand_mtd);
+ /*
+ * Add MTD device so that we can reference it later
+ * via the mtdcore infrastructure (e.g. ubi).
+ */
+ onenand_mtd.name = dev_name;
+ add_mtd_device(&onenand_mtd);
#endif
+ }
+ print_size(onenand_chip.chipsize, "\n");
}
diff --git a/include/onenand_uboot.h b/include/onenand_uboot.h
index d69e0d2..995f0aa 100644
--- a/include/onenand_uboot.h
+++ b/include/onenand_uboot.h
@@ -26,7 +26,7 @@ extern struct mtd_info onenand_mtd;
extern struct onenand_chip onenand_chip;
/* board */
-extern void onenand_board_init(struct mtd_info *);
+extern int onenand_board_init(struct mtd_info *);
/* Functions */
extern void onenand_init(void);
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 13/26] mtd: OneNAND: initialize mtd->writebufsize to let UBI work
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (11 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 12/26] mtd: OneNAND: allow board init function fail Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 14/26] cmd: mtdparts: fix mtdparts variable presence confusion in mtdparts_init Ladislav Michl
` (12 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
io_init checks this value and fails with "bad write buffer size 0 for
2048 min. I/O unit"
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/mtd/onenand/onenand_base.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index d194d97..0e35dc5 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -2657,6 +2657,7 @@ int onenand_probe(struct mtd_info *mtd)
mtd->_sync = onenand_sync;
mtd->_block_isbad = onenand_block_isbad;
mtd->_block_markbad = onenand_block_markbad;
+ mtd->writebufsize = mtd->writesize;
return 0;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 14/26] cmd: mtdparts: fix mtdparts variable presence confusion in mtdparts_init
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (12 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 13/26] mtd: OneNAND: initialize mtd->writebufsize to let UBI work Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 15/26] cmd: mtdparts: fix null pointer dereference in parse_mtdparts Ladislav Michl
` (11 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
A private buffer is used to read mtdparts variable from non-relocated
environment. A pointer to that buffer is returned unconditionally,
confusing later test for variable presence in the environment.
Fix it by returning NULL when getenv_f fails.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
cmd/mtdparts.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 44b2c3a..3a88a10 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -1720,11 +1720,13 @@ int mtdparts_init(void)
* before the env is relocated, then we need to use our own stack
* buffer. gd->env_buf will be too small.
*/
- if (gd->flags & GD_FLG_ENV_READY) {
+ if (gd->flags & GD_FLG_ENV_READY)
parts = getenv("mtdparts");
- } else {
- parts = tmp_parts;
- getenv_f("mtdparts", tmp_parts, MTDPARTS_MAXLEN);
+ else {
+ if (getenv_f("mtdparts", tmp_parts, MTDPARTS_MAXLEN) != -1)
+ parts = tmp_parts;
+ else
+ parts = NULL;
}
current_partition = getenv("partition");
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 15/26] cmd: mtdparts: fix null pointer dereference in parse_mtdparts
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (13 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 14/26] cmd: mtdparts: fix mtdparts variable presence confusion in mtdparts_init Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 16/26] cmd: mtdparts: consolidate mtdparts reading from env Ladislav Michl
` (10 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
In case there is no mtdparts variable in relocated environment,
NULL is assigned to p, which is later fed to strncpy.
Also function parameter mtdparts is completely ignored, so use it
in case mtdparts variable is not found in environment. This
parameter is checked not to be NULL in caller.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
cmd/mtdparts.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 3a88a10..995cb87 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -1524,7 +1524,7 @@ static int spread_partitions(void)
*/
static int parse_mtdparts(const char *const mtdparts)
{
- const char *p = mtdparts;
+ const char *p;
struct mtd_device *dev;
int err = 1;
char tmp_parts[MTDPARTS_MAXLEN];
@@ -1538,20 +1538,25 @@ static int parse_mtdparts(const char *const mtdparts)
}
/* re-read 'mtdparts' variable, mtd_devices_init may be updating env */
- if (gd->flags & GD_FLG_ENV_READY) {
+ if (gd->flags & GD_FLG_ENV_READY)
p = getenv("mtdparts");
- } else {
- p = tmp_parts;
- getenv_f("mtdparts", tmp_parts, MTDPARTS_MAXLEN);
+ else {
+ if (getenv_f("mtdparts", tmp_parts, MTDPARTS_MAXLEN) != -1)
+ p = tmp_parts;
+ else
+ p = NULL;
}
+ if (!p)
+ p = mtdparts;
+
if (strncmp(p, "mtdparts=", 9) != 0) {
printf("mtdparts variable doesn't start with 'mtdparts='\n");
return err;
}
p += 9;
- while (p && (*p != '\0')) {
+ while (*p != '\0') {
err = 1;
if ((device_parse(p, &p, &dev) != 0) || (!dev))
break;
@@ -1569,12 +1574,10 @@ static int parse_mtdparts(const char *const mtdparts)
list_add_tail(&dev->link, &devices);
err = 0;
}
- if (err == 1) {
+ if (err == 1)
device_delall(&devices);
- return 1;
- }
- return 0;
+ return err;
}
/**
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 16/26] cmd: mtdparts: consolidate mtdparts reading from env
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (14 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 15/26] cmd: mtdparts: fix null pointer dereference in parse_mtdparts Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 17/26] cmd: mtdparts: use defaults by default Ladislav Michl
` (9 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
cmd/mtdparts.c | 42 ++++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 995cb87..7860ed9 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -1516,6 +1516,23 @@ static int spread_partitions(void)
#endif /* CONFIG_CMD_MTDPARTS_SPREAD */
/**
+ * The mtdparts variable tends to be long. If we need to access it
+ * before the env is relocated, then we need to use our own stack
+ * buffer. gd->env_buf will be too small.
+ *
+ * @param buf temporary buffer pointer MTDPARTS_MAXLEN long
+ * @return mtdparts variable string, NULL if not found
+ */
+static const char *getenv_mtdparts(char *buf)
+{
+ if (gd->flags & GD_FLG_ENV_READY)
+ return getenv("mtdparts");
+ if (getenv_f("mtdparts", buf, MTDPARTS_MAXLEN) != -1)
+ return buf;
+ return NULL;
+}
+
+/**
* Accept character string describing mtd partitions and call device_parse()
* for each entry. Add created devices to the global devices list.
*
@@ -1538,15 +1555,7 @@ static int parse_mtdparts(const char *const mtdparts)
}
/* re-read 'mtdparts' variable, mtd_devices_init may be updating env */
- if (gd->flags & GD_FLG_ENV_READY)
- p = getenv("mtdparts");
- else {
- if (getenv_f("mtdparts", tmp_parts, MTDPARTS_MAXLEN) != -1)
- p = tmp_parts;
- else
- p = NULL;
- }
-
+ p = getenv_mtdparts(tmp_parts);
if (!p)
p = mtdparts;
@@ -1691,6 +1700,7 @@ static int parse_mtdids(const char *const ids)
return 0;
}
+
/**
* Parse and initialize global mtdids mapping and create global
* device/partition list.
@@ -1718,19 +1728,7 @@ int mtdparts_init(void)
/* get variables */
ids = getenv("mtdids");
- /*
- * The mtdparts variable tends to be long. If we need to access it
- * before the env is relocated, then we need to use our own stack
- * buffer. gd->env_buf will be too small.
- */
- if (gd->flags & GD_FLG_ENV_READY)
- parts = getenv("mtdparts");
- else {
- if (getenv_f("mtdparts", tmp_parts, MTDPARTS_MAXLEN) != -1)
- parts = tmp_parts;
- else
- parts = NULL;
- }
+ parts = getenv_mtdparts(tmp_parts);
current_partition = getenv("partition");
/* save it for later parsing, cannot rely on current partition pointer
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 17/26] cmd: mtdparts: use defaults by default
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (15 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 16/26] cmd: mtdparts: consolidate mtdparts reading from env Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 18/26] cmd: mtdparts: support runtime generated mtdparts Ladislav Michl
` (8 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Boards which are defining default mtdparts often need them early
in boot process (to load environment from UBI volume, for example).
This is currently solved by adding mtdparts and mtdids variable
definitions also to default environment. With this change, default
partitions are used by default unless explicitely deleted or
redefined.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
cmd/mtdparts.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 7860ed9..53074a1 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -142,6 +142,8 @@ static struct list_head devices;
struct mtd_device *current_mtd_dev = NULL;
u8 current_mtd_partnum = 0;
+u8 use_defaults;
+
static struct part_info* mtd_part_info(struct mtd_device *dev, unsigned int part_num);
/* command line only routines */
@@ -1723,6 +1725,7 @@ int mtdparts_init(void)
memset(last_ids, 0, MTDIDS_MAXLEN);
memset(last_parts, 0, MTDPARTS_MAXLEN);
memset(last_partition, 0, PARTITION_MAXLEN);
+ use_defaults = 1;
initialized = 1;
}
@@ -1761,10 +1764,16 @@ int mtdparts_init(void)
return 1;
}
- /* do no try to use defaults when mtdparts variable is not defined,
- * just check the length */
- if (!parts)
- printf("mtdparts variable not set, see 'help mtdparts'\n");
+ /* use defaults when mtdparts variable is not defined
+ * once mtdparts is saved environment, drop use_defaults flag */
+ if (!parts) {
+ if (mtdparts_default && use_defaults) {
+ parts = mtdparts_default;
+ if (setenv("mtdparts", (char *)parts) == 0)
+ use_defaults = 0;
+ } else
+ printf("mtdparts variable not set, see 'help mtdparts'\n");
+ }
if (parts && (strlen(parts) > MTDPARTS_MAXLEN - 1)) {
printf("mtdparts too long (> %d)\n", MTDPARTS_MAXLEN);
@@ -1936,9 +1945,10 @@ static int do_mtdparts(cmd_tbl_t *cmdtp, int flag, int argc,
{
if (argc == 2) {
if (strcmp(argv[1], "default") == 0) {
- setenv("mtdids", (char *)mtdids_default);
- setenv("mtdparts", (char *)mtdparts_default);
+ setenv("mtdids", NULL);
+ setenv("mtdparts", NULL);
setenv("partition", NULL);
+ use_defaults = 1;
mtdparts_init();
return 0;
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 18/26] cmd: mtdparts: support runtime generated mtdparts
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (16 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 17/26] cmd: mtdparts: use defaults by default Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 19/26] igep00x0: move sysinfo into C file Ladislav Michl
` (7 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Some CPUs contains boot ROM code capable reading first few blocks
(where SPL resides) of NAND flash and executing it. It is wise to
create separate partition here for SPL. As block size depends on
NAND chip used, we could either use worst case (biggest) partition
size or base its size on actual block size. This patch adds support
for the latter option.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
cmd/mtdparts.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 53074a1..3f4f334 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -109,17 +109,17 @@ DECLARE_GLOBAL_DATA_PTR;
#define MTD_WRITEABLE_CMD 1
/* default values for mtdids and mtdparts variables */
-#if defined(MTDIDS_DEFAULT)
-static const char *const mtdids_default = MTDIDS_DEFAULT;
-#else
-static const char *const mtdids_default = NULL;
+#if !defined(MTDIDS_DEFAULT)
+#define MTDIDS_DEFAULT NULL
#endif
-
-#if defined(MTDPARTS_DEFAULT)
-static const char *const mtdparts_default = MTDPARTS_DEFAULT;
-#else
-static const char *const mtdparts_default = NULL;
+#if !defined(MTDPARTS_DEFAULT)
+#define MTDPARTS_DEFAULT NULL
#endif
+#if defined(CONFIG_SYS_MTDPARTS_RUNTIME)
+extern void board_mtdparts_default(const char **mtdids, const char **mtdparts);
+#endif
+static const char *mtdids_default = MTDIDS_DEFAULT;
+static const char *mtdparts_default = MTDPARTS_DEFAULT;
/* copies of last seen 'mtdids', 'mtdparts' and 'partition' env variables */
#define MTDIDS_MAXLEN 128
@@ -1725,6 +1725,9 @@ int mtdparts_init(void)
memset(last_ids, 0, MTDIDS_MAXLEN);
memset(last_parts, 0, MTDPARTS_MAXLEN);
memset(last_partition, 0, PARTITION_MAXLEN);
+#if defined(CONFIG_SYS_MTDPARTS_RUNTIME)
+ board_mtdparts_default(&mtdids_default, &mtdparts_default);
+#endif
use_defaults = 1;
initialized = 1;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 19/26] igep00x0: move sysinfo into C file
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (17 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 18/26] cmd: mtdparts: support runtime generated mtdparts Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot,v5,19/26] " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 20/26] igep00x0: reorder lan9221 code to remove ifdefs Ladislav Michl
` (6 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
board/isee/igep00x0/igep00x0.c | 18 ++++++++++++++++++
board/isee/igep00x0/igep00x0.h | 18 ------------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index d1a6a6f..0ad5123 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -21,6 +21,24 @@
DECLARE_GLOBAL_DATA_PTR;
+const omap3_sysinfo sysinfo = {
+ DDR_STACKED,
+#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020)
+ "IGEPv2",
+#endif
+#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0030)
+ "IGEP COM MODULE/ELECTRON",
+#endif
+#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0032)
+ "IGEP COM PROTON",
+#endif
+#if defined(CONFIG_ENV_IS_IN_ONENAND)
+ "ONENAND",
+#else
+ "NAND",
+#endif
+};
+
#if defined(CONFIG_CMD_NET)
/* GPMC definitions for LAN9221 chips */
static const u32 gpmc_lan_config[] = {
diff --git a/board/isee/igep00x0/igep00x0.h b/board/isee/igep00x0/igep00x0.h
index 3c7ff9b..e47ee66 100644
--- a/board/isee/igep00x0/igep00x0.h
+++ b/board/isee/igep00x0/igep00x0.h
@@ -7,24 +7,6 @@
#ifndef _IGEP00X0_H_
#define _IGEP00X0_H_
-const omap3_sysinfo sysinfo = {
- DDR_STACKED,
-#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020)
- "IGEPv2",
-#endif
-#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0030)
- "IGEP COM MODULE/ELECTRON",
-#endif
-#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0032)
- "IGEP COM PROTON",
-#endif
-#if defined(CONFIG_ENV_IS_IN_ONENAND)
- "ONENAND",
-#else
- "NAND",
-#endif
-};
-
static void setup_net_chip(void);
/*
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 20/26] igep00x0: reorder lan9221 code to remove ifdefs
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (18 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 19/26] igep00x0: move sysinfo into C file Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 21/26] igep00x0: remove useless setup_net_chip declaration Ladislav Michl
` (5 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
board/isee/igep00x0/igep00x0.c | 41 +++++++++++++++++------------------------
1 file changed, 17 insertions(+), 24 deletions(-)
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 0ad5123..4baaee5 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -39,18 +39,6 @@ const omap3_sysinfo sysinfo = {
#endif
};
-#if defined(CONFIG_CMD_NET)
-/* GPMC definitions for LAN9221 chips */
-static const u32 gpmc_lan_config[] = {
- NET_LAN9221_GPMC_CONFIG1,
- NET_LAN9221_GPMC_CONFIG2,
- NET_LAN9221_GPMC_CONFIG3,
- NET_LAN9221_GPMC_CONFIG4,
- NET_LAN9221_GPMC_CONFIG5,
- NET_LAN9221_GPMC_CONFIG6,
-};
-#endif
-
static const struct ns16550_platdata igep_serial = {
.base = OMAP34XX_UART3,
.reg_shift = 2,
@@ -119,7 +107,6 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
#endif
#if defined(CONFIG_CMD_NET)
-
static void reset_net_chip(int gpio)
{
if (!gpio_request(gpio, "eth nrst")) {
@@ -140,6 +127,14 @@ static void reset_net_chip(int gpio)
static void setup_net_chip(void)
{
struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE;
+ static const u32 gpmc_lan_config[] = {
+ NET_LAN9221_GPMC_CONFIG1,
+ NET_LAN9221_GPMC_CONFIG2,
+ NET_LAN9221_GPMC_CONFIG3,
+ NET_LAN9221_GPMC_CONFIG4,
+ NET_LAN9221_GPMC_CONFIG5,
+ NET_LAN9221_GPMC_CONFIG6,
+ };
enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[5],
CONFIG_SMC911X_BASE, GPMC_SIZE_16M);
@@ -154,6 +149,15 @@ static void setup_net_chip(void)
reset_net_chip(64);
}
+
+int board_eth_init(bd_t *bis)
+{
+#ifdef CONFIG_SMC911X
+ return smc911x_initialize(0, CONFIG_SMC911X_BASE);
+#else
+ return 0;
+#endif
+}
#else
static inline void setup_net_chip(void) {}
#endif
@@ -219,14 +223,3 @@ void set_muxconf_regs(void)
MUX_IGEP0030();
#endif
}
-
-#if defined(CONFIG_CMD_NET)
-int board_eth_init(bd_t *bis)
-{
-#ifdef CONFIG_SMC911X
- return smc911x_initialize(0, CONFIG_SMC911X_BASE);
-#else
- return 0;
-#endif
-}
-#endif
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 21/26] igep00x0: remove useless setup_net_chip declaration
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (19 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 20/26] igep00x0: reorder lan9221 code to remove ifdefs Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 22/26] igep00x0: remove unused empty function omap_rev_string() Ladislav Michl
` (4 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
board/isee/igep00x0/igep00x0.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/board/isee/igep00x0/igep00x0.h b/board/isee/igep00x0/igep00x0.h
index e47ee66..5698efa 100644
--- a/board/isee/igep00x0/igep00x0.h
+++ b/board/isee/igep00x0/igep00x0.h
@@ -7,8 +7,6 @@
#ifndef _IGEP00X0_H_
#define _IGEP00X0_H_
-static void setup_net_chip(void);
-
/*
* IEN - Input Enable
* IDIS - Input Disable
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 22/26] igep00x0: remove unused empty function omap_rev_string()
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (20 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 21/26] igep00x0: remove useless setup_net_chip declaration Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 23/26] igep00x0: runtime flash detection Ladislav Michl
` (3 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
board/isee/igep00x0/igep00x0.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 4baaee5..5dfb7d2 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -69,14 +69,6 @@ int board_init(void)
#ifdef CONFIG_SPL_BUILD
/*
- * Routine: omap_rev_string
- * Description: For SPL builds output board rev
- */
-void omap_rev_string(void)
-{
-}
-
-/*
* Routine: get_board_mem_timings
* Description: If we use SPL then there is no x-loader nor config header
* so we have to setup the DDR timings ourself on both banks.
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 23/26] igep00x0: runtime flash detection
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (21 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 22/26] igep00x0: remove unused empty function omap_rev_string() Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:12 ` [U-Boot] [U-Boot,v5,23/26] " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 24/26] igep00x0: UBIize Ladislav Michl
` (2 subsequent siblings)
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
board/isee/igep00x0/igep00x0.c | 71 +++++++++++++++++++++++++++++++-----------
1 file changed, 53 insertions(+), 18 deletions(-)
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 5dfb7d2..b36709c 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -17,6 +17,10 @@
#include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h>
#include <asm/mach-types.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/onenand.h>
+#include <jffs2/load_kernel.h>
#include "igep00x0.h"
DECLARE_GLOBAL_DATA_PTR;
@@ -56,7 +60,25 @@ U_BOOT_DEVICE(igep_uart) = {
*/
int board_init(void)
{
- gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
+ int loops = 100;
+
+ /* find out flash memory type, assume NAND first */
+ gpmc_cs0_flash = MTD_DEV_TYPE_NAND;
+ gpmc_init();
+
+ /* Issue a RESET and then READID */
+ writeb(NAND_CMD_RESET, &gpmc_cfg->cs[0].nand_cmd);
+ writeb(NAND_CMD_STATUS, &gpmc_cfg->cs[0].nand_cmd);
+ while ((readl(&gpmc_cfg->cs[0].nand_dat) & NAND_STATUS_READY)
+ != NAND_STATUS_READY) {
+ udelay(1);
+ if (--loops == 0) {
+ gpmc_cs0_flash = MTD_DEV_TYPE_ONENAND;
+ gpmc_init(); /* reinitialize for OneNAND */
+ break;
+ }
+ }
+
/* boot param addr */
gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
@@ -75,29 +97,42 @@ int board_init(void)
*/
void get_board_mem_timings(struct board_sdrc_timings *timings)
{
- timings->mr = MICRON_V_MR_165;
-#ifdef CONFIG_BOOT_NAND
- timings->mcfg = MICRON_V_MCFG_200(256 << 20);
- timings->ctrla = MICRON_V_ACTIMA_200;
- timings->ctrlb = MICRON_V_ACTIMB_200;
- timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_200MHz;
-#else
- if (get_cpu_family() == CPU_OMAP34XX) {
- timings->mcfg = NUMONYX_V_MCFG_165(256 << 20);
- timings->ctrla = NUMONYX_V_ACTIMA_165;
- timings->ctrlb = NUMONYX_V_ACTIMB_165;
- timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz;
+ int mfr, id, err = identify_nand_chip(&mfr, &id);
- } else {
- timings->mcfg = NUMONYX_V_MCFG_200(256 << 20);
- timings->ctrla = NUMONYX_V_ACTIMA_200;
- timings->ctrlb = NUMONYX_V_ACTIMB_200;
+ timings->mr = MICRON_V_MR_165;
+ if (!err && mfr == NAND_MFR_MICRON) {
+ timings->mcfg = MICRON_V_MCFG_200(256 << 20);
+ timings->ctrla = MICRON_V_ACTIMA_200;
+ timings->ctrlb = MICRON_V_ACTIMB_200;
timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_200MHz;
+ gpmc_cs0_flash = MTD_DEV_TYPE_NAND;
+ } else {
+ if (get_cpu_family() == CPU_OMAP34XX) {
+ timings->mcfg = NUMONYX_V_MCFG_165(256 << 20);
+ timings->ctrla = NUMONYX_V_ACTIMA_165;
+ timings->ctrlb = NUMONYX_V_ACTIMB_165;
+ timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz;
+ } else {
+ timings->mcfg = NUMONYX_V_MCFG_200(256 << 20);
+ timings->ctrla = NUMONYX_V_ACTIMA_200;
+ timings->ctrlb = NUMONYX_V_ACTIMB_200;
+ timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_200MHz;
+ }
+ gpmc_cs0_flash = MTD_DEV_TYPE_ONENAND;
}
-#endif
}
#endif
+int onenand_board_init(struct mtd_info *mtd)
+{
+ if (gpmc_cs0_flash == MTD_DEV_TYPE_ONENAND) {
+ struct onenand_chip *this = mtd->priv;
+ this->base = (void *)CONFIG_SYS_ONENAND_BASE;
+ return 0;
+ }
+ return 1;
+}
+
#if defined(CONFIG_CMD_NET)
static void reset_net_chip(int gpio)
{
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 24/26] igep00x0: UBIize
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (22 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 23/26] igep00x0: runtime flash detection Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:12 ` [U-Boot] [U-Boot,v5,24/26] " Tom Rini
2016-07-23 0:12 ` Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 25/26] igep00x0: generate default mtdparts according NAND chip used Ladislav Michl
2016-07-12 18:28 ` [U-Boot] [PATCH v5 26/26] igep00x0: Falcon mode Ladislav Michl
25 siblings, 2 replies; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Convert IGEP board to use UBI volumes for U-Boot, its environment and
kernel. With exception of first four sectors read by SoC boot
ROM whole (One)NAND is UBI managed.
Also merge NAND and OneNAND defconfigs as now one binary can serve
both flashes.
As code is too big now, drop CONFIG_SPL_EXT_SUPPORT to make it fit.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
configs/igep0020_defconfig | 4 +-
configs/igep0020_nand_defconfig | 27 -------------
include/configs/omap3_igep00x0.h | 85 ++++++++++++++++++----------------------
3 files changed, 41 insertions(+), 75 deletions(-)
delete mode 100644 configs/igep0020_nand_defconfig
diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
index 66dd93f..649dd47 100644
--- a/configs/igep0020_defconfig
+++ b/configs/igep0020_defconfig
@@ -2,7 +2,8 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_IGEP00X0=y
CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND"
+CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020"
+CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
@@ -24,4 +25,5 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SYS_NS16550=y
+CONFIG_USE_TINY_PRINTF=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig
deleted file mode 100644
index 7535d10..0000000
--- a/configs/igep0020_nand_defconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-CONFIG_ARM=y
-CONFIG_OMAP34XX=y
-CONFIG_TARGET_OMAP3_IGEP00X0=y
-CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND"
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_BOOTZ=y
-# CONFIG_CMD_IMLS is not set
-CONFIG_CMD_ASKENV=y
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_MMC=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_GPIO=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SYS_NS16550=y
-CONFIG_OF_LIBFDT=y
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 9bd8915..03ffda9 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -10,11 +10,8 @@
#ifndef __IGEP00X0_H
#define __IGEP00X0_H
-#ifdef CONFIG_BOOT_NAND
-#define CONFIG_NAND
-#endif
-
#define CONFIG_NR_DRAM_BANKS 2
+#define CONFIG_NAND
#include <configs/ti_omap3_common.h>
#include <asm/mach-types.h>
@@ -76,9 +73,9 @@
#define CONFIG_USBD_MANUFACTURER "Texas Instruments"
#define CONFIG_USBD_PRODUCT_NAME "IGEP"
-#ifdef CONFIG_BOOT_ONENAND
-#define CONFIG_CMD_ONENAND /* ONENAND support */
-#endif
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_CMD_ONENAND
+#define CONFIG_CMD_UBI
#ifndef CONFIG_SPL_BUILD
@@ -106,27 +103,6 @@
#endif
/*
- * FLASH and environment organization
- */
-
-#ifdef CONFIG_BOOT_ONENAND
-#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
-
-#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
-
-#define CONFIG_ENV_IS_IN_ONENAND 1
-#define CONFIG_ENV_SIZE (512 << 10) /* Total Size Environment */
-#define CONFIG_ENV_ADDR ONENAND_ENV_OFFSET
-#endif
-
-#ifdef CONFIG_NAND
-#define CONFIG_ENV_OFFSET 0x260000 /* environment starts here */
-#define CONFIG_ENV_IS_IN_NAND 1
-#define CONFIG_ENV_SIZE (512 << 10) /* Total Size Environment */
-#define CONFIG_ENV_ADDR NAND_ENV_OFFSET
-#endif
-
-/*
* SMSC911x Ethernet
*/
#if defined(CONFIG_CMD_NET)
@@ -135,19 +111,18 @@
#define CONFIG_SMC911X_BASE 0x2C000000
#endif /* (CONFIG_CMD_NET) */
-/* OneNAND boot config */
-#ifdef CONFIG_BOOT_ONENAND
-#define CONFIG_SPL_ONENAND_SUPPORT
-#define CONFIG_SYS_ONENAND_U_BOOT_OFFS 0x80000
-#define CONFIG_SYS_ONENAND_PAGE_SIZE 2048
-#define CONFIG_SPL_ONENAND_LOAD_ADDR 0x80000
-#define CONFIG_SPL_ONENAND_LOAD_SIZE \
- (512 * 1024 - CONFIG_SPL_ONENAND_LOAD_ADDR)
+#define CONFIG_RBTREE
+#define CONFIG_MTD_PARTITIONS
-#endif
+/* OneNAND config */
+#define CONFIG_SPL_ONENAND_SUPPORT
+#define CONFIG_USE_ONENAND_BOARD_INIT
+#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
+#define CONFIG_SYS_ONENAND_BLOCK_SIZE (128*1024)
-/* NAND boot config */
-#ifdef CONFIG_NAND
+/* NAND config */
+#define CONFIG_SPL_NAND_SUPPORT
+#define CONFIG_SPL_OMAP3_ID_NAND
#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
#define CONFIG_SYS_NAND_PAGE_COUNT 64
@@ -168,13 +143,29 @@
#define CONFIG_NAND_OMAP_GPMC
#define CONFIG_BCH
-#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
-/* NAND: SPL falcon mode configs */
-#ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_CMD_SPL_NAND_OFS 0x240000
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000
-#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000
-#endif
-#endif
+/* UBI configuration */
+#define CONFIG_SPL_UBI 1
+#define CONFIG_SPL_UBI_MAX_VOL_LEBS 256
+#define CONFIG_SPL_UBI_MAX_PEB_SIZE (256*1024)
+#define CONFIG_SPL_UBI_MAX_PEBS 4096
+#define CONFIG_SPL_UBI_VOL_IDS 8
+#define CONFIG_SPL_UBI_LOAD_MONITOR_ID 0
+#define CONFIG_SPL_UBI_LOAD_KERNEL_ID 3
+#define CONFIG_SPL_UBI_LOAD_ARGS_ID 4
+#define CONFIG_SPL_UBI_PEB_OFFSET 4
+#define CONFIG_SPL_UBI_VID_OFFSET 512
+#define CONFIG_SPL_UBI_LEB_START 2048
+#define CONFIG_SPL_UBI_INFO_ADDR 0x88080000
+
+/* environment organization */
+#define CONFIG_ENV_IS_IN_UBI 1
+#define CONFIG_ENV_UBI_PART "UBI"
+#define CONFIG_ENV_UBI_VOLUME "config"
+#define CONFIG_ENV_UBI_VOLUME_REDUND "config_r"
+#define CONFIG_UBI_SILENCE_MSG 1
+#define CONFIG_UBIFS_SILENCE_MSG 1
+#define CONFIG_ENV_SIZE (32*1024)
+
+#undef CONFIG_SPL_EXT_SUPPORT
#endif /* __IGEP00X0_H */
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 25/26] igep00x0: generate default mtdparts according NAND chip used
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (23 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 24/26] igep00x0: UBIize Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:12 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 26/26] igep00x0: Falcon mode Ladislav Michl
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
board/isee/igep00x0/igep00x0.c | 18 ++++++++++++++++++
include/configs/omap3_igep00x0.h | 1 +
2 files changed, 19 insertions(+)
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index b36709c..4c52b36 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -17,6 +17,7 @@
#include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h>
#include <asm/mach-types.h>
+#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/onenand.h>
@@ -232,6 +233,23 @@ int misc_init_r(void)
return 0;
}
+void board_mtdparts_default(const char **mtdids, const char **mtdparts)
+{
+ struct mtd_info *mtd = get_mtd_device(NULL, 0);
+ if (mtd) {
+ static char ids[24];
+ static char parts[48];
+ const char *linux_name = "omap2-nand";
+ if (strncmp(mtd->name, "onenand0", 8) == 0)
+ linux_name = "omap2-onenand";
+ snprintf(ids, sizeof(ids), "%s=%s", mtd->name, linux_name);
+ snprintf(parts, sizeof(parts), "mtdparts=%s:%dk(SPL),-(UBI)",
+ linux_name, 4 * mtd->erasesize >> 10);
+ *mtdids = ids;
+ *mtdparts = parts;
+ }
+}
+
/*
* Routine: set_muxconf_regs
* Description: Setting up the configuration Mux registers specific to the
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 03ffda9..e0d2593 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -113,6 +113,7 @@
#define CONFIG_RBTREE
#define CONFIG_MTD_PARTITIONS
+#define CONFIG_SYS_MTDPARTS_RUNTIME
/* OneNAND config */
#define CONFIG_SPL_ONENAND_SUPPORT
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [PATCH v5 26/26] igep00x0: Falcon mode
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
` (24 preceding siblings ...)
2016-07-12 18:28 ` [U-Boot] [PATCH v5 25/26] igep00x0: generate default mtdparts according NAND chip used Ladislav Michl
@ 2016-07-12 18:28 ` Ladislav Michl
2016-07-23 0:12 ` [U-Boot] [U-Boot,v5,26/26] " Tom Rini
25 siblings, 1 reply; 54+ messages in thread
From: Ladislav Michl @ 2016-07-12 18:28 UTC (permalink / raw)
To: u-boot
Implement spl_start_uboot to let Falcon mode work.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
board/isee/igep00x0/igep00x0.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 4c52b36..808955e 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -10,6 +10,7 @@
#include <ns16550.h>
#include <twl4030.h>
#include <netdev.h>
+#include <spl.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <asm/arch/mem.h>
@@ -122,6 +123,17 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
gpmc_cs0_flash = MTD_DEV_TYPE_ONENAND;
}
}
+
+#ifdef CONFIG_SPL_OS_BOOT
+int spl_start_uboot(void)
+{
+ /* break into full u-boot on 'c' */
+ if (serial_tstc() && serial_getc() == 'c')
+ return 1;
+
+ return 0;
+}
+#endif
#endif
int onenand_board_init(struct mtd_info *mtd)
--
2.1.4
^ permalink raw reply related [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 01/26] mtd: Sort subsystem directories aplhabeticaly in Makefile
2016-07-12 18:28 ` [U-Boot] [PATCH v5 01/26] mtd: Sort subsystem directories aplhabeticaly in Makefile Ladislav Michl
@ 2016-07-23 0:10 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:10 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:09PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Heiko Schocher <hs@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/1706c94a/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 02/26] nand_spl_simple: Add a simple NAND read function
2016-07-12 18:28 ` [U-Boot] [PATCH v5 02/26] nand_spl_simple: Add a simple NAND read function Ladislav Michl
@ 2016-07-23 0:10 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:10 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:10PM +0200, Ladislav Michl wrote:
> From: Thomas Gleixner <tglx@linutronix.de>
>
> To support UBI in SPL we need a simple NAND read function. Add one to
> nand_spl_simple and keep it as simple as it goes.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Acked-by: Scott Wood <oss@buserror.net>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Heiko Schocher <hs@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/13e5dac0/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 03/26] onenand_spl_simple: Add a simple OneNAND read function
2016-07-12 18:28 ` [U-Boot] [PATCH v5 03/26] onenand_spl_simple: Add a simple OneNAND " Ladislav Michl
@ 2016-07-23 0:10 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:10 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:11PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/b68709fd/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 04/26] spl: Lightweight UBI and UBI fastmap support
2016-07-12 18:28 ` [U-Boot] [PATCH v5 04/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
@ 2016-07-23 0:10 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:10 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:12PM +0200, Ladislav Michl wrote:
> From: Thomas Gleixner <tglx@linutronix.de>
>
> Booting a payload out of NAND FLASH from the SPL is a crux today, as
> it requires hard partioned FLASH. Not a brilliant idea with the
> reliability of todays NAND FLASH chips.
>
> The upstream UBI + UBI fastmap implementation which is about to
> brought to u-boot is too heavy weight for SPLs as it provides way more
> functionality than needed for a SPL and does not even fit into the
> restricted SPL areas which are loaded from the SoC boot ROM.
>
> So this provides a fast and lightweight implementation of UBI scanning
> and UBI fastmap attach. The scan and logical to physical block mapping
> code is developed from scratch, while the fastmap implementation is
> lifted from the linux kernel source and stripped down to fit the SPL
> needs.
>
> The text foot print on the board which I used for development is:
>
> 6854 0 0 6854 1abd
> drivers/mtd/ubispl/built-in.o
>
> Attaching a NAND chip with 4096 physical eraseblocks (4 blocks are
> reserved for the SPL) takes:
>
> In full scan mode: 1172ms
> In fastmap mode: 95ms
>
> The code requires quite some storage. The largest and unknown part of
> it is the number of fastmap blocks to read. Therefor the data
> structure is not put into the BSS. The code requires a pointer to free
> memory handed in which is initialized by the UBI attach code itself.
>
> See doc/README.ubispl for further information on how to use it.
>
> This shares the ubi-media.h and crc32 implementation of drivers/mtd/ubi
> There is no way to share the fastmap code, as UBISPL only utilizes the
> slightly modified functions ubi_attach_fastmap() and ubi_scan_fastmap()
> from the original kernel ubi fastmap implementation.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Acked-by: Heiko Schocher <hs@denx.de>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/064e7bbb/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 05/26] spl: support loading from UBI volumes
2016-07-12 18:28 ` [U-Boot] [PATCH v5 05/26] spl: support loading from UBI volumes Ladislav Michl
@ 2016-07-23 0:10 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:10 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:13PM +0200, Ladislav Michl wrote:
> Add support for loading from UBI volumes on the top of NAND
> and OneNAND.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Reviewed-by: Heiko Schocher <hs@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/9c59639d/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot,v5,06/26] spl: zImage support in Falcon mode
2016-07-12 18:28 ` [U-Boot] [PATCH v5 06/26] spl: zImage support in Falcon mode Ladislav Michl
@ 2016-07-23 0:10 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:10 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:14PM +0200, Ladislav Michl wrote:
> Other payload than uImage is currently considered to be raw U-Boot
> image. Check also for zImage in Falcon mode.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Reviewed-by: Heiko Schocher <hs@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/4bf7a5c0/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 07/26] armv7: add reset timeout to identify_nand_chip
2016-07-12 18:28 ` [U-Boot] [PATCH v5 07/26] armv7: add reset timeout to identify_nand_chip Ladislav Michl
@ 2016-07-23 0:10 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:10 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:15PM +0200, Ladislav Michl wrote:
> identify_nand_chip hangs forever in loop when NAND is not present.
> As IGEPv2 comes either with NAND or OneNAND flash, add reset timeout
> to let function fail gracefully allowing caller to know NAND is
> not present. On NAND equipped board, reset succeeds on first read,
> so 1000 loops seems to be safe timeout.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/db158c30/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot,v5,08/26] armv7: make gpmc_cfg const
2016-07-12 18:28 ` [U-Boot] [PATCH v5 08/26] armv7: make gpmc_cfg const Ladislav Michl
@ 2016-07-23 0:10 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:10 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:16PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Fixed am33xx, duovero and omap_zoom1 and then, applied to u-boot/master,
thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/c59d49bd/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 09/26] armv7: armv7: introduce set_gpmc_cs0
2016-07-12 18:28 ` [U-Boot] [PATCH v5 09/26] armv7: armv7: introduce set_gpmc_cs0 Ladislav Michl
@ 2016-07-23 0:10 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:10 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:17PM +0200, Ladislav Michl wrote:
> Allow boards to runtime detect flash type.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/dae46170/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot,v5,10/26] armv7: simplify identify_nand_chip
2016-07-12 18:28 ` [U-Boot] [PATCH v5 10/26] armv7: simplify identify_nand_chip Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:18PM +0200, Ladislav Michl wrote:
> Use newly introduced function
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/69840574/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 11/26] mtd: OneNAND: add timeout to wait ready loops
2016-07-12 18:28 ` [U-Boot] [PATCH v5 11/26] mtd: OneNAND: add timeout to wait ready loops Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:19PM +0200, Ladislav Michl wrote:
> Add timeout to onenand_wait ready loop as it hangs here indefinitely
> when chip not present. Once there, do the same for onenand_bbt_wait
> as well (note: recent Linux driver code does the same)
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/f7123537/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 12/26] mtd: OneNAND: allow board init function fail
2016-07-12 18:28 ` [U-Boot] [PATCH v5 12/26] mtd: OneNAND: allow board init function fail Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:20PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/92683a13/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 13/26] mtd: OneNAND: initialize mtd->writebufsize to let UBI work
2016-07-12 18:28 ` [U-Boot] [PATCH v5 13/26] mtd: OneNAND: initialize mtd->writebufsize to let UBI work Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:21PM +0200, Ladislav Michl wrote:
> io_init checks this value and fails with "bad write buffer size 0 for
> 2048 min. I/O unit"
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/6191ba7e/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 14/26] cmd: mtdparts: fix mtdparts variable presence confusion in mtdparts_init
2016-07-12 18:28 ` [U-Boot] [PATCH v5 14/26] cmd: mtdparts: fix mtdparts variable presence confusion in mtdparts_init Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:22PM +0200, Ladislav Michl wrote:
> A private buffer is used to read mtdparts variable from non-relocated
> environment. A pointer to that buffer is returned unconditionally,
> confusing later test for variable presence in the environment.
> Fix it by returning NULL when getenv_f fails.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/9867b118/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 15/26] cmd: mtdparts: fix null pointer dereference in parse_mtdparts
2016-07-12 18:28 ` [U-Boot] [PATCH v5 15/26] cmd: mtdparts: fix null pointer dereference in parse_mtdparts Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:23PM +0200, Ladislav Michl wrote:
> In case there is no mtdparts variable in relocated environment,
> NULL is assigned to p, which is later fed to strncpy.
> Also function parameter mtdparts is completely ignored, so use it
> in case mtdparts variable is not found in environment. This
> parameter is checked not to be NULL in caller.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/97f8bf83/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 16/26] cmd: mtdparts: consolidate mtdparts reading from env
2016-07-12 18:28 ` [U-Boot] [PATCH v5 16/26] cmd: mtdparts: consolidate mtdparts reading from env Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:24PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/464090d2/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 17/26] cmd: mtdparts: use defaults by default
2016-07-12 18:28 ` [U-Boot] [PATCH v5 17/26] cmd: mtdparts: use defaults by default Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:25PM +0200, Ladislav Michl wrote:
> Boards which are defining default mtdparts often need them early
> in boot process (to load environment from UBI volume, for example).
> This is currently solved by adding mtdparts and mtdids variable
> definitions also to default environment. With this change, default
> partitions are used by default unless explicitely deleted or
> redefined.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/dddf2b91/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 18/26] cmd: mtdparts: support runtime generated mtdparts
2016-07-12 18:28 ` [U-Boot] [PATCH v5 18/26] cmd: mtdparts: support runtime generated mtdparts Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:26PM +0200, Ladislav Michl wrote:
> Some CPUs contains boot ROM code capable reading first few blocks
> (where SPL resides) of NAND flash and executing it. It is wise to
> create separate partition here for SPL. As block size depends on
> NAND chip used, we could either use worst case (biggest) partition
> size or base its size on actual block size. This patch adds support
> for the latter option.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/a95286df/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot,v5,19/26] igep00x0: move sysinfo into C file
2016-07-12 18:28 ` [U-Boot] [PATCH v5 19/26] igep00x0: move sysinfo into C file Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:27PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/196eb35f/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 20/26] igep00x0: reorder lan9221 code to remove ifdefs
2016-07-12 18:28 ` [U-Boot] [PATCH v5 20/26] igep00x0: reorder lan9221 code to remove ifdefs Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:28PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/458f9157/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 21/26] igep00x0: remove useless setup_net_chip declaration
2016-07-12 18:28 ` [U-Boot] [PATCH v5 21/26] igep00x0: remove useless setup_net_chip declaration Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:29PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/45584f3a/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 22/26] igep00x0: remove unused empty function omap_rev_string()
2016-07-12 18:28 ` [U-Boot] [PATCH v5 22/26] igep00x0: remove unused empty function omap_rev_string() Ladislav Michl
@ 2016-07-23 0:11 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:11 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:30PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/72d1d2e4/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot,v5,23/26] igep00x0: runtime flash detection
2016-07-12 18:28 ` [U-Boot] [PATCH v5 23/26] igep00x0: runtime flash detection Ladislav Michl
@ 2016-07-23 0:12 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:12 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:31PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/ce63d9aa/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot,v5,24/26] igep00x0: UBIize
2016-07-12 18:28 ` [U-Boot] [PATCH v5 24/26] igep00x0: UBIize Ladislav Michl
@ 2016-07-23 0:12 ` Tom Rini
2016-07-23 0:12 ` Tom Rini
1 sibling, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:12 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:32PM +0200, Ladislav Michl wrote:
> Convert IGEP board to use UBI volumes for U-Boot, its environment and
> kernel. With exception of first four sectors read by SoC boot
> ROM whole (One)NAND is UBI managed.
> Also merge NAND and OneNAND defconfigs as now one binary can serve
> both flashes.
> As code is too big now, drop CONFIG_SPL_EXT_SUPPORT to make it fit.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Reviewed-by: Heiko Schocher <hs@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/0bd3b186/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot,v5,24/26] igep00x0: UBIize
2016-07-12 18:28 ` [U-Boot] [PATCH v5 24/26] igep00x0: UBIize Ladislav Michl
2016-07-23 0:12 ` [U-Boot] [U-Boot,v5,24/26] " Tom Rini
@ 2016-07-23 0:12 ` Tom Rini
1 sibling, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:12 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:32PM +0200, Ladislav Michl wrote:
> Convert IGEP board to use UBI volumes for U-Boot, its environment and
> kernel. With exception of first four sectors read by SoC boot
> ROM whole (One)NAND is UBI managed.
> Also merge NAND and OneNAND defconfigs as now one binary can serve
> both flashes.
> As code is too big now, drop CONFIG_SPL_EXT_SUPPORT to make it fit.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Reviewed-by: Heiko Schocher <hs@denx.de>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/6325fd45/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot, v5, 25/26] igep00x0: generate default mtdparts according NAND chip used
2016-07-12 18:28 ` [U-Boot] [PATCH v5 25/26] igep00x0: generate default mtdparts according NAND chip used Ladislav Michl
@ 2016-07-23 0:12 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:12 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:33PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/64220b36/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
* [U-Boot] [U-Boot,v5,26/26] igep00x0: Falcon mode
2016-07-12 18:28 ` [U-Boot] [PATCH v5 26/26] igep00x0: Falcon mode Ladislav Michl
@ 2016-07-23 0:12 ` Tom Rini
0 siblings, 0 replies; 54+ messages in thread
From: Tom Rini @ 2016-07-23 0:12 UTC (permalink / raw)
To: u-boot
On Tue, Jul 12, 2016 at 08:28:34PM +0200, Ladislav Michl wrote:
> Implement spl_start_uboot to let Falcon mode work.
>
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Reviewed-by: Heiko Schocher <hs@denx.de>
> Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160722/5dae1ebb/attachment.sig>
^ permalink raw reply [flat|nested] 54+ messages in thread
end of thread, other threads:[~2016-07-23 0:12 UTC | newest]
Thread overview: 54+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-12 18:28 [U-Boot] [PATCH v5 00/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
2016-07-12 18:28 ` [U-Boot] [PATCH v5 01/26] mtd: Sort subsystem directories aplhabeticaly in Makefile Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 02/26] nand_spl_simple: Add a simple NAND read function Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 03/26] onenand_spl_simple: Add a simple OneNAND " Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 04/26] spl: Lightweight UBI and UBI fastmap support Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 05/26] spl: support loading from UBI volumes Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 06/26] spl: zImage support in Falcon mode Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot,v5,06/26] " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 07/26] armv7: add reset timeout to identify_nand_chip Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 08/26] armv7: make gpmc_cfg const Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot,v5,08/26] " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 09/26] armv7: armv7: introduce set_gpmc_cs0 Ladislav Michl
2016-07-23 0:10 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 10/26] armv7: simplify identify_nand_chip Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot,v5,10/26] " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 11/26] mtd: OneNAND: add timeout to wait ready loops Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 12/26] mtd: OneNAND: allow board init function fail Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 13/26] mtd: OneNAND: initialize mtd->writebufsize to let UBI work Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 14/26] cmd: mtdparts: fix mtdparts variable presence confusion in mtdparts_init Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 15/26] cmd: mtdparts: fix null pointer dereference in parse_mtdparts Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 16/26] cmd: mtdparts: consolidate mtdparts reading from env Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 17/26] cmd: mtdparts: use defaults by default Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 18/26] cmd: mtdparts: support runtime generated mtdparts Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 19/26] igep00x0: move sysinfo into C file Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot,v5,19/26] " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 20/26] igep00x0: reorder lan9221 code to remove ifdefs Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 21/26] igep00x0: remove useless setup_net_chip declaration Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 22/26] igep00x0: remove unused empty function omap_rev_string() Ladislav Michl
2016-07-23 0:11 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 23/26] igep00x0: runtime flash detection Ladislav Michl
2016-07-23 0:12 ` [U-Boot] [U-Boot,v5,23/26] " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 24/26] igep00x0: UBIize Ladislav Michl
2016-07-23 0:12 ` [U-Boot] [U-Boot,v5,24/26] " Tom Rini
2016-07-23 0:12 ` Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 25/26] igep00x0: generate default mtdparts according NAND chip used Ladislav Michl
2016-07-23 0:12 ` [U-Boot] [U-Boot, v5, " Tom Rini
2016-07-12 18:28 ` [U-Boot] [PATCH v5 26/26] igep00x0: Falcon mode Ladislav Michl
2016-07-23 0:12 ` [U-Boot] [U-Boot,v5,26/26] " Tom Rini
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.