* [U-Boot] [RFC PATCH v3 1/4] arm: iproc: add NAND driver
@ 2016-03-12 22:48 Steve Rae
2016-03-12 22:48 ` [U-Boot] [RFC PATCH v3 2/4] mtd: fix compiler warnings Steve Rae
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Steve Rae @ 2016-03-12 22:48 UTC (permalink / raw)
To: u-boot
From: Jiandong Zheng <jdzheng@broadcom.com>
Add support for the iproc NAND, and enable on Cygnus and NSP boards.
Signed-off-by: Jiandong Zheng <jdzheng@broadcom.com>
Signed-off-by: Steve Rae <srae@broadcom.com>
---
There was a previous attempt to implement this "iproc NAND"
(see: http://patchwork.ozlabs.org/patch/505399), however, due to the
amount of changes required, it seemed better to implement the code
in a series of steps. This is the first step, where the "iproc_nand.c"
is essentially an empty file (with one function required to allow this
commit to build successfully).
RFC only - more changes are coming for "drivers/mtd/nand/iproc_nand.c"
Changes in v3:
- convert more CONFIG_* to Kconfig
Changes in v2:
- convert some CONFIG_* to Kconfig
arch/arm/include/asm/arch-bcmcygnus/configs.h | 2 -
arch/arm/include/asm/arch-bcmnsp/configs.h | 2 -
board/broadcom/bcmcygnus/Kconfig | 33 ++++++++
board/broadcom/bcmnsp/Kconfig | 33 ++++++++
drivers/mtd/nand/Makefile | 1 +
drivers/mtd/nand/iproc_nand.c | 19 +++++
drivers/mtd/nand/iproc_nand_cygnus.h | 111 +++++++++++++++++++++++++
drivers/mtd/nand/iproc_nand_ns_plus.h | 113 ++++++++++++++++++++++++++
8 files changed, 310 insertions(+), 4 deletions(-)
create mode 100644 drivers/mtd/nand/iproc_nand.c
create mode 100644 drivers/mtd/nand/iproc_nand_cygnus.h
create mode 100644 drivers/mtd/nand/iproc_nand_ns_plus.h
diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h b/arch/arm/include/asm/arch-bcmcygnus/configs.h
index 3c07160..2c75cb9 100644
--- a/arch/arm/include/asm/arch-bcmcygnus/configs.h
+++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h
@@ -9,8 +9,6 @@
#include <asm/iproc-common/configs.h>
-/* uArchitecture specifics */
-
/* Serial Info */
/* Post pad 3 bytes after each reg addr */
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
diff --git a/arch/arm/include/asm/arch-bcmnsp/configs.h b/arch/arm/include/asm/arch-bcmnsp/configs.h
index 786deae..d170e16 100644
--- a/arch/arm/include/asm/arch-bcmnsp/configs.h
+++ b/arch/arm/include/asm/arch-bcmnsp/configs.h
@@ -9,8 +9,6 @@
#include <asm/iproc-common/configs.h>
-/* uArchitecture specifics */
-
/* Serial Info */
/* no padding */
#define CONFIG_SYS_NS16550_REG_SIZE 1
diff --git a/board/broadcom/bcmcygnus/Kconfig b/board/broadcom/bcmcygnus/Kconfig
index faba4cf..6554cdf 100644
--- a/board/broadcom/bcmcygnus/Kconfig
+++ b/board/broadcom/bcmcygnus/Kconfig
@@ -12,4 +12,37 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "bcm_ep_board"
+config SYS_BCM_CYGNUS
+ bool
+ default y
+ select CMD_NAND
+ select SYS_NAND_SELF_INIT
+
+config NAND_IPROC
+ bool
+ default y
+
+#
+# NAND configuration
+#
+config SYS_NAND_IPROC_TIMING_MODE
+ int
+ default 5
+
+config SYS_NAND_BASE
+ int
+ default 0
+
+config SYS_MAX_NAND_DEVICE
+ int
+ default 1
+
+config SYS_MAX_NAND_CHIPS
+ int
+ default 1
+
+config SYS_NAND_ONFI_DETECTION
+ bool
+ default y
+
endif
diff --git a/board/broadcom/bcmnsp/Kconfig b/board/broadcom/bcmnsp/Kconfig
index a975082..f420e28 100644
--- a/board/broadcom/bcmnsp/Kconfig
+++ b/board/broadcom/bcmnsp/Kconfig
@@ -12,4 +12,37 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "bcm_ep_board"
+config SYS_BCM_NSPLUS
+ bool
+ default y
+ select CMD_NAND
+ select SYS_NAND_SELF_INIT
+
+config NAND_IPROC
+ bool
+ default y
+
+#
+# NAND configuration
+#
+config SYS_NAND_IPROC_TIMING_MODE
+ int
+ default 5
+
+config SYS_NAND_BASE
+ int
+ default 0
+
+config SYS_MAX_NAND_DEVICE
+ int
+ default 1
+
+config SYS_MAX_NAND_CHIPS
+ int
+ default 1
+
+config SYS_NAND_ONFI_DETECTION
+ bool
+ default y
+
endif
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 6fb3718..bb3adbc 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o
obj-$(CONFIG_NAND_FSL_IFC) += fsl_ifc_nand.o
obj-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
obj-$(CONFIG_NAND_FSMC) += fsmc_nand.o
+obj-$(CONFIG_NAND_IPROC) += iproc_nand.o
obj-$(CONFIG_NAND_JZ4740) += jz4740_nand.o
obj-$(CONFIG_NAND_KB9202) += kb9202_nand.o
obj-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
diff --git a/drivers/mtd/nand/iproc_nand.c b/drivers/mtd/nand/iproc_nand.c
new file mode 100644
index 0000000..691b8d8
--- /dev/null
+++ b/drivers/mtd/nand/iproc_nand.c
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 Broadcom Corporation.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+
+#if defined(CONFIG_SYS_BCM_CYGNUS)
+#include "iproc_nand_cygnus.h"
+#elif defined(CONFIG_SYS_BCM_NSPLUS)
+#include "iproc_nand_ns_plus.h"
+#else
+#error "Unsupported configuration"
+#endif
+
+void board_nand_init(void)
+{
+}
diff --git a/drivers/mtd/nand/iproc_nand_cygnus.h b/drivers/mtd/nand/iproc_nand_cygnus.h
new file mode 100644
index 0000000..26a00a9
--- /dev/null
+++ b/drivers/mtd/nand/iproc_nand_cygnus.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2015 Broadcom Corporation.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef _IPROC_NAND_CYGNUS_H_
+#define _IPROC_NAND_CYGNUS_H_
+
+/*
+ * SoC specific definitions (Cygnus)
+ */
+
+#define REG_NAND_BASE 0x18046000
+#define REG_NAND_IDM_BASE 0xf8105000
+
+#define NAND_STRAP_TYPE_MASK 0x000f0000
+#define NAND_STRAP_TYPE_SHIFT 16
+#define NAND_STRAP_PAGE_MASK 0x00300000
+#define NAND_STRAP_PAGE_SHIFT 20
+#define NAND_STRAP_WIDTH_MASK 0x01000000
+#define NAND_STRAP_WIDTH_SHIFT 24
+
+#define NAND_STRAP_TYPE_DATA \
+/* sector_1k, ecclevel, spare_size */ \
+{ \
+ { 0, 0, 16 }, \
+ { 0, 1, 16 }, \
+ { 0, 4, 16 }, \
+ { 0, 8, 16 }, \
+ { 0, 8, 27 }, \
+ { 0, 12, 27 }, \
+ { 1, 12, 27 }, \
+ { 1, 15, 27 }, \
+ { 1, 20, 45 } \
+}
+
+#define NAND_STRAP_PAGE_DATA \
+{ \
+ 1024, 2048, 4096, 8192 \
+}
+
+/*
+ * iProc NAND timing configurations for ONFI timing modes [0-5]
+ *
+ * Clock tick = 10ns
+ * Multiplier:
+ * x1: tWP tWH tRP tREH tCLH tALH
+ * x2: tCS tADL tWB tWHR
+ */
+#define NAND_TIMING_DATA \
+{ \
+ /* ONFI timing mode 0 : */ \
+ /* tWC=100ns tWP=50ns tWH=30ns */ \
+ /* tRC=100ns tRP=50ns tREH=30ns */ \
+ /* tCS=70ns tCLH=20ns tALH=20ns tADL=200ns */ \
+ /* tWB=200ns tWHR=120ns tREA=40ns */ \
+ { \
+ .timing1 = 0x6565435b, \
+ .timing2 = 0x00001e85, \
+ }, \
+ /* ONFI timing mode 1 : */ \
+ /* tWC=45 tWP=25ns tWH=15ns */ \
+ /* tRC=50 tRP=25ns tREH=15ns */ \
+ /* tCS=35ns tCLH=10ns tALH=10ns tADL=100ns */ \
+ /* tWB=100ns tWHR=80ns tREA=30ns */ \
+ { \
+ .timing1 = 0x33333236, \
+ .timing2 = 0x00001064, \
+ }, \
+ /* ONFI timing mode 2 : */ \
+ /* tWC=35ns tWP=17ns tWH=15ns */ \
+ /* tRC=35ns tRP=17ns tREH=15ns */ \
+ /* tCS=25ns tCLH=10ns tALH=10ns tADL=100ns */ \
+ /* tWB=100ns tWHR=80ns tREA=25ns */ \
+ { \
+ .timing1 = 0x32322226, \
+ .timing2 = 0x00001063, \
+ }, \
+ /* ONFI timing mode 3 : */ \
+ /* tWC=30ns tWP=15ns tWH=10ns */ \
+ /* tRC=30ns tRP=15ns tREH=10ns */ \
+ /* tCS=25ns tCLH=5ns tALH=5ns tADL=100ns */ \
+ /* tWB=100ns tWHR=60ns tREA=20ns */ \
+ { \
+ .timing1 = 0x22222126, \
+ .timing2 = 0x00001043, \
+ }, \
+ /* ONFI timing mode 4 : */ \
+ /* tWC=25ns tWP=12ns tWH=10ns */ \
+ /* tRC=25ns tRP=12ns tREH=10ns */ \
+ /* tCS=20ns tCLH=5ns tALH=5ns tADL=70ns */ \
+ /* tWB=100ns tWHR=60ns tREA=20ns */ \
+ { \
+ .timing1 = 0x21212114, \
+ .timing2 = 0x00001042, \
+ }, \
+ /* ONFI timing mode 5 : */ \
+ /* tWC=20ns tWP=10ns tWH=7ns */ \
+ /* tRC=20ns tRP=10ns tREH=7ns */ \
+ /* tCS=15ns tCLH=5ns tALH=5ns tADL=70ns */ \
+ /* tWB=100ns tWHR=60ns tREA=16ns */ \
+ { \
+ .timing1 = 0x11111114, \
+ .timing2 = 0x00001042, \
+ }, \
+}
+
+#define NAND_MAX_CS 2
+
+#endif /* _IPROC_NAND_CYGNUS_H_ */
diff --git a/drivers/mtd/nand/iproc_nand_ns_plus.h b/drivers/mtd/nand/iproc_nand_ns_plus.h
new file mode 100644
index 0000000..41d5da7
--- /dev/null
+++ b/drivers/mtd/nand/iproc_nand_ns_plus.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2015 Broadcom Corporation.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef _IPROC_NAND_NS_PLUS_H_
+#define _IPROC_NAND_NS_PLUS_H_
+
+/*
+ * SoC specific definitions (NorthStar Plus)
+ */
+
+#define REG_NAND_BASE 0x18026000
+#define REG_NAND_IDM_BASE 0x1811b000
+#define REG_NAND_STRAPS_BASE 0x1803f2a0
+
+#define NAND_STRAP_TYPE_MASK 0x0000f000
+#define NAND_STRAP_TYPE_SHIFT 12
+#define NAND_STRAP_PAGE_MASK 0x00000c00
+#define NAND_STRAP_PAGE_SHIFT 10
+/* No bus width strap */
+#define NAND_STRAP_WIDTH_MASK 0x0
+#define NAND_STRAP_WIDTH_SHIFT 0
+
+#define NAND_STRAP_TYPE_DATA \
+/* sector_1k, ecclevel, spare_size */ \
+{ \
+ { 0, 0, 16 }, \
+ { 0, 15, 16 }, /* Hamming ECC */ \
+ { 0, 4, 16 }, \
+ { 0, 8, 16 }, \
+ { 0, 8, 27 }, \
+ { 0, 12, 27 }, \
+ { 1, 12, 27 }, \
+ { 1, 15, 27 }, \
+ { 1, 20, 45 } \
+}
+
+#define NAND_STRAP_PAGE_DATA \
+{ \
+ 2048, 2048, 4096, 8192 \
+}
+
+/*
+ * iProc NAND timing configurations for ONFI timing modes [0-5]
+ *
+ * Clock tick = 4ns
+ * Multiplier:
+ * x1: tWP tWH tRP tREH tCLH tALH
+ * x4: tCS tADL tWB tWHR
+ */
+#define NAND_TIMING_DATA \
+{ \
+ /* ONFI timing mode 0 : */ \
+ /* tWC=100ns tWP=50ns tWH=30ns */ \
+ /* tRC=100ns tRP=50ns tREH=30ns */ \
+ /* tCS=70ns tCLH=20ns tALH=20ns tADL=200ns */ \
+ /* tWB=200ns tWHR=120ns tREA=40ns */ \
+ { \
+ .timing1 = 0xfafa558d, \
+ .timing2 = 0x00001a85, \
+ }, \
+ /* ONFI timing mode 1 : */ \
+ /* tWC=45 tWP=25ns tWH=15ns */ \
+ /* tRC=50 tRP=25ns tREH=15ns */ \
+ /* tCS=35ns tCLH=10ns tALH=10ns tADL=100ns */ \
+ /* tWB=100ns tWHR=80ns tREA=30ns */ \
+ { \
+ .timing1 = 0x85853347, \
+ .timing2 = 0x00000e64, \
+ }, \
+ /* ONFI timing mode 2 : */ \
+ /* tWC=35ns tWP=17ns tWH=15ns */ \
+ /* tRC=35ns tRP=17ns tREH=15ns */ \
+ /* tCS=25ns tCLH=10ns tALH=10ns tADL=100ns */ \
+ /* tWB=100ns tWHR=80ns tREA=25ns */ \
+ { \
+ .timing1 = 0x54542347, \
+ .timing2 = 0x00000e63, \
+ }, \
+ /* ONFI timing mode 3 : */ \
+ /* tWC=30ns tWP=15ns tWH=10ns */ \
+ /* tRC=30ns tRP=15ns tREH=10ns */ \
+ /* tCS=25ns tCLH=5ns tALH=5ns tADL=100ns */ \
+ /* tWB=100ns tWHR=60ns tREA=20ns */ \
+ { \
+ .timing1 = 0x44442237, \
+ .timing2 = 0x00000e43, \
+ }, \
+ /* ONFI timing mode 4 : */ \
+ /* tWC=25ns tWP=12ns tWH=10ns */ \
+ /* tRC=25ns tRP=12ns tREH=10ns */ \
+ /* tCS=20ns tCLH=5ns tALH=5ns tADL=70ns */ \
+ /* tWB=100ns tWHR=60ns tREA=20ns */ \
+ { \
+ .timing1 = 0x43432235, \
+ .timing2 = 0x00000e42, \
+ }, \
+ /* ONFI timing mode 5 : */ \
+ /* tWC=20ns tWP=10ns tWH=7ns */ \
+ /* tRC=20ns tRP=10ns tREH=7ns */ \
+ /* tCS=15ns tCLH=5ns tALH=5ns tADL=70ns */ \
+ /* tWB=100ns tWHR=60ns tREA=16ns */ \
+ { \
+ .timing1 = 0x32321225, \
+ .timing2 = 0x00000e42, \
+ }, \
+}
+
+#define NAND_MAX_CS 1
+
+#endif /* _IPROC_NAND_NS_PLUS_H_ */
--
1.8.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [RFC PATCH v3 2/4] mtd: fix compiler warnings
2016-03-12 22:48 [U-Boot] [RFC PATCH v3 1/4] arm: iproc: add NAND driver Steve Rae
@ 2016-03-12 22:48 ` Steve Rae
2016-06-29 1:17 ` Scott Wood
2016-03-12 22:48 ` [U-Boot] [RFC PATCH v3 3/4] arm: bcm: enable MTD support Steve Rae
2016-03-12 22:48 ` [U-Boot] [RFC PATCH v3 4/4] arm: bcm: configure NAND device and environment Steve Rae
2 siblings, 1 reply; 6+ messages in thread
From: Steve Rae @ 2016-03-12 22:48 UTC (permalink / raw)
To: u-boot
- add missing declaration
- update debug output format specifiers
Signed-off-by: Steve Rae <srae@broadcom.com>
---
the checkpatch warning:
warning: cmd/mtdparts.c,1494: quoted string split across lines
is for the existing code; it is not introduced with this change...
Changes in v3: None
Changes in v2: None
cmd/mtdparts.c | 4 ++--
include/linux/mtd/mtd.h | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 86a4689..579eff1 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -1491,7 +1491,7 @@ static int spread_partitions(void)
part = list_entry(pentry, struct part_info, link);
debug("spread_partitions: device = %s%d, partition %d ="
- " (%s) 0x%08x at 0x%08x\n",
+ " (%s) 0x%08llx at 0x%08llx\n",
MTD_DEV_TYPE(dev->id->type), dev->id->num,
part_num, part->name, part->size,
part->offset);
@@ -2009,7 +2009,7 @@ static int do_mtdparts(cmd_tbl_t *cmdtp, int flag, int argc,
if (!strcmp(&argv[1][3], ".spread")) {
spread_partition(mtd, p, &next_offset);
- debug("increased %s to %d bytes\n", p->name, p->size);
+ debug("increased %s to %llu bytes\n", p->name, p->size);
}
#endif
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 9da77ec..9c36f02 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -495,5 +495,13 @@ int mtd_arg_off(const char *arg, int *idx, loff_t *off, loff_t *size,
int mtd_arg_off_size(int argc, char *const argv[], int *idx, loff_t *off,
loff_t *size, loff_t *maxsize, int devtype,
uint64_t chipsize);
+
+#ifdef CONFIG_CMD_MTDPARTS_SPREAD
+/* drivers/mtd/mtdcore.c */
+void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset,
+ const uint64_t length, uint64_t *len_incl_bad,
+ int *truncated);
+#endif /* CONFIG_CMD_MTDPARTS_SPREAD */
+
#endif
#endif /* __MTD_MTD_H__ */
--
1.8.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [RFC PATCH v3 3/4] arm: bcm: enable MTD support
2016-03-12 22:48 [U-Boot] [RFC PATCH v3 1/4] arm: iproc: add NAND driver Steve Rae
2016-03-12 22:48 ` [U-Boot] [RFC PATCH v3 2/4] mtd: fix compiler warnings Steve Rae
@ 2016-03-12 22:48 ` Steve Rae
2016-03-12 22:48 ` [U-Boot] [RFC PATCH v3 4/4] arm: bcm: configure NAND device and environment Steve Rae
2 siblings, 0 replies; 6+ messages in thread
From: Steve Rae @ 2016-03-12 22:48 UTC (permalink / raw)
To: u-boot
Enable MTD support on Cygnus and NSP boards.
Signed-off-by: Steve Rae <srae@broadcom.com>
---
Changes in v3: None
Changes in v2: None
arch/arm/include/asm/arch-bcmcygnus/configs.h | 6 ++++++
arch/arm/include/asm/arch-bcmnsp/configs.h | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h b/arch/arm/include/asm/arch-bcmcygnus/configs.h
index 2c75cb9..1edcbd7 100644
--- a/arch/arm/include/asm/arch-bcmcygnus/configs.h
+++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h
@@ -31,4 +31,10 @@
#define CONFIG_CMD_PING
#define CONFIG_CMD_MII
+/* MTD configuration */
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_CMD_MTDPARTS_SPREAD
+
#endif /* __ARCH_CONFIGS_H */
diff --git a/arch/arm/include/asm/arch-bcmnsp/configs.h b/arch/arm/include/asm/arch-bcmnsp/configs.h
index d170e16..ec326b3 100644
--- a/arch/arm/include/asm/arch-bcmnsp/configs.h
+++ b/arch/arm/include/asm/arch-bcmnsp/configs.h
@@ -17,4 +17,10 @@
#define CONFIG_CONS_INDEX 1
#define CONFIG_SYS_NS16550_COM1 0x18000300
+/* MTD configuration */
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_CMD_MTDPARTS_SPREAD
+
#endif /* __ARCH_CONFIGS_H */
--
1.8.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [RFC PATCH v3 4/4] arm: bcm: configure NAND device and environment
2016-03-12 22:48 [U-Boot] [RFC PATCH v3 1/4] arm: iproc: add NAND driver Steve Rae
2016-03-12 22:48 ` [U-Boot] [RFC PATCH v3 2/4] mtd: fix compiler warnings Steve Rae
2016-03-12 22:48 ` [U-Boot] [RFC PATCH v3 3/4] arm: bcm: enable MTD support Steve Rae
@ 2016-03-12 22:48 ` Steve Rae
2 siblings, 0 replies; 6+ messages in thread
From: Steve Rae @ 2016-03-12 22:48 UTC (permalink / raw)
To: u-boot
Configure the NAND device, define partition sizes, and create
the environment space for Cygnus and NSP boards.
Signed-off-by: Steve Rae <srae@broadcom.com>
---
Changes in v3: None
Changes in v2: None
arch/arm/include/asm/arch-bcmcygnus/configs.h | 33 +++++++++++++++++++++++++++
arch/arm/include/asm/arch-bcmnsp/configs.h | 33 +++++++++++++++++++++++++++
include/configs/bcm_ep_board.h | 3 ---
3 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h b/arch/arm/include/asm/arch-bcmcygnus/configs.h
index 1edcbd7..cf19ffb 100644
--- a/arch/arm/include/asm/arch-bcmcygnus/configs.h
+++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h
@@ -31,6 +31,39 @@
#define CONFIG_CMD_PING
#define CONFIG_CMD_MII
+/* Configuration for Micron MT29F8G08ABACA */
+#define CONFIG_NAND_CHIPSIZE (1 << 30) /* 1GB */
+#define CONFIG_NAND_BLOCKSIZE (1 << 18) /* 256KB */
+#define CONFIG_NAND_PAGE_SHIFT 12 /* 4KiB */
+#define CONFIG_NAND_BLOCK_SHIFT 18 /* 256 KiB */
+
+/* Configure the Environment and the u-boot-env partition */
+#define MTD_PART_BOOT1_SIZE 0x00200000
+#define MTD_PART_GPT_SIZE 0x00100000
+#define MTD_PART_SSB_SIZE 0x00200000
+#define MTD_PART_UBOOT_SIZE 0x00200000
+#define MTD_PART_UBOOT_ENV_SIZE 0x00200000
+#define MTD_PART_DTB_SIZE 0x00100000
+#define MTD_PART_KERNEL_SIZE 0x01000000
+#define MTD_PART_ROOT_SIZE 0x1c000000
+/*
+ * WARNING: When changing the order of the partitions, make sure you update
+ * CONFIG_ENV_OFFSET accordingly.
+ */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SIZE 0x2000
+#define CONFIG_ENV_RANGE (2 * CONFIG_NAND_BLOCKSIZE)
+#define CONFIG_ENV_OFFSET (MTD_PART_BOOT1_SIZE + MTD_PART_GPT_SIZE + \
+ MTD_PART_SSB_SIZE + MTD_PART_UBOOT_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
+/*
+ * Check that the u-boot-env partition is big enough to accomodate the
+ * u-boot environment data and its redundant copy
+ */
+#if ((2 * CONFIG_ENV_RANGE) > MTD_PART_UBOOT_ENV_SIZE)
+#error u-boot-env partition size is to small
+#endif
+
/* MTD configuration */
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
diff --git a/arch/arm/include/asm/arch-bcmnsp/configs.h b/arch/arm/include/asm/arch-bcmnsp/configs.h
index ec326b3..cf2e086 100644
--- a/arch/arm/include/asm/arch-bcmnsp/configs.h
+++ b/arch/arm/include/asm/arch-bcmnsp/configs.h
@@ -17,6 +17,39 @@
#define CONFIG_CONS_INDEX 1
#define CONFIG_SYS_NS16550_COM1 0x18000300
+/* Configuration for Micron MT29F8G08ABACA */
+#define CONFIG_NAND_CHIPSIZE (1 << 30) /* 1GB */
+#define CONFIG_NAND_BLOCKSIZE (1 << 18) /* 256KB */
+#define CONFIG_NAND_PAGE_SHIFT 12 /* 4KiB */
+#define CONFIG_NAND_BLOCK_SHIFT 18 /* 256 KiB */
+
+/* Configure the Environment and the u-boot-env partition */
+#define MTD_PART_BOOT1_SIZE 0x00200000
+#define MTD_PART_GPT_SIZE 0x00100000
+#define MTD_PART_SSB_SIZE 0x00200000
+#define MTD_PART_UBOOT_SIZE 0x00200000
+#define MTD_PART_UBOOT_ENV_SIZE 0x00200000
+#define MTD_PART_DTB_SIZE 0x00100000
+#define MTD_PART_KERNEL_SIZE 0x01000000
+#define MTD_PART_ROOT_SIZE 0x0c000000
+/*
+ * WARNING: When changing the order of the partitions, make sure you update
+ * CONFIG_ENV_OFFSET accordingly.
+ */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SIZE 0x2000
+#define CONFIG_ENV_RANGE (2 * CONFIG_NAND_BLOCKSIZE)
+#define CONFIG_ENV_OFFSET (MTD_PART_BOOT1_SIZE + MTD_PART_GPT_SIZE + \
+ MTD_PART_SSB_SIZE + MTD_PART_UBOOT_SIZE)
+#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
+/*
+ * Check that the u-boot-env partition is big enough to accomodate the
+ * u-boot environment data and its redundant copy
+ */
+#if ((2 * CONFIG_ENV_RANGE) > MTD_PART_UBOOT_ENV_SIZE)
+#error u-boot-env partition size is to small
+#endif
+
/* MTD configuration */
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h
index 1d4869b..fe97a40 100644
--- a/include/configs/bcm_ep_board.h
+++ b/include/configs/bcm_ep_board.h
@@ -50,9 +50,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_ENV_SIZE 0x2000
-#define CONFIG_ENV_IS_NOWHERE
-
#define CONFIG_SYS_NO_FLASH /* Not using NAND/NOR unmanaged flash */
/* console configuration */
--
1.8.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [RFC PATCH v3 2/4] mtd: fix compiler warnings
2016-03-12 22:48 ` [U-Boot] [RFC PATCH v3 2/4] mtd: fix compiler warnings Steve Rae
@ 2016-06-29 1:17 ` Scott Wood
2016-06-29 20:47 ` Steve Rae
0 siblings, 1 reply; 6+ messages in thread
From: Scott Wood @ 2016-06-29 1:17 UTC (permalink / raw)
To: u-boot
On Sat, 2016-03-12 at 14:48 -0800, Steve Rae wrote:
> - add missing declaration
> - update debug output format specifiers
>
> Signed-off-by: Steve Rae <srae@broadcom.com>
> ---
> the checkpatch warning:
> ? warning: cmd/mtdparts.c,1494: quoted string split across lines
> is for the existing code; it is not introduced with this change...
>
> Changes in v3: None
> Changes in v2: None
Why is this an RFC patch? ?It seems like an attempt to fix straightforward
problems, unrelated to the iproc driver.
> ?
> diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
> index 9da77ec..9c36f02 100644
> --- a/include/linux/mtd/mtd.h
> +++ b/include/linux/mtd/mtd.h
> @@ -495,5 +495,13 @@ int mtd_arg_off(const char *arg, int *idx, loff_t *off,
> loff_t *size,
> ?int mtd_arg_off_size(int argc, char *const argv[], int *idx, loff_t *off,
> ? ?????loff_t *size, loff_t *maxsize, int devtype,
> ? ?????uint64_t chipsize);
> +
> +#ifdef CONFIG_CMD_MTDPARTS_SPREAD
> +/* drivers/mtd/mtdcore.c */
> +void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset,
> + ??const uint64_t length, uint64_t *len_incl_bad,
> + ??int *truncated);
> +#endif /* CONFIG_CMD_MTDPARTS_SPREAD */
Don't ifdef prototypes.
-Scott
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [RFC PATCH v3 2/4] mtd: fix compiler warnings
2016-06-29 1:17 ` Scott Wood
@ 2016-06-29 20:47 ` Steve Rae
0 siblings, 0 replies; 6+ messages in thread
From: Steve Rae @ 2016-06-29 20:47 UTC (permalink / raw)
To: u-boot
Hi Scott,
On Tue, Jun 28, 2016 at 6:17 PM, Scott Wood <oss@buserror.net> wrote:
> On Sat, 2016-03-12 at 14:48 -0800, Steve Rae wrote:
>> - add missing declaration
>> - update debug output format specifiers
>>
>> Signed-off-by: Steve Rae <srae@broadcom.com>
>> ---
>> the checkpatch warning:
>> warning: cmd/mtdparts.c,1494: quoted string split across lines
>> is for the existing code; it is not introduced with this change...
>>
>> Changes in v3: None
>> Changes in v2: None
>
> Why is this an RFC patch? It seems like an attempt to fix straightforward
> problems, unrelated to the iproc driver.
>
True - I'll pull it out of this series and send a new patch.
>>
>> diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
>> index 9da77ec..9c36f02 100644
>> --- a/include/linux/mtd/mtd.h
>> +++ b/include/linux/mtd/mtd.h
>> @@ -495,5 +495,13 @@ int mtd_arg_off(const char *arg, int *idx, loff_t *off,
>> loff_t *size,
>> int mtd_arg_off_size(int argc, char *const argv[], int *idx, loff_t *off,
>> loff_t *size, loff_t *maxsize, int devtype,
>> uint64_t chipsize);
>> +
>> +#ifdef CONFIG_CMD_MTDPARTS_SPREAD
>> +/* drivers/mtd/mtdcore.c */
>> +void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset,
>> + const uint64_t length, uint64_t *len_incl_bad,
>> + int *truncated);
>> +#endif /* CONFIG_CMD_MTDPARTS_SPREAD */
>
> Don't ifdef prototypes.
OK - thanks
>
> -Scott
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-29 20:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-12 22:48 [U-Boot] [RFC PATCH v3 1/4] arm: iproc: add NAND driver Steve Rae
2016-03-12 22:48 ` [U-Boot] [RFC PATCH v3 2/4] mtd: fix compiler warnings Steve Rae
2016-06-29 1:17 ` Scott Wood
2016-06-29 20:47 ` Steve Rae
2016-03-12 22:48 ` [U-Boot] [RFC PATCH v3 3/4] arm: bcm: enable MTD support Steve Rae
2016-03-12 22:48 ` [U-Boot] [RFC PATCH v3 4/4] arm: bcm: configure NAND device and environment Steve Rae
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox