b94de14baf
Remove upstreamed patches: 100-08-cmd-mtd-add-markbad-subcommand-for-NMBM-testing.patch [1] 101-01-mtd-spinand-add-support-for-FORESEE-F35SQA002G.patch [2] 101-02-mtd-spinand-add-support-for-FORESEE-F35SQA001G.patch [3] 110-mtd-spi-nand-add-support-for-FudanMicro-FM25S01A.patch [4] Some SPI-NAND driver macro definitions and function parameters have been changed in the latest release[3]. Hence we also had to rework the related local patches to follow the upstream changes. Tested on MT7981 SPI-NOR/EMMC. [1]21c1098cf4[2]2a0f8e7da0[3]2cbdd3e449[4]8b984b5a39Signed-off-by: Shiji Yang <yangshiji66@outlook.com> [daniel@makrotopia.org: tested MT7622 SNAND and SPI-NOR] Signed-off-by: Daniel Golle <daniel@makrotopia.org>
47 lines
1.0 KiB
Diff
47 lines
1.0 KiB
Diff
From 7499c0e030ef5051b2920576a75dfd7c60d5232a Mon Sep 17 00:00:00 2001
|
|
From: Weijie Gao <weijie.gao@mediatek.com>
|
|
Date: Mon, 25 Jul 2022 11:18:03 +0800
|
|
Subject: [PATCH 06/30] common: board_r: add support to initialize NMBM after
|
|
nand initialization
|
|
|
|
This patch add support to initialize NMBM after nand initialized.
|
|
|
|
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
|
|
---
|
|
common/board_r.c | 17 +++++++++++++++++
|
|
1 file changed, 17 insertions(+)
|
|
|
|
--- a/common/board_r.c
|
|
+++ b/common/board_r.c
|
|
@@ -398,6 +398,20 @@ static int initr_nand(void)
|
|
}
|
|
#endif
|
|
|
|
+#ifdef CONFIG_NMBM_MTD
|
|
+
|
|
+__weak int board_nmbm_init(void)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+/* go init the NMBM */
|
|
+static int initr_nmbm(void)
|
|
+{
|
|
+ return board_nmbm_init();
|
|
+}
|
|
+#endif
|
|
+
|
|
#if defined(CONFIG_CMD_ONENAND)
|
|
/* go init the NAND */
|
|
static int initr_onenand(void)
|
|
@@ -706,6 +720,9 @@ static void initcall_run_r(void)
|
|
#if CONFIG_IS_ENABLED(CMD_ONENAND)
|
|
INITCALL(initr_onenand);
|
|
#endif
|
|
+#if CONFIG_IS_ENABLED(NMBM_MTD)
|
|
+ INITCALL(initr_nmbm);
|
|
+#endif
|
|
#if CONFIG_IS_ENABLED(MMC)
|
|
INITCALL(initr_mmc);
|
|
#endif
|