mirror of
https://github.com/LiBwrt-op/openwrt-6.x.git
synced 2025-12-17 01:06:35 +00:00
011ba05fd3
The most relevant change is the removal of the empty board_init() functions by u-boot/u-boot@70a4d1fa1d, which makes many patches not apply anymore and also requires most board defconfigs to be updated by adding "# CONFIG_BOARD_INIT is not set" to them. Also some config symbols have been renamed and downstream boards had to be adapted accordingly: u-boot/u-boot@0fd9a3480a ("env: Rename OVERWRITE_ETHADDR_ONCE to ENV_OVERWRITE_ETHADDR_ONCE") u-boot/u-boot@5fb88fa725 ("env: Rename SYS_REDUNDAND_ENVIRONMENT to ENV_REDUNDANT") u-boot/u-boot@123682c765 ("env: Rename SYS_RELOC_GD_ENV_ADDR to ENV_RELOC_GD_ENV_ADDR") u-boot/u-boot@0f44d5549e ("env: Rename SYS_MMC_ENV_DEV to ENV_MMC_DEVICE_INDEX") u-boot/u-boot@31617b880a ("env: Rename SYS_MMC_ENV_PART to ENV_MMC_EMMC_HW_PARTITION") u-boot/u-boot@ffc4914703 ("env: Rename ENV_MMC_PARTITION to ENV_MMC_SW_PARTITION") u-boot/u-boot@fb5235239a ("env: Rename DEFAULT_ENV_FILE to ENV_DEFAULT_ENV_TEXT_FILE") (also renamed USE_DEFAULT_ENV_FILE to USE_ENV_DEFAULT_ENV_TEXT_FILE) Remove upstreamed patches: * 001-mtd-spinand-winbond-add-Winbond-W25N04KV-flash-suppo.patch u-boot/u-boot@fe37fb8214 * 002-mtd-spinand-gigadevice-sync-supported-chips-with-lin.patch u-boot/u-boot@506ceddffd * 003-net-mediatek-correct-the-AN8855-TPID-value-in-port-i.patch u-boot/u-boot@70db2be9fb * 004-01-serial-mediatek-fix-register-names-and-offsets.patch u-boot/u-boot@6e15d3f91a * 004-02-serial-mediatek-enable-baudrate-accuracy-compensatio.patch u-boot/u-boot@6952209ef2 * 005-clk-mediatek-add-dummy-clk-enable-disable-ops-for-ap.patch u-boot/u-boot@1bf2121297 * 006-env-Fix-possible-out-of-bound-access-in-env_do_env_s.patch u-boot/u-boot@0ffd456516 * 130-01-env-mtd-add-the-missing-put_mtd_device.patch u-boot/u-boot@39ae954b04 * 130-02-env-mtd-initialize-saved_buf-pointer.patch u-boot/u-boot@7e842bd331 * 170-cmd-bootmenu-permit-to-select-bootmenu-entry-with.patch u-boot/u-boot@8c986521c3 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)
|
|
@@ -713,6 +727,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
|