10b16d9328
Remove upstreamed patches: 010-menu-fix-the-logic-checking-whether-ESC-key-is-press.patch [1] 011-menu-add-support-to-check-if-menu-needs-to-be-reprin.patch [2] 012-bootmenu-add-reprint-check.patch [3] Remove outdated patches: 455-arm-provide-noncached_set_region-prototype-to-fix-build.patch Some patches have been manually rebased to match the upstream changes. This patch also fixes the dtc warning for reserved-memory dts node. If #address-cells and #size-cells are not same as the root node definitions, the dtc will complain about it. All defconfigs are refreshed by `make "$board"_defconfig` and `make savedefconfig`. [1]ddac69885e[2]ccdd7948e2[3]599652cff1Signed-off-by: Shiji Yang <yangshiji66@qq.com>
47 lines
1022 B
Diff
47 lines
1022 B
Diff
From dcf24c8deeb43a4406ae18136c8700dc2f867415 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 42/71] 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
|
|
@@ -381,6 +381,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)
|
|
@@ -694,6 +708,9 @@ static init_fnc_t init_sequence_r[] = {
|
|
#ifdef CONFIG_CMD_ONENAND
|
|
initr_onenand,
|
|
#endif
|
|
+#ifdef CONFIG_NMBM_MTD
|
|
+ initr_nmbm,
|
|
+#endif
|
|
#ifdef CONFIG_MMC
|
|
initr_mmc,
|
|
#endif
|