From: Shiji Yang Date: Wed, 8 Jan 2025 14:56:44 +0000 (+0800) Subject: uboot-mediatek: update to v2025.01 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=10b16d932869aed6e69d932e18df18d27f432ee9;p=openwrt%2Fstaging%2Fstintel.git uboot-mediatek: update to v2025.01 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] https://github.com/u-boot/u-boot/commit/ddac69885efaffc68a71c1a159dc2b3ff4b9fda3 [2] https://github.com/u-boot/u-boot/commit/ccdd7948e22f21d2add8f51c4918a2c576dc5e91 [3] https://github.com/u-boot/u-boot/commit/599652cff13ad31d23b1b8bf8905533e447435d5 Signed-off-by: Shiji Yang --- diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile index 8fda29afa6..a62ecb9c97 100644 --- a/package/boot/uboot-mediatek/Makefile +++ b/package/boot/uboot-mediatek/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -PKG_VERSION:=2024.10 -PKG_HASH:=b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 +PKG_VERSION:=2025.01 +PKG_HASH:=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f PKG_BUILD_DEPENDS:=!(TARGET_ramips||TARGET_mediatek_mt7623):arm-trusted-firmware-tools/host UBOOT_USE_INTREE_DTC:=1 diff --git a/package/boot/uboot-mediatek/patches/000-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch b/package/boot/uboot-mediatek/patches/000-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch deleted file mode 100644 index dcbf8b953f..0000000000 --- a/package/boot/uboot-mediatek/patches/000-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 93d7086edb0db4b05149dfea21a2a82d8f160944 Mon Sep 17 00:00:00 2001 -From: Weijie Gao -Date: Sat, 6 Mar 2021 16:29:33 +0800 -Subject: [PATCH 10/12] configs: mt7622: enable environment for mt7622_rfb - -Enable environment vairables for mt7622_rfb - -Signed-off-by: Weijie Gao ---- - configs/mt7622_rfb_defconfig | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/configs/mt7622_rfb_defconfig -+++ b/configs/mt7622_rfb_defconfig -@@ -6,6 +6,8 @@ CONFIG_TEXT_BASE=0x41e00000 - CONFIG_SYS_MALLOC_F_LEN=0x4000 - CONFIG_NR_DRAM_BANKS=1 - CONFIG_DEFAULT_DEVICE_TREE="mt7622-rfb" -+CONFIG_ENV_SIZE=0x20000 -+CONFIG_ENV_OFFSET=0x280000 - CONFIG_DEBUG_UART_BASE=0x11002000 - CONFIG_DEBUG_UART_CLOCK=25000000 - CONFIG_SYS_LOAD_ADDR=0x4007ff28 -@@ -25,6 +27,9 @@ CONFIG_CMD_SF_TEST=y - CONFIG_CMD_PING=y - CONFIG_CMD_SMC=y - CONFIG_ENV_OVERWRITE=y -+CONFIG_ENV_IS_IN_MTD=y -+CONFIG_ENV_MTD_NAME="spi-nand0" -+CONFIG_ENV_SIZE_REDUND=0x40000 - CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y - CONFIG_NET_RANDOM_ETHADDR=y - CONFIG_USE_IPADDR=y diff --git a/package/boot/uboot-mediatek/patches/010-menu-fix-the-logic-checking-whether-ESC-key-is-press.patch b/package/boot/uboot-mediatek/patches/010-menu-fix-the-logic-checking-whether-ESC-key-is-press.patch deleted file mode 100644 index f3589c4622..0000000000 --- a/package/boot/uboot-mediatek/patches/010-menu-fix-the-logic-checking-whether-ESC-key-is-press.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 72b4ba8417d33516b8489bac3c90dbbbf781a3d2 Mon Sep 17 00:00:00 2001 -From: Weijie Gao -Date: Tue, 29 Oct 2024 17:47:10 +0800 -Subject: [PATCH 1/3] menu: fix the logic checking whether ESC key is pressed - -It's observed that the bootmenu on a serial console sometimes -incorrectly quitted with superfluous characters filled to command -line input: - -> *** U-Boot Boot Menu *** -> -> 1. Startup system (Default) -> 2. Upgrade firmware -> 3. Upgrade ATF BL2 -> 4. Upgrade ATF FIP -> 5. Load image -> 0. U-Boot console -> -> -> Press UP/DOWN to move, ENTER to select, ESC to quit ->MT7988> [B - -Analysis shows it was caused by the wrong logic of bootmenu_loop: - -At first the bootmenu_loop received the first ESC char correctly. - -However, during the second call to bootmenu_loop, there's no data -in the UART Rx FIFO. Due to the low baudrate, the second char of -the down array key sequence hasn't be fully received. - -But bootmenu_loop just did a mdelay(10), and then treated it as a -single ESC key press event. It didn't even try tstc() again after -the 10ms timeout. - -This patch fixes this issue by letting bootmenu_loop check tstc() -twice. - -Tested-By: E Shattow -Signed-off-by: Weijie Gao ---- - common/menu.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/common/menu.c -+++ b/common/menu.c -@@ -525,14 +525,15 @@ enum bootmenu_key bootmenu_loop(struct b - struct cli_ch_state *cch) - { - enum bootmenu_key key; -- int c; -+ int c, errchar = 0; - - c = cli_ch_process(cch, 0); - if (!c) { - while (!c && !tstc()) { - schedule(); - mdelay(10); -- c = cli_ch_process(cch, -ETIMEDOUT); -+ c = cli_ch_process(cch, errchar); -+ errchar = -ETIMEDOUT; - } - if (!c) { - c = getchar(); diff --git a/package/boot/uboot-mediatek/patches/011-menu-add-support-to-check-if-menu-needs-to-be-reprin.patch b/package/boot/uboot-mediatek/patches/011-menu-add-support-to-check-if-menu-needs-to-be-reprin.patch deleted file mode 100644 index 9d356ff0b4..0000000000 --- a/package/boot/uboot-mediatek/patches/011-menu-add-support-to-check-if-menu-needs-to-be-reprin.patch +++ /dev/null @@ -1,112 +0,0 @@ -From f1cbdd3330f0055dfbff0ef7d86276c4cc3cff2a Mon Sep 17 00:00:00 2001 -From: Weijie Gao -Date: Tue, 29 Oct 2024 17:47:16 +0800 -Subject: [PATCH 2/3] menu: add support to check if menu needs to be reprinted - -This patch adds a new callback named need_reprint for menu. -The need_reprint will be called before printing the menu. If the -callback exists and returns FALSE, menu printing will be canceled. - -This is very useful if the menu was not changed. It can save time -for serial-based menu to handle more input data. - -Signed-off-by: Weijie Gao ---- - boot/pxe_utils.c | 2 +- - cmd/bootmenu.c | 2 +- - cmd/eficonfig.c | 2 +- - common/menu.c | 11 +++++++++++ - include/menu.h | 1 + - 5 files changed, 15 insertions(+), 3 deletions(-) - ---- a/boot/pxe_utils.c -+++ b/boot/pxe_utils.c -@@ -1449,7 +1449,7 @@ static struct menu *pxe_menu_to_menu(str - * Create a menu and add items for all the labels. - */ - m = menu_create(cfg->title, DIV_ROUND_UP(cfg->timeout, 10), -- cfg->prompt, NULL, label_print, NULL, NULL); -+ cfg->prompt, NULL, label_print, NULL, NULL, NULL); - if (!m) - return NULL; - ---- a/cmd/bootmenu.c -+++ b/cmd/bootmenu.c -@@ -506,7 +506,7 @@ static enum bootmenu_ret bootmenu_show(i - - menu = menu_create(NULL, bootmenu->delay, 1, menu_display_statusline, - bootmenu_print_entry, bootmenu_choice_entry, -- bootmenu); -+ NULL, bootmenu); - if (!menu) { - bootmenu_destroy(bootmenu); - return BOOTMENU_RET_FAIL; ---- a/cmd/eficonfig.c -+++ b/cmd/eficonfig.c -@@ -443,7 +443,7 @@ efi_status_t eficonfig_process_common(st - efi_menu->menu_desc = menu_desc; - - menu = menu_create(NULL, 0, 1, display_statusline, item_data_print, -- item_choice, efi_menu); -+ item_choice, NULL, efi_menu); - if (!menu) - return EFI_INVALID_PARAMETER; - ---- a/common/menu.c -+++ b/common/menu.c -@@ -43,6 +43,7 @@ struct menu { - void (*display_statusline)(struct menu *); - void (*item_data_print)(void *); - char *(*item_choice)(void *); -+ bool (*need_reprint)(void *); - void *item_choice_data; - struct list_head items; - int item_cnt; -@@ -117,6 +118,11 @@ static inline void *menu_item_destroy(st - */ - static inline void menu_display(struct menu *m) - { -+ if (m->need_reprint) { -+ if (!m->need_reprint(m->item_choice_data)) -+ return; -+ } -+ - if (m->title) { - puts(m->title); - putc('\n'); -@@ -362,6 +368,9 @@ int menu_item_add(struct menu *m, char * - * item. Returns a key string corresponding to the chosen item or NULL if - * no item has been selected. - * -+ * need_reprint - If not NULL, will be called before printing the menu. -+ * Returning FALSE means the menu does not need reprint. -+ * - * item_choice_data - Will be passed as the argument to the item_choice function - * - * Returns a pointer to the menu if successful, or NULL if there is -@@ -371,6 +380,7 @@ struct menu *menu_create(char *title, in - void (*display_statusline)(struct menu *), - void (*item_data_print)(void *), - char *(*item_choice)(void *), -+ bool (*need_reprint)(void *), - void *item_choice_data) - { - struct menu *m; -@@ -386,6 +396,7 @@ struct menu *menu_create(char *title, in - m->display_statusline = display_statusline; - m->item_data_print = item_data_print; - m->item_choice = item_choice; -+ m->need_reprint = need_reprint; - m->item_choice_data = item_choice_data; - m->item_cnt = 0; - ---- a/include/menu.h -+++ b/include/menu.h -@@ -13,6 +13,7 @@ struct menu *menu_create(char *title, in - void (*display_statusline)(struct menu *), - void (*item_data_print)(void *), - char *(*item_choice)(void *), -+ bool (*need_reprint)(void *), - void *item_choice_data); - int menu_default_set(struct menu *m, char *item_key); - int menu_get_choice(struct menu *m, void **choice); diff --git a/package/boot/uboot-mediatek/patches/012-bootmenu-add-reprint-check.patch b/package/boot/uboot-mediatek/patches/012-bootmenu-add-reprint-check.patch deleted file mode 100644 index 8f4db3a82e..0000000000 --- a/package/boot/uboot-mediatek/patches/012-bootmenu-add-reprint-check.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 702752cfae954648d6133bdff19283343b3339ef Mon Sep 17 00:00:00 2001 -From: Weijie Gao -Date: Tue, 29 Oct 2024 17:47:22 +0800 -Subject: [PATCH 3/3] bootmenu: add reprint check - -Record the last active menu item and check if it equals to the -current selected item before reprint. - -Signed-off-by: Weijie Gao ---- - cmd/bootmenu.c | 16 +++++++++++++++- - include/menu.h | 1 + - 2 files changed, 16 insertions(+), 1 deletion(-) - ---- a/cmd/bootmenu.c -+++ b/cmd/bootmenu.c -@@ -103,11 +103,13 @@ static char *bootmenu_choice_entry(void - - switch (key) { - case BKEY_UP: -+ menu->last_active = menu->active; - if (menu->active > 0) - --menu->active; - /* no menu key selected, regenerate menu */ - return NULL; - case BKEY_DOWN: -+ menu->last_active = menu->active; - if (menu->active < menu->count - 1) - ++menu->active; - /* no menu key selected, regenerate menu */ -@@ -133,6 +135,17 @@ static char *bootmenu_choice_entry(void - return NULL; - } - -+static bool bootmenu_need_reprint(void *data) -+{ -+ struct bootmenu_data *menu = data; -+ bool need_reprint; -+ -+ need_reprint = menu->last_active != menu->active; -+ menu->last_active = menu->active; -+ -+ return need_reprint; -+} -+ - static void bootmenu_destroy(struct bootmenu_data *menu) - { - struct bootmenu_entry *iter = menu->first; -@@ -332,6 +345,7 @@ static struct bootmenu_data *bootmenu_cr - - menu->delay = delay; - menu->active = 0; -+ menu->last_active = -1; - menu->first = NULL; - - default_str = env_get("bootmenu_default"); -@@ -506,7 +520,7 @@ static enum bootmenu_ret bootmenu_show(i - - menu = menu_create(NULL, bootmenu->delay, 1, menu_display_statusline, - bootmenu_print_entry, bootmenu_choice_entry, -- NULL, bootmenu); -+ bootmenu_need_reprint, bootmenu); - if (!menu) { - bootmenu_destroy(bootmenu); - return BOOTMENU_RET_FAIL; ---- a/include/menu.h -+++ b/include/menu.h -@@ -40,6 +40,7 @@ int menu_show(int bootdelay); - struct bootmenu_data { - int delay; /* delay for autoboot */ - int active; /* active menu entry */ -+ int last_active; /* last active menu entry */ - int count; /* total count of menu entries */ - struct bootmenu_entry *first; /* first menu entry */ - }; diff --git a/package/boot/uboot-mediatek/patches/050-mt7622-enable-pstore.patch b/package/boot/uboot-mediatek/patches/050-mt7622-enable-pstore.patch deleted file mode 100644 index 601e394f5e..0000000000 --- a/package/boot/uboot-mediatek/patches/050-mt7622-enable-pstore.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/arch/arm/dts/mt7622.dtsi -+++ b/arch/arm/dts/mt7622.dtsi -@@ -37,6 +37,30 @@ - }; - }; - -+ psci { -+ compatible = "arm,psci-1.0"; -+ method = "smc"; -+ }; -+ -+ reserved-memory { -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; -+ -+ /* 64 KiB reserved for ramoops/pstore */ -+ ramoops@42ff0000 { -+ compatible = "ramoops"; -+ reg = <0 0x42ff0000 0 0x10000>; -+ record-size = <0x1000>; -+ }; -+ -+ /* 192 KiB reserved for ARM Trusted Firmware (BL31) */ -+ secmon_reserved: secmon@43000000 { -+ reg = <0 0x43000000 0 0x30000>; -+ no-map; -+ }; -+ }; -+ - snfi: snfi@1100d000 { - compatible = "mediatek,mtk-snfi-spi"; - reg = <0x1100d000 0x2000>; diff --git a/package/boot/uboot-mediatek/patches/051-mt7986-enable-pstore.patch b/package/boot/uboot-mediatek/patches/051-mt7986-enable-pstore.patch deleted file mode 100644 index d6ae7f0f13..0000000000 --- a/package/boot/uboot-mediatek/patches/051-mt7986-enable-pstore.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/arch/arm/dts/mt7986.dtsi -+++ b/arch/arm/dts/mt7986.dtsi -@@ -50,6 +50,35 @@ - }; - }; - -+ psci { -+ compatible = "arm,psci-0.2"; -+ method = "smc"; -+ }; -+ -+ reserved-memory { -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; -+ -+ /* 64 KiB reserved for ramoops/pstore */ -+ ramoops@42ff0000 { -+ compatible = "ramoops"; -+ reg = <0 0x42ff0000 0 0x10000>; -+ record-size = <0x1000>; -+ }; -+ -+ /* 192 KiB reserved for ARM Trusted Firmware (BL31) */ -+ secmon_reserved: secmon@43000000 { -+ reg = <0 0x43000000 0 0x30000>; -+ no-map; -+ }; -+ -+ wmcpu_emi: wmcpu-reserved@4fc00000 { -+ no-map; -+ reg = <0 0x4fc00000 0 0x00100000>; -+ }; -+ }; -+ - dummy_clk: dummy12m { - compatible = "fixed-clock"; - clock-frequency = <12000000>; diff --git a/package/boot/uboot-mediatek/patches/052-mt7981-enable-pstore.patch b/package/boot/uboot-mediatek/patches/052-mt7981-enable-pstore.patch deleted file mode 100644 index 9bfea8f737..0000000000 --- a/package/boot/uboot-mediatek/patches/052-mt7981-enable-pstore.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/arch/arm/dts/mt7981.dtsi -+++ b/arch/arm/dts/mt7981.dtsi -@@ -32,6 +32,35 @@ - }; - }; - -+ psci { -+ compatible = "arm,psci-0.2"; -+ method = "smc"; -+ }; -+ -+ reserved-memory { -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; -+ -+ /* 64 KiB reserved for ramoops/pstore */ -+ ramoops@42ff0000 { -+ compatible = "ramoops"; -+ reg = <0 0x42ff0000 0 0x10000>; -+ record-size = <0x1000>; -+ }; -+ -+ /* 192 KiB reserved for ARM Trusted Firmware (BL31) */ -+ secmon_reserved: secmon@43000000 { -+ reg = <0 0x43000000 0 0x30000>; -+ no-map; -+ }; -+ -+ wmcpu_emi: wmcpu-reserved@4fc00000 { -+ no-map; -+ reg = <0 0x4fc00000 0 0x00100000>; -+ }; -+ }; -+ - gpt_clk: gpt_dummy20m { - compatible = "fixed-clock"; - clock-frequency = <13000000>; diff --git a/package/boot/uboot-mediatek/patches/100-02-drivers-mtd-add-support-for-MediaTek-SPI-NAND-flash-.patch b/package/boot/uboot-mediatek/patches/100-02-drivers-mtd-add-support-for-MediaTek-SPI-NAND-flash-.patch index e57c88c295..f5823a53d1 100644 --- a/package/boot/uboot-mediatek/patches/100-02-drivers-mtd-add-support-for-MediaTek-SPI-NAND-flash-.patch +++ b/package/boot/uboot-mediatek/patches/100-02-drivers-mtd-add-support-for-MediaTek-SPI-NAND-flash-.patch @@ -49,7 +49,7 @@ Signed-off-by: Weijie Gao config SYS_NAND_MAX_OOBFREE --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile -@@ -40,3 +40,5 @@ obj-$(CONFIG_$(SPL_TPL_)SPI_FLASH_SUPPOR +@@ -40,3 +40,5 @@ obj-$(CONFIG_$(PHASE_)SPI_FLASH_SUPPORT) obj-$(CONFIG_SPL_UBI) += ubispl/ endif diff --git a/package/boot/uboot-mediatek/patches/100-04-env-add-support-for-generic-MTD-device.patch b/package/boot/uboot-mediatek/patches/100-04-env-add-support-for-generic-MTD-device.patch index 8f0a50bd98..946248bbb4 100644 --- a/package/boot/uboot-mediatek/patches/100-04-env-add-support-for-generic-MTD-device.patch +++ b/package/boot/uboot-mediatek/patches/100-04-env-add-support-for-generic-MTD-device.patch @@ -89,14 +89,14 @@ Signed-off-by: Weijie Gao depends on ENV_IS_IN_UBI --- a/env/Makefile +++ b/env/Makefile -@@ -24,6 +24,7 @@ obj-$(CONFIG_$(SPL_TPL_)ENV_IS_NOWHERE) - obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_MMC) += mmc.o - obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_FAT) += fat.o - obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_EXT4) += ext4.o -+obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_MTD) += mtd.o - obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_NAND) += nand.o - obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_SPI_FLASH) += sf.o - obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_FLASH) += flash.o +@@ -24,6 +24,7 @@ obj-$(CONFIG_$(PHASE_)ENV_IS_NOWHERE) += + obj-$(CONFIG_$(PHASE_)ENV_IS_IN_MMC) += mmc.o + obj-$(CONFIG_$(PHASE_)ENV_IS_IN_FAT) += fat.o + obj-$(CONFIG_$(PHASE_)ENV_IS_IN_EXT4) += ext4.o ++obj-$(CONFIG_$(PHASE_)ENV_IS_IN_MTD) += mtd.o + obj-$(CONFIG_$(PHASE_)ENV_IS_IN_NAND) += nand.o + obj-$(CONFIG_$(PHASE_)ENV_IS_IN_SPI_FLASH) += sf.o + obj-$(CONFIG_$(PHASE_)ENV_IS_IN_FLASH) += flash.o --- a/env/env.c +++ b/env/env.c @@ -46,6 +46,9 @@ static enum env_location env_locations[] @@ -370,7 +370,7 @@ Signed-off-by: Weijie Gao +}; --- a/include/env_internal.h +++ b/include/env_internal.h -@@ -107,6 +107,7 @@ enum env_location { +@@ -108,6 +108,7 @@ enum env_location { ENVL_FAT, ENVL_FLASH, ENVL_MMC, diff --git a/package/boot/uboot-mediatek/patches/100-08-common-board_r-add-support-to-initialize-NMBM-after-.patch b/package/boot/uboot-mediatek/patches/100-08-common-board_r-add-support-to-initialize-NMBM-after-.patch index 176b215b52..3792fae430 100644 --- a/package/boot/uboot-mediatek/patches/100-08-common-board_r-add-support-to-initialize-NMBM-after-.patch +++ b/package/boot/uboot-mediatek/patches/100-08-common-board_r-add-support-to-initialize-NMBM-after-.patch @@ -13,7 +13,7 @@ Signed-off-by: Weijie Gao --- a/common/board_r.c +++ b/common/board_r.c -@@ -372,6 +372,20 @@ static int initr_nand(void) +@@ -381,6 +381,20 @@ static int initr_nand(void) } #endif @@ -34,7 +34,7 @@ Signed-off-by: Weijie Gao #if defined(CONFIG_CMD_ONENAND) /* go init the NAND */ static int initr_onenand(void) -@@ -663,6 +677,9 @@ static init_fnc_t init_sequence_r[] = { +@@ -694,6 +708,9 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_CMD_ONENAND initr_onenand, #endif diff --git a/package/boot/uboot-mediatek/patches/100-09-cmd-add-nmbm-command.patch b/package/boot/uboot-mediatek/patches/100-09-cmd-add-nmbm-command.patch index f988219b6d..ab5df08c5c 100644 --- a/package/boot/uboot-mediatek/patches/100-09-cmd-add-nmbm-command.patch +++ b/package/boot/uboot-mediatek/patches/100-09-cmd-add-nmbm-command.patch @@ -15,7 +15,7 @@ Signed-off-by: Weijie Gao --- a/cmd/Kconfig +++ b/cmd/Kconfig -@@ -1465,6 +1465,12 @@ config CMD_NAND_TORTURE +@@ -1492,6 +1492,12 @@ config CMD_NAND_TORTURE endif # CMD_NAND @@ -35,9 +35,9 @@ Signed-off-by: Weijie Gao obj-$(CONFIG_CMD_MUX) += mux.o obj-$(CONFIG_CMD_NAND) += nand.o +obj-$(CONFIG_CMD_NMBM) += nmbm.o - obj-$(CONFIG_CMD_NET) += net.o - obj-$(CONFIG_ENV_SUPPORT) += nvedit.o - obj-$(CONFIG_CMD_NVEDIT_EFI) += nvedit_efi.o + ifdef CONFIG_NET + obj-$(CONFIG_CMD_NET) += net.o net-common.o + else ifdef CONFIG_NET_LWIP --- /dev/null +++ b/cmd/nmbm.c @@ -0,0 +1,327 @@ diff --git a/package/boot/uboot-mediatek/patches/100-10-cmd-mtd-add-markbad-subcommand-for-NMBM-testing.patch b/package/boot/uboot-mediatek/patches/100-10-cmd-mtd-add-markbad-subcommand-for-NMBM-testing.patch index b2a9235cdb..0943a63217 100644 --- a/package/boot/uboot-mediatek/patches/100-10-cmd-mtd-add-markbad-subcommand-for-NMBM-testing.patch +++ b/package/boot/uboot-mediatek/patches/100-10-cmd-mtd-add-markbad-subcommand-for-NMBM-testing.patch @@ -20,7 +20,7 @@ Signed-off-by: SkyLake.Huang --- a/cmd/mtd.c +++ b/cmd/mtd.c -@@ -721,6 +721,42 @@ out_put_mtd: +@@ -730,6 +730,42 @@ out_put_mtd: return CMD_RET_SUCCESS; } @@ -63,7 +63,7 @@ Signed-off-by: SkyLake.Huang #ifdef CONFIG_AUTO_COMPLETE static int mtd_name_complete(int argc, char *const argv[], char last_char, int maxv, char *cmdv[]) -@@ -768,6 +804,7 @@ U_BOOT_LONGHELP(mtd, +@@ -777,6 +813,7 @@ U_BOOT_LONGHELP(mtd, "\n" "Specific functions:\n" "mtd bad \n" @@ -71,7 +71,7 @@ Signed-off-by: SkyLake.Huang #if CONFIG_IS_ENABLED(CMD_MTD_OTP) "mtd otpread [u|f] \n" "mtd otpwrite \n" -@@ -808,4 +845,6 @@ U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils" +@@ -817,4 +854,6 @@ U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils" U_BOOT_SUBCMD_MKENT_COMPLETE(erase, 4, 0, do_mtd_erase, mtd_name_complete), U_BOOT_SUBCMD_MKENT_COMPLETE(bad, 2, 1, do_mtd_bad, diff --git a/package/boot/uboot-mediatek/patches/100-11-env-add-support-for-NMBM-upper-MTD-layer.patch b/package/boot/uboot-mediatek/patches/100-11-env-add-support-for-NMBM-upper-MTD-layer.patch index a5f9586b91..a196589efa 100644 --- a/package/boot/uboot-mediatek/patches/100-11-env-add-support-for-NMBM-upper-MTD-layer.patch +++ b/package/boot/uboot-mediatek/patches/100-11-env-add-support-for-NMBM-upper-MTD-layer.patch @@ -60,13 +60,13 @@ Signed-off-by: Weijie Gao default 0xF0000 if ARCH_SUNXI --- a/env/Makefile +++ b/env/Makefile -@@ -26,6 +26,7 @@ obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_FAT) + - obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_EXT4) += ext4.o - obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_MTD) += mtd.o - obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_NAND) += nand.o -+obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_NMBM) += nmbm.o - obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_SPI_FLASH) += sf.o - obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_FLASH) += flash.o +@@ -26,6 +26,7 @@ obj-$(CONFIG_$(PHASE_)ENV_IS_IN_FAT) += + obj-$(CONFIG_$(PHASE_)ENV_IS_IN_EXT4) += ext4.o + obj-$(CONFIG_$(PHASE_)ENV_IS_IN_MTD) += mtd.o + obj-$(CONFIG_$(PHASE_)ENV_IS_IN_NAND) += nand.o ++obj-$(CONFIG_$(PHASE_)ENV_IS_IN_NMBM) += nmbm.o + obj-$(CONFIG_$(PHASE_)ENV_IS_IN_SPI_FLASH) += sf.o + obj-$(CONFIG_$(PHASE_)ENV_IS_IN_FLASH) += flash.o --- a/env/env.c +++ b/env/env.c @@ -240,7 +240,7 @@ Signed-off-by: Weijie Gao +}; --- a/include/env_internal.h +++ b/include/env_internal.h -@@ -109,6 +109,7 @@ enum env_location { +@@ -110,6 +110,7 @@ enum env_location { ENVL_MMC, ENVL_MTD, ENVL_NAND, diff --git a/package/boot/uboot-mediatek/patches/100-13-cmd-add-a-new-command-for-NAND-flash-debugging.patch b/package/boot/uboot-mediatek/patches/100-13-cmd-add-a-new-command-for-NAND-flash-debugging.patch index c16f63fdb3..419673f7e2 100644 --- a/package/boot/uboot-mediatek/patches/100-13-cmd-add-a-new-command-for-NAND-flash-debugging.patch +++ b/package/boot/uboot-mediatek/patches/100-13-cmd-add-a-new-command-for-NAND-flash-debugging.patch @@ -26,7 +26,7 @@ Signed-off-by: Weijie Gao --- a/cmd/Kconfig +++ b/cmd/Kconfig -@@ -1465,6 +1465,14 @@ config CMD_NAND_TORTURE +@@ -1492,6 +1492,14 @@ config CMD_NAND_TORTURE endif # CMD_NAND @@ -49,8 +49,8 @@ Signed-off-by: Weijie Gao obj-$(CONFIG_CMD_NAND) += nand.o +obj-$(CONFIG_CMD_NAND_EXT) += nand-ext.o obj-$(CONFIG_CMD_NMBM) += nmbm.o - obj-$(CONFIG_CMD_NET) += net.o - obj-$(CONFIG_ENV_SUPPORT) += nvedit.o + ifdef CONFIG_NET + obj-$(CONFIG_CMD_NET) += net.o net-common.o --- /dev/null +++ b/cmd/nand-ext.c @@ -0,0 +1,1062 @@ diff --git a/package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch b/package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch index 82839033a3..230bbf0fa3 100644 --- a/package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch +++ b/package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch @@ -13,7 +13,7 @@ Signed-off-by: Weijie Gao --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c -@@ -2958,6 +2958,100 @@ static int spi_nor_init_params(struct sp +@@ -3248,6 +3248,100 @@ static int spi_nor_init_params(struct sp return 0; } @@ -114,7 +114,7 @@ Signed-off-by: Weijie Gao static int spi_nor_hwcaps2cmd(u32 hwcaps, const int table[][2], size_t size) { size_t i; -@@ -4077,6 +4171,7 @@ int spi_nor_scan(struct spi_nor *nor) +@@ -4450,6 +4544,7 @@ int spi_nor_scan(struct spi_nor *nor) nor->write = spi_nor_write_data; nor->read_reg = spi_nor_read_reg; nor->write_reg = spi_nor_write_reg; @@ -124,7 +124,7 @@ Signed-off-by: Weijie Gao --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h -@@ -29,6 +29,7 @@ +@@ -32,6 +32,7 @@ #define SNOR_MFR_SPANSION CFI_MFR_AMD #define SNOR_MFR_SST CFI_MFR_SST #define SNOR_MFR_WINBOND 0xef /* Also used by some Spansion */ @@ -132,7 +132,7 @@ Signed-off-by: Weijie Gao #define SNOR_MFR_CYPRESS 0x34 /* -@@ -567,6 +568,7 @@ struct spi_nor { +@@ -590,6 +591,7 @@ struct spi_nor { void (*unprepare)(struct spi_nor *nor, enum spi_nor_ops ops); int (*read_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len); int (*write_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len); diff --git a/package/boot/uboot-mediatek/patches/100-15-cmd-sf-add-support-to-read-flash-unique-ID.patch b/package/boot/uboot-mediatek/patches/100-15-cmd-sf-add-support-to-read-flash-unique-ID.patch index dcf6b47f62..68b2eee61e 100644 --- a/package/boot/uboot-mediatek/patches/100-15-cmd-sf-add-support-to-read-flash-unique-ID.patch +++ b/package/boot/uboot-mediatek/patches/100-15-cmd-sf-add-support-to-read-flash-unique-ID.patch @@ -12,7 +12,7 @@ Signed-off-by: Weijie Gao --- a/cmd/sf.c +++ b/cmd/sf.c -@@ -413,6 +413,14 @@ static int do_spi_protect(int argc, char +@@ -421,6 +421,14 @@ static int do_spi_protect(int argc, char return ret == 0 ? 0 : 1; } @@ -27,7 +27,7 @@ Signed-off-by: Weijie Gao enum { STAGE_ERASE, STAGE_CHECK, -@@ -607,6 +615,8 @@ static int do_spi_flash(struct cmd_tbl * +@@ -615,6 +623,8 @@ static int do_spi_flash(struct cmd_tbl * ret = do_spi_flash_erase(argc, argv); else if (IS_ENABLED(CONFIG_SPI_FLASH_LOCK) && strcmp(cmd, "protect") == 0) ret = do_spi_protect(argc, argv); @@ -36,11 +36,14 @@ Signed-off-by: Weijie Gao else if (IS_ENABLED(CONFIG_CMD_SF_TEST) && !strcmp(cmd, "test")) ret = do_spi_flash_test(argc, argv); else -@@ -637,6 +647,7 @@ U_BOOT_LONGHELP(sf, +@@ -643,8 +653,9 @@ U_BOOT_LONGHELP(sf, + " at address 'sector'" + #endif #ifdef CONFIG_CMD_SF_TEST - "\nsf test offset len - run a very basic destructive test" +- "\nsf test offset len - run a very basic destructive test" ++ "\nsf test offset len - run a very basic destructive test" #endif -+ "sf uuid - read uuid from flash" ++ "\nsf uuid - read uuid from flash" ); U_BOOT_CMD( diff --git a/package/boot/uboot-mediatek/patches/100-19-board-mt7622-use-new-spi-nand-driver.patch b/package/boot/uboot-mediatek/patches/100-19-board-mt7622-use-new-spi-nand-driver.patch index 547212c740..cd1b7df44e 100644 --- a/package/boot/uboot-mediatek/patches/100-19-board-mt7622-use-new-spi-nand-driver.patch +++ b/package/boot/uboot-mediatek/patches/100-19-board-mt7622-use-new-spi-nand-driver.patch @@ -30,7 +30,7 @@ Signed-off-by: Weijie Gao }; --- a/arch/arm/dts/mt7622.dtsi +++ b/arch/arm/dts/mt7622.dtsi -@@ -77,6 +77,22 @@ +@@ -53,6 +53,22 @@ #size-cells = <0>; }; @@ -55,7 +55,7 @@ Signed-off-by: Weijie Gao reg = <0x11014000 0x1000>; --- a/configs/mt7622_rfb_defconfig +++ b/configs/mt7622_rfb_defconfig -@@ -22,6 +22,7 @@ CONFIG_SYS_PROMPT="MT7622> " +@@ -20,6 +20,7 @@ CONFIG_SYS_PROMPT="MT7622> " CONFIG_SYS_MAXARGS=8 CONFIG_CMD_BOOTMENU=y CONFIG_CMD_MMC=y @@ -63,7 +63,7 @@ Signed-off-by: Weijie Gao CONFIG_CMD_PCI=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_PING=y -@@ -42,6 +43,9 @@ CONFIG_CLK=y +@@ -37,6 +38,9 @@ CONFIG_CLK=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_MMC_MTK=y CONFIG_MTD=y diff --git a/package/boot/uboot-mediatek/patches/100-20-board-mt7981-add-reference-board-using-new-spi-nand-.patch b/package/boot/uboot-mediatek/patches/100-20-board-mt7981-add-reference-board-using-new-spi-nand-.patch index bfeaf07f04..a2c36d8e6b 100644 --- a/package/boot/uboot-mediatek/patches/100-20-board-mt7981-add-reference-board-using-new-spi-nand-.patch +++ b/package/boot/uboot-mediatek/patches/100-20-board-mt7981-add-reference-board-using-new-spi-nand-.patch @@ -18,7 +18,7 @@ Signed-off-by: Weijie Gao --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -1190,6 +1190,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ +@@ -1195,6 +1195,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt7623n-bananapi-bpi-r2.dtb \ mt7629-rfb.dtb \ mt7981-rfb.dtb \ diff --git a/package/boot/uboot-mediatek/patches/100-21-mtd-spi-nor-add-more-flash-ids.patch b/package/boot/uboot-mediatek/patches/100-21-mtd-spi-nor-add-more-flash-ids.patch index 578b6e62b8..f373e2a38c 100644 --- a/package/boot/uboot-mediatek/patches/100-21-mtd-spi-nor-add-more-flash-ids.patch +++ b/package/boot/uboot-mediatek/patches/100-21-mtd-spi-nor-add-more-flash-ids.patch @@ -13,7 +13,7 @@ Signed-off-by: Weijie Gao --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c -@@ -697,6 +697,7 @@ static int set_4byte(struct spi_nor *nor +@@ -758,6 +758,7 @@ static int set_4byte(struct spi_nor *nor case SNOR_MFR_ISSI: case SNOR_MFR_MACRONIX: case SNOR_MFR_WINBOND: @@ -45,7 +45,7 @@ Signed-off-by: Weijie Gao INFO("gd25lq128", 0xc86018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) -@@ -490,6 +496,16 @@ const struct flash_info spi_nor_ids[] = +@@ -520,6 +526,16 @@ const struct flash_info spi_nor_ids[] = SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, { @@ -62,7 +62,7 @@ Signed-off-by: Weijie Gao INFO("w25q128jw", 0xef8018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) -@@ -549,6 +565,11 @@ const struct flash_info spi_nor_ids[] = +@@ -583,6 +599,11 @@ const struct flash_info spi_nor_ids[] = SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, { INFO("w25q256", 0xef4019, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, diff --git a/package/boot/uboot-mediatek/patches/100-23-mmc-mtk-sd-add-support-to-display-verbose-error-log.patch b/package/boot/uboot-mediatek/patches/100-23-mmc-mtk-sd-add-support-to-display-verbose-error-log.patch index 7ab2b6d0ce..ae69334be6 100644 --- a/package/boot/uboot-mediatek/patches/100-23-mmc-mtk-sd-add-support-to-display-verbose-error-log.patch +++ b/package/boot/uboot-mediatek/patches/100-23-mmc-mtk-sd-add-support-to-display-verbose-error-log.patch @@ -15,7 +15,7 @@ Signed-off-by: Weijie Gao --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig -@@ -864,6 +864,14 @@ config MMC_MTK +@@ -876,6 +876,14 @@ config MMC_MTK This is needed if support for any SD/SDIO/MMC devices is required. If unsure, say N. @@ -32,7 +32,7 @@ Signed-off-by: Weijie Gao config FSL_SDHC_V2_3 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile -@@ -83,3 +83,7 @@ obj-$(CONFIG_RENESAS_SDHI) += tmio-comm +@@ -84,3 +84,7 @@ obj-$(CONFIG_RENESAS_SDHI) += tmio-comm obj-$(CONFIG_MMC_BCM2835) += bcm2835_sdhost.o obj-$(CONFIG_MMC_MTK) += mtk-sd.o obj-$(CONFIG_MMC_SDHCI_F_SDH30) += f_sdh30.o diff --git a/package/boot/uboot-mediatek/patches/100-24-cmd-ubi-make-volume-find-create-remove-APIs-public.patch b/package/boot/uboot-mediatek/patches/100-24-cmd-ubi-make-volume-find-create-remove-APIs-public.patch index cba34fce3f..f42efe0e3f 100644 --- a/package/boot/uboot-mediatek/patches/100-24-cmd-ubi-make-volume-find-create-remove-APIs-public.patch +++ b/package/boot/uboot-mediatek/patches/100-24-cmd-ubi-make-volume-find-create-remove-APIs-public.patch @@ -14,7 +14,7 @@ Signed-off-by: Weijie Gao --- a/cmd/ubi.c +++ b/cmd/ubi.c -@@ -212,8 +212,8 @@ bad: +@@ -213,8 +213,8 @@ bad: return err; } @@ -25,7 +25,7 @@ Signed-off-by: Weijie Gao { struct ubi_mkvol_req req; int err; -@@ -246,7 +246,7 @@ static int ubi_create_vol(char *volume, +@@ -247,7 +247,7 @@ static int ubi_create_vol(char *volume, return ubi_create_volume(ubi, &req); } @@ -34,7 +34,7 @@ Signed-off-by: Weijie Gao { struct ubi_volume *vol; int i; -@@ -261,7 +261,7 @@ static struct ubi_volume *ubi_find_volum +@@ -262,7 +262,7 @@ static struct ubi_volume *ubi_find_volum return NULL; } diff --git a/package/boot/uboot-mediatek/patches/100-25-cmd-ubi-allow-creating-volume-with-all-free-spaces.patch b/package/boot/uboot-mediatek/patches/100-25-cmd-ubi-allow-creating-volume-with-all-free-spaces.patch index e61f5d1119..d023b004f7 100644 --- a/package/boot/uboot-mediatek/patches/100-25-cmd-ubi-allow-creating-volume-with-all-free-spaces.patch +++ b/package/boot/uboot-mediatek/patches/100-25-cmd-ubi-allow-creating-volume-with-all-free-spaces.patch @@ -12,7 +12,7 @@ Signed-off-by: Weijie Gao --- a/cmd/ubi.c +++ b/cmd/ubi.c -@@ -225,7 +225,11 @@ int ubi_create_vol(char *volume, int64_t +@@ -226,7 +226,11 @@ int ubi_create_vol(char *volume, int64_t req.vol_id = vol_id; req.alignment = 1; diff --git a/package/boot/uboot-mediatek/patches/103-01-mt7622-enable-pstore.patch b/package/boot/uboot-mediatek/patches/103-01-mt7622-enable-pstore.patch new file mode 100644 index 0000000000..f085615e70 --- /dev/null +++ b/package/boot/uboot-mediatek/patches/103-01-mt7622-enable-pstore.patch @@ -0,0 +1,33 @@ +--- a/arch/arm/dts/mt7622.dtsi ++++ b/arch/arm/dts/mt7622.dtsi +@@ -37,6 +37,30 @@ + }; + }; + ++ psci { ++ compatible = "arm,psci-1.0"; ++ method = "smc"; ++ }; ++ ++ reserved-memory { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++ /* 64 KiB reserved for ramoops/pstore */ ++ ramoops@42ff0000 { ++ compatible = "ramoops"; ++ reg = <0x42ff0000 0x10000>; ++ record-size = <0x1000>; ++ }; ++ ++ /* 192 KiB reserved for ARM Trusted Firmware (BL31) */ ++ secmon_reserved: secmon@43000000 { ++ reg = <0x43000000 0x30000>; ++ no-map; ++ }; ++ }; ++ + snfi: snfi@1100d000 { + compatible = "mediatek,mtk-snfi-spi"; + reg = <0x1100d000 0x2000>; diff --git a/package/boot/uboot-mediatek/patches/103-02-mt7981-enable-pstore.patch b/package/boot/uboot-mediatek/patches/103-02-mt7981-enable-pstore.patch new file mode 100644 index 0000000000..81bf3d4eed --- /dev/null +++ b/package/boot/uboot-mediatek/patches/103-02-mt7981-enable-pstore.patch @@ -0,0 +1,38 @@ +--- a/arch/arm/dts/mt7981.dtsi ++++ b/arch/arm/dts/mt7981.dtsi +@@ -32,6 +32,35 @@ + }; + }; + ++ psci { ++ compatible = "arm,psci-0.2"; ++ method = "smc"; ++ }; ++ ++ reserved-memory { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++ /* 64 KiB reserved for ramoops/pstore */ ++ ramoops@42ff0000 { ++ compatible = "ramoops"; ++ reg = <0x42ff0000 0x10000>; ++ record-size = <0x1000>; ++ }; ++ ++ /* 192 KiB reserved for ARM Trusted Firmware (BL31) */ ++ secmon_reserved: secmon@43000000 { ++ reg = <0x43000000 0x30000>; ++ no-map; ++ }; ++ ++ wmcpu_emi: wmcpu-reserved@4fc00000 { ++ no-map; ++ reg = <0x4fc00000 0x00100000>; ++ }; ++ }; ++ + gpt_clk: gpt_dummy20m { + compatible = "fixed-clock"; + clock-frequency = <13000000>; diff --git a/package/boot/uboot-mediatek/patches/103-03-mt7986-enable-pstore.patch b/package/boot/uboot-mediatek/patches/103-03-mt7986-enable-pstore.patch new file mode 100644 index 0000000000..01ad0f919d --- /dev/null +++ b/package/boot/uboot-mediatek/patches/103-03-mt7986-enable-pstore.patch @@ -0,0 +1,38 @@ +--- a/arch/arm/dts/mt7986.dtsi ++++ b/arch/arm/dts/mt7986.dtsi +@@ -50,6 +50,35 @@ + }; + }; + ++ psci { ++ compatible = "arm,psci-0.2"; ++ method = "smc"; ++ }; ++ ++ reserved-memory { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++ /* 64 KiB reserved for ramoops/pstore */ ++ ramoops@42ff0000 { ++ compatible = "ramoops"; ++ reg = <0x42ff0000 0x10000>; ++ record-size = <0x1000>; ++ }; ++ ++ /* 192 KiB reserved for ARM Trusted Firmware (BL31) */ ++ secmon_reserved: secmon@43000000 { ++ reg = <0x43000000 0x30000>; ++ no-map; ++ }; ++ ++ wmcpu_emi: wmcpu-reserved@4fc00000 { ++ no-map; ++ reg = <0x4fc00000 0x00100000>; ++ }; ++ }; ++ + dummy_clk: dummy12m { + compatible = "fixed-clock"; + clock-frequency = <12000000>; diff --git a/package/boot/uboot-mediatek/patches/103-04-mt7988-enable-pstore.patch b/package/boot/uboot-mediatek/patches/103-04-mt7988-enable-pstore.patch new file mode 100644 index 0000000000..1f339d4b5b --- /dev/null +++ b/package/boot/uboot-mediatek/patches/103-04-mt7988-enable-pstore.patch @@ -0,0 +1,33 @@ +--- a/arch/arm/dts/mt7988.dtsi ++++ b/arch/arm/dts/mt7988.dtsi +@@ -63,6 +63,30 @@ + #clock-cells = <0>; + }; + ++ psci { ++ compatible = "arm,psci-0.2"; ++ method = "smc"; ++ }; ++ ++ reserved-memory { ++ #address-cells = <2>; ++ #size-cells = <2>; ++ ranges; ++ ++ /* 64 KiB reserved for ramoops/pstore */ ++ ramoops@42ff0000 { ++ compatible = "ramoops"; ++ reg = <0 0x42ff0000 0 0x10000>; ++ record-size = <0x1000>; ++ }; ++ ++ /* 320 KiB reserved for ARM Trusted Firmware (BL31+BL32) */ ++ secmon_reserved: secmon@43000000 { ++ reg = <0 0x43000000 0 0x50000>; ++ no-map; ++ }; ++ }; ++ + hwver: hwver { + compatible = "mediatek,hwver", "syscon"; + reg = <0 0x8000000 0 0x1000>; diff --git a/package/boot/uboot-mediatek/patches/103-mt7988-enable-pstore.patch b/package/boot/uboot-mediatek/patches/103-mt7988-enable-pstore.patch deleted file mode 100644 index 1f339d4b5b..0000000000 --- a/package/boot/uboot-mediatek/patches/103-mt7988-enable-pstore.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/arch/arm/dts/mt7988.dtsi -+++ b/arch/arm/dts/mt7988.dtsi -@@ -63,6 +63,30 @@ - #clock-cells = <0>; - }; - -+ psci { -+ compatible = "arm,psci-0.2"; -+ method = "smc"; -+ }; -+ -+ reserved-memory { -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; -+ -+ /* 64 KiB reserved for ramoops/pstore */ -+ ramoops@42ff0000 { -+ compatible = "ramoops"; -+ reg = <0 0x42ff0000 0 0x10000>; -+ record-size = <0x1000>; -+ }; -+ -+ /* 320 KiB reserved for ARM Trusted Firmware (BL31+BL32) */ -+ secmon_reserved: secmon@43000000 { -+ reg = <0 0x43000000 0 0x50000>; -+ no-map; -+ }; -+ }; -+ - hwver: hwver { - compatible = "mediatek,hwver", "syscon"; - reg = <0 0x8000000 0 0x1000>; diff --git a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch index 6040aaa0c4..c6abfcaa9b 100644 --- a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch +++ b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch @@ -1,318 +1,262 @@ --- a/configs/mt7988_sd_rfb_defconfig +++ b/configs/mt7988_sd_rfb_defconfig -@@ -11,6 +11,23 @@ CONFIG_DEBUG_UART_BASE=0x11000000 - CONFIG_DEBUG_UART_CLOCK=40000000 +@@ -5,37 +5,76 @@ CONFIG_ARCH_MEDIATEK=y + CONFIG_TEXT_BASE=0x41e00000 + CONFIG_SYS_MALLOC_F_LEN=0x4000 + CONFIG_NR_DRAM_BANKS=1 ++CONFIG_ENV_SIZE=0x40000 ++CONFIG_ENV_OFFSET=0x400000 + CONFIG_DEFAULT_DEVICE_TREE="mt7988-sd-rfb" ++CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_TARGET_MT7988=y CONFIG_SYS_LOAD_ADDR=0x46000000 ++CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 + CONFIG_DEBUG_UART_BASE=0x11000000 + CONFIG_DEBUG_UART_CLOCK=40000000 ++CONFIG_ENV_OFFSET_REDUND=0x440000 ++CONFIG_PCI=y CONFIG_DEBUG_UART=y -+CONFIG_OF_LIBFDT_OVERLAY=y -+CONFIG_SMBIOS_PRODUCT_NAME="" -+CONFIG_CFB_CONSOLE_ANSI=y -+CONFIG_BOARD_LATE_INIT=y -+CONFIG_BUTTON=y -+CONFIG_BUTTON_GPIO=y -+CONFIG_GPIO_HOG=y -+CONFIG_CMD_ENV_FLAGS=y + # CONFIG_EFI_LOADER is not set +CONFIG_FIT=y -+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y -+CONFIG_LED=y -+CONFIG_LED_BLINK=y -+CONFIG_LED_GPIO=y -+CONFIG_SPI_BOOT=y -+CONFIG_SD_BOOT=y -+CONFIG_BOOTSTD_DEFAULTS=y +CONFIG_BOOTSTD_FULL=y ++CONFIG_SD_BOOT=y ++CONFIG_SPI_BOOT=y # CONFIG_AUTOBOOT is not set CONFIG_DEFAULT_FDT_FILE="mt7988-sd-rfb" CONFIG_SYS_CBSIZE=512 -@@ -22,15 +39,118 @@ CONFIG_SYS_PROMPT="MT7988> " + CONFIG_SYS_PBSIZE=1049 + CONFIG_LOGLEVEL=7 ++CONFIG_PRE_CONSOLE_BUFFER=y + CONFIG_LOG=y ++CONFIG_BOARD_LATE_INIT=y + CONFIG_SYS_PROMPT="MT7988> " ++CONFIG_CMD_CPU=y ++CONFIG_CMD_LICENSE=y + # CONFIG_BOOTM_NETBSD is not set # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set -# CONFIG_CMD_ELF is not set +CONFIG_CMD_BOOTMENU=y -+CONFIG_CMD_BOOTP=y -+CONFIG_CMD_BUTTON=y -+CONFIG_CMD_CACHE=y -+CONFIG_CMD_CDP=y -+CONFIG_CMD_CPU=y -+CONFIG_CMD_DHCP=y -+CONFIG_CMD_DM=y -+CONFIG_CMD_ELF=y -+CONFIG_CMD_DNS=y -+CONFIG_CMD_ECHO=y -+CONFIG_CMD_ENV_READMEM=y ++CONFIG_CMD_ASKENV=y +CONFIG_CMD_ERASEENV=y -+CONFIG_CMD_EXT4=y -+CONFIG_CMD_FAT=y -+CONFIG_CMD_FDT=y -+CONFIG_CMD_FS_GENERIC=y -+CONFIG_CMD_FS_UUID=y ++CONFIG_CMD_ENV_FLAGS=y ++CONFIG_CMD_STRINGS=y CONFIG_CMD_CLK=y CONFIG_CMD_DM=y CONFIG_CMD_GPIO=y -+CONFIG_CMD_GPT=y -+CONFIG_CMD_HASH=y -+CONFIG_CMD_ITEST=y -+CONFIG_CMD_LED=y -+CONFIG_CMD_LICENSE=y -+CONFIG_CMD_LINK_LOCAL=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_MTD=y -+CONFIG_CMD_NAND=y -+CONFIG_CMD_NAND_TRIMFFS=y -+CONFIG_CMD_PCI=y -+CONFIG_CMD_PSTORE=y -+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 -+CONFIG_CMD_SF_TEST=y -+CONFIG_CMD_PING=y -+CONFIG_CMD_PXE=y CONFIG_CMD_PWM=y ++CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_MTD=y - CONFIG_CMD_PING=y -+CONFIG_CMD_SF=y - CONFIG_CMD_SMC=y -+CONFIG_CMD_TFTPBOOT=y +-CONFIG_CMD_PING=y ++CONFIG_CMD_PCI=y ++CONFIG_CMD_USB=y +CONFIG_CMD_TFTPSRV=y -+CONFIG_CMD_UBI=y -+CONFIG_CMD_UBI_RENAME=y -+CONFIG_CMD_UBIFS=y -+CONFIG_CMD_ASKENV=y -+CONFIG_CMD_PART=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_SETEXPR=y -+CONFIG_CMD_SLEEP=y ++CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_SOURCE=y -+CONFIG_CMD_STRINGS=y -+CONFIG_CMD_USB=y ++CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_CACHE=y ++CONFIG_CMD_PSTORE=y ++CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 +CONFIG_CMD_UUID=y -+CONFIG_DISPLAY_CPUINFO=y -+CONFIG_DM_MMC=y -+CONFIG_DM_MTD=y -+CONFIG_DM_REGULATOR=y -+CONFIG_DM_REGULATOR_FIXED=y -+CONFIG_DM_REGULATOR_GPIO=y -+CONFIG_DM_USB=y -+CONFIG_DM_PWM=y -+CONFIG_PWM_MTK=y -+CONFIG_HUSH_PARSER=y ++CONFIG_CMD_HASH=y + CONFIG_CMD_SMC=y +-CONFIG_DOS_PARTITION=y +-CONFIG_EFI_PARTITION=y ++CONFIG_CMD_FS_UUID=y ++CONFIG_CMD_UBI=y ++CONFIG_CMD_UBI_RENAME=y + CONFIG_PARTITION_TYPE_GUID=y ++CONFIG_OF_EMBED=y ++CONFIG_ENV_OVERWRITE=y ++CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_PARTITION_UUIDS=y +CONFIG_NETCONSOLE=y -+CONFIG_DM_GPIO=y -+CONFIG_DM_SCSI=y -+CONFIG_PHY=y -+CONFIG_PHY_MTK_TPHY=y -+CONFIG_PCI=y -+CONFIG_MTD=y + CONFIG_USE_IPADDR=y + CONFIG_IPADDR="192.168.1.1" + CONFIG_USE_NETMASK=y +@@ -44,21 +83,32 @@ CONFIG_USE_SERVERIP=y + CONFIG_SERVERIP="192.168.1.2" + CONFIG_PROT_TCP=y + CONFIG_NET_RANDOM_ETHADDR=y +-CONFIG_REGMAP=y +-CONFIG_SYSCON=y ++CONFIG_BUTTON=y ++CONFIG_BUTTON_GPIO=y + CONFIG_CLK=y ++CONFIG_GPIO_HOG=y ++CONFIG_LED=y ++CONFIG_LED_BLINK=y ++CONFIG_LED_GPIO=y + CONFIG_MMC_HS200_SUPPORT=y + CONFIG_MMC_MTK=y + CONFIG_MTD=y + CONFIG_DM_MTD=y + CONFIG_MTD_SPI_NAND=y +CONFIG_MTD_UBI_FASTMAP=y -+# CONFIG_MTD_RAW_NAND is not set -+CONFIG_DM_PCI=y + CONFIG_PHY_FIXED=y + CONFIG_MEDIATEK_ETH=y +CONFIG_PCIE_MEDIATEK=y -+CONFIG_PINCTRL_MT7988=y -+CONFIG_PRE_CONSOLE_BUFFER=y -+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 -+CONFIG_RAM=y -+CONFIG_DM_SERIAL=y -+CONFIG_MTK_SERIAL=y -+CONFIG_SPI=y -+CONFIG_DM_SPI=y -+CONFIG_MTK_SPI_NAND=y -+CONFIG_MTK_SPI_NAND_MTD=y -+CONFIG_SYSRESET_WATCHDOG=y -+CONFIG_WDT_MTK=y -+CONFIG_LZO=y -+CONFIG_ZSTD=y -+CONFIG_HEXDUMP=y -+CONFIG_RANDOM_UUID=y -+CONFIG_REGEX=y ++CONFIG_PHY=y ++CONFIG_PHY_MTK_TPHY=y + CONFIG_PINCTRL=y + CONFIG_PINCONF=y + CONFIG_PINCTRL_MT7988=y + CONFIG_POWER_DOMAIN=y + CONFIG_MTK_POWER_DOMAIN=y ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DM_REGULATOR_GPIO=y + CONFIG_DM_PWM=y + CONFIG_PWM_MTK=y + CONFIG_RAM=y +@@ -67,5 +117,8 @@ CONFIG_MTK_SERIAL=y + CONFIG_SPI=y + CONFIG_DM_SPI=y + CONFIG_MTK_SPIM=y +-CONFIG_LZO=y +CONFIG_USB=y -+CONFIG_USB_HOST=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_MTK=y -+CONFIG_USB_STORAGE=y -+CONFIG_OF_EMBED=y -+CONFIG_ENV_OVERWRITE=y -+CONFIG_ENV_IS_IN_MMC=y -+CONFIG_ENV_OFFSET=0x400000 -+CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_ENV_SIZE=0x40000 -+CONFIG_ENV_SIZE_REDUND=0x40000 - CONFIG_DOS_PARTITION=y - CONFIG_EFI_PARTITION=y - CONFIG_PARTITION_TYPE_GUID=y -@@ -46,6 +166,9 @@ CONFIG_PROT_TCP=y - CONFIG_REGMAP=y - CONFIG_SYSCON=y - CONFIG_CLK=y -+CONFIG_MMC=y -+CONFIG_MMC_DEFAULT_DEV=1 -+CONFIG_MMC_SUPPORTS_TUNING=y - CONFIG_MMC_HS200_SUPPORT=y - CONFIG_MMC_MTK=y - CONFIG_MTD=y ++CONFIG_ZSTD=y + CONFIG_HEXDUMP=y --- a/configs/mt7988_rfb_defconfig +++ b/configs/mt7988_rfb_defconfig -@@ -11,7 +11,23 @@ CONFIG_DEBUG_UART_BASE=0x11000000 +@@ -6,36 +6,76 @@ CONFIG_TEXT_BASE=0x41e00000 + CONFIG_SYS_MALLOC_F_LEN=0x4000 + CONFIG_NR_DRAM_BANKS=1 + CONFIG_DEFAULT_DEVICE_TREE="mt7988-rfb" ++CONFIG_OF_LIBFDT_OVERLAY=y + CONFIG_TARGET_MT7988=y + CONFIG_SYS_LOAD_ADDR=0x44000000 ++CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 + CONFIG_DEBUG_UART_BASE=0x11000000 CONFIG_DEBUG_UART_CLOCK=40000000 - CONFIG_SYS_LOAD_ADDR=0x46000000 ++CONFIG_PCI=y CONFIG_DEBUG_UART=y + # CONFIG_EFI_LOADER is not set -# CONFIG_AUTOBOOT is not set -+CONFIG_OF_LIBFDT_OVERLAY=y -+CONFIG_SMBIOS_PRODUCT_NAME="" -+CONFIG_CFB_CONSOLE_ANSI=y -+CONFIG_BOARD_LATE_INIT=y -+CONFIG_BUTTON=y -+CONFIG_BUTTON_GPIO=y -+CONFIG_GPIO_HOG=y -+CONFIG_CMD_ENV_FLAGS=y +CONFIG_FIT=y -+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y -+CONFIG_LED=y -+CONFIG_LED_BLINK=y -+CONFIG_LED_GPIO=y -+CONFIG_SPI_BOOT=y -+CONFIG_SD_BOOT=y -+CONFIG_BOOTSTD_DEFAULTS=y +CONFIG_BOOTSTD_FULL=y ++CONFIG_SD_BOOT=y ++CONFIG_SPI_BOOT=y ++CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="mt7988-rfb" CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 -@@ -22,15 +38,120 @@ CONFIG_SYS_PROMPT="MT7988> " + CONFIG_LOGLEVEL=7 ++CONFIG_PRE_CONSOLE_BUFFER=y + CONFIG_LOG=y ++CONFIG_BOARD_LATE_INIT=y + CONFIG_SYS_PROMPT="MT7988> " ++CONFIG_CMD_CPU=y ++CONFIG_CMD_LICENSE=y + # CONFIG_BOOTM_NETBSD is not set # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set -# CONFIG_CMD_ELF is not set +CONFIG_CMD_BOOTMENU=y -+CONFIG_CMD_BOOTP=y -+CONFIG_CMD_BUTTON=y -+CONFIG_CMD_CACHE=y -+CONFIG_CMD_CDP=y -+CONFIG_CMD_CPU=y -+CONFIG_CMD_DHCP=y -+CONFIG_CMD_DM=y -+CONFIG_CMD_ELF=y -+CONFIG_CMD_DNS=y -+CONFIG_CMD_ECHO=y -+CONFIG_CMD_ENV_READMEM=y ++CONFIG_CMD_ASKENV=y +CONFIG_CMD_ERASEENV=y -+CONFIG_CMD_EXT4=y -+CONFIG_CMD_FAT=y -+CONFIG_CMD_FDT=y -+CONFIG_CMD_FS_GENERIC=y -+CONFIG_CMD_FS_UUID=y ++CONFIG_CMD_ENV_FLAGS=y ++CONFIG_CMD_STRINGS=y CONFIG_CMD_CLK=y CONFIG_CMD_DM=y CONFIG_CMD_GPIO=y -+CONFIG_CMD_GPT=y -+CONFIG_CMD_HASH=y -+CONFIG_CMD_ITEST=y -+CONFIG_CMD_LED=y -+CONFIG_CMD_LICENSE=y -+CONFIG_CMD_LINK_LOCAL=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_MTD=y -+CONFIG_CMD_NAND=y -+CONFIG_CMD_NAND_TRIMFFS=y -+CONFIG_CMD_PCI=y -+CONFIG_CMD_PSTORE=y -+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 -+CONFIG_CMD_SF_TEST=y -+CONFIG_CMD_PING=y -+CONFIG_CMD_PXE=y CONFIG_CMD_PWM=y ++CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_MTD=y - CONFIG_CMD_PING=y -+CONFIG_CMD_SF=y - CONFIG_CMD_SMC=y -+CONFIG_CMD_TFTPBOOT=y +-CONFIG_CMD_PING=y ++CONFIG_CMD_PCI=y ++CONFIG_CMD_SF_TEST=y ++CONFIG_CMD_USB=y +CONFIG_CMD_TFTPSRV=y -+CONFIG_CMD_UBI=y -+CONFIG_CMD_UBI_RENAME=y -+CONFIG_CMD_UBIFS=y -+CONFIG_CMD_ASKENV=y -+CONFIG_CMD_PART=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_SETEXPR=y -+CONFIG_CMD_SLEEP=y ++CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_SOURCE=y -+CONFIG_CMD_STRINGS=y -+CONFIG_CMD_USB=y ++CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_CACHE=y ++CONFIG_CMD_PSTORE=y ++CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 +CONFIG_CMD_UUID=y -+CONFIG_DISPLAY_CPUINFO=y -+CONFIG_DM_MMC=y -+CONFIG_DM_MTD=y -+CONFIG_DM_REGULATOR=y -+CONFIG_DM_REGULATOR_FIXED=y -+CONFIG_DM_REGULATOR_GPIO=y -+CONFIG_DM_USB=y -+CONFIG_DM_PWM=y -+CONFIG_PWM_MTK=y -+CONFIG_HUSH_PARSER=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_VERSION_VARIABLE=y -+CONFIG_PARTITION_UUIDS=y -+CONFIG_NETCONSOLE=y -+CONFIG_DM_GPIO=y -+CONFIG_DM_SCSI=y -+CONFIG_PHY=y -+CONFIG_PHY_MTK_TPHY=y -+CONFIG_PCI=y -+CONFIG_MTD=y -+CONFIG_MTD_UBI_FASTMAP=y -+# CONFIG_MTD_RAW_NAND is not set -+CONFIG_DM_PCI=y -+CONFIG_PCIE_MEDIATEK=y -+CONFIG_PINCTRL_MT7988=y -+CONFIG_PRE_CONSOLE_BUFFER=y -+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 -+CONFIG_RAM=y -+CONFIG_DM_SERIAL=y -+CONFIG_MTK_SERIAL=y -+CONFIG_SPI=y -+CONFIG_DM_SPI=y -+CONFIG_MTK_SPI_NAND=y -+CONFIG_MTK_SPI_NAND_MTD=y -+CONFIG_SYSRESET_WATCHDOG=y -+CONFIG_WDT_MTK=y -+CONFIG_LZO=y -+CONFIG_ZSTD=y -+CONFIG_HEXDUMP=y -+CONFIG_RANDOM_UUID=y -+CONFIG_REGEX=y -+CONFIG_USB=y -+CONFIG_USB_HOST=y -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_XHCI_MTK=y -+CONFIG_USB_STORAGE=y ++CONFIG_CMD_HASH=y + CONFIG_CMD_SMC=y +-CONFIG_DOS_PARTITION=y +-CONFIG_EFI_PARTITION=y ++CONFIG_CMD_FS_UUID=y ++CONFIG_CMD_UBI=y ++CONFIG_CMD_UBI_RENAME=y + CONFIG_PARTITION_TYPE_GUID=y +CONFIG_OF_EMBED=y -+CONFIG_OF_SYSTEM_SETUP=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_ENV_UBI_PART="ubi" -+CONFIG_ENV_SIZE=0x1f000 -+CONFIG_ENV_SIZE_REDUND=0x1f000 +CONFIG_ENV_UBI_VOLUME="ubootenv" +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" - CONFIG_DOS_PARTITION=y - CONFIG_EFI_PARTITION=y - CONFIG_PARTITION_TYPE_GUID=y -@@ -46,6 +167,9 @@ CONFIG_PROT_TCP=y - CONFIG_REGMAP=y - CONFIG_SYSCON=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y ++CONFIG_VERSION_VARIABLE=y ++CONFIG_NETCONSOLE=y + CONFIG_USE_IPADDR=y + CONFIG_IPADDR="192.168.1.1" + CONFIG_USE_NETMASK=y +@@ -44,9 +84,13 @@ CONFIG_USE_SERVERIP=y + CONFIG_SERVERIP="192.168.1.2" + CONFIG_PROT_TCP=y + CONFIG_NET_RANDOM_ETHADDR=y +-CONFIG_REGMAP=y +-CONFIG_SYSCON=y ++CONFIG_BUTTON=y ++CONFIG_BUTTON_GPIO=y CONFIG_CLK=y -+CONFIG_MMC=y -+CONFIG_MMC_DEFAULT_DEV=1 -+CONFIG_MMC_SUPPORTS_TUNING=y ++CONFIG_GPIO_HOG=y ++CONFIG_LED=y ++CONFIG_LED_BLINK=y ++CONFIG_LED_GPIO=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_MMC_MTK=y CONFIG_MTD=y +@@ -64,13 +108,20 @@ CONFIG_SPI_FLASH_WINBOND=y + CONFIG_SPI_FLASH_XMC=y + CONFIG_SPI_FLASH_XTX=y + CONFIG_SPI_FLASH_MTD=y ++CONFIG_MTD_UBI_FASTMAP=y + CONFIG_PHY_FIXED=y + CONFIG_MEDIATEK_ETH=y ++CONFIG_PCIE_MEDIATEK=y ++CONFIG_PHY=y ++CONFIG_PHY_MTK_TPHY=y + CONFIG_PINCTRL=y + CONFIG_PINCONF=y + CONFIG_PINCTRL_MT7988=y + CONFIG_POWER_DOMAIN=y + CONFIG_MTK_POWER_DOMAIN=y ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DM_REGULATOR_GPIO=y + CONFIG_DM_PWM=y + CONFIG_PWM_MTK=y + CONFIG_RAM=y +@@ -79,5 +130,8 @@ CONFIG_MTK_SERIAL=y + CONFIG_SPI=y + CONFIG_DM_SPI=y + CONFIG_MTK_SPIM=y +-CONFIG_LZO=y ++CONFIG_USB=y ++CONFIG_USB_XHCI_HCD=y ++CONFIG_USB_XHCI_MTK=y ++CONFIG_ZSTD=y + CONFIG_HEXDUMP=y --- a/arch/arm/dts/mt7988-rfb.dts +++ b/arch/arm/dts/mt7988-rfb.dts @@ -144,6 +144,23 @@ diff --git a/package/boot/uboot-mediatek/patches/106-configs-sync-mt7981-rfb-storage.patch b/package/boot/uboot-mediatek/patches/106-configs-sync-mt7981-rfb-storage.patch index 3a3f8d0e1e..67bf1955c2 100644 --- a/package/boot/uboot-mediatek/patches/106-configs-sync-mt7981-rfb-storage.patch +++ b/package/boot/uboot-mediatek/patches/106-configs-sync-mt7981-rfb-storage.patch @@ -1,6 +1,6 @@ --- a/configs/mt7981_rfb_defconfig +++ b/configs/mt7981_rfb_defconfig -@@ -30,6 +30,9 @@ CONFIG_CMD_MTD=y +@@ -31,6 +31,9 @@ CONFIG_CMD_MTD=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_PING=y CONFIG_CMD_SMC=y diff --git a/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch b/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch index 4f5ef91d35..20c618e065 100644 --- a/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch +++ b/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch @@ -1,9 +1,9 @@ --- a/configs/mt7981_emmc_rfb_defconfig +++ b/configs/mt7981_emmc_rfb_defconfig -@@ -13,7 +13,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000 +@@ -14,7 +14,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 - CONFIG_SYS_LOAD_ADDR=0x46000000 CONFIG_DEBUG_UART=y + # CONFIG_EFI_LOADER is not set -# CONFIG_AUTOBOOT is not set +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_SMBIOS_PRODUCT_NAME="" @@ -24,7 +24,7 @@ CONFIG_DEFAULT_FDT_FILE="mt7981-emmc-rfb" CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 -@@ -24,9 +39,23 @@ CONFIG_SYS_PROMPT="MT7981> " +@@ -25,9 +40,23 @@ CONFIG_SYS_PROMPT="MT7981> " # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set @@ -49,7 +49,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_GPT_RENAME=y -@@ -36,13 +65,35 @@ CONFIG_CMD_PART=y +@@ -37,13 +66,35 @@ CONFIG_CMD_PART=y CONFIG_CMD_READ=y CONFIG_CMD_PING=y CONFIG_CMD_SMC=y @@ -87,10 +87,10 @@ CONFIG_CLK=y --- a/configs/mt7981_rfb_defconfig +++ b/configs/mt7981_rfb_defconfig -@@ -11,7 +11,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000 +@@ -12,7 +12,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 - CONFIG_SYS_LOAD_ADDR=0x46000000 CONFIG_DEBUG_UART=y + # CONFIG_EFI_LOADER is not set -# CONFIG_AUTOBOOT is not set +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_SMBIOS_PRODUCT_NAME="" @@ -111,7 +111,7 @@ CONFIG_DEFAULT_FDT_FILE="mt7981-rfb" CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 -@@ -22,23 +37,74 @@ CONFIG_SYS_PROMPT="MT7981> " +@@ -23,23 +38,74 @@ CONFIG_SYS_PROMPT="MT7981> " # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set @@ -190,10 +190,10 @@ CONFIG_MTD_SPI_NAND=y --- a/configs/mt7981_sd_rfb_defconfig +++ b/configs/mt7981_sd_rfb_defconfig -@@ -13,7 +13,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000 +@@ -14,7 +14,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000 CONFIG_DEBUG_UART_CLOCK=40000000 - CONFIG_SYS_LOAD_ADDR=0x46000000 CONFIG_DEBUG_UART=y + # CONFIG_EFI_LOADER is not set -# CONFIG_AUTOBOOT is not set +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_SMBIOS_PRODUCT_NAME="" @@ -214,7 +214,7 @@ CONFIG_DEFAULT_FDT_FILE="mt7981-sd-rfb" CONFIG_SYS_CBSIZE=512 CONFIG_SYS_PBSIZE=1049 -@@ -24,9 +39,23 @@ CONFIG_SYS_PROMPT="MT7981> " +@@ -25,9 +40,23 @@ CONFIG_SYS_PROMPT="MT7981> " # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set @@ -239,7 +239,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_GPT_RENAME=y -@@ -36,13 +65,35 @@ CONFIG_CMD_PART=y +@@ -37,13 +66,35 @@ CONFIG_CMD_PART=y CONFIG_CMD_READ=y CONFIG_CMD_PING=y CONFIG_CMD_SMC=y diff --git a/package/boot/uboot-mediatek/patches/120-use-xz-instead-of-lzma.patch b/package/boot/uboot-mediatek/patches/120-use-xz-instead-of-lzma.patch index 5aadeaca0c..6929453250 100644 --- a/package/boot/uboot-mediatek/patches/120-use-xz-instead-of-lzma.patch +++ b/package/boot/uboot-mediatek/patches/120-use-xz-instead-of-lzma.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -1085,7 +1085,7 @@ quiet_cmd_pad_cat = CAT $@ +@@ -1094,7 +1094,7 @@ quiet_cmd_pad_cat = CAT $@ cmd_pad_cat = $(cmd_objcopy) && $(append) || { rm -f $@; false; } quiet_cmd_lzma = LZMA $@ diff --git a/package/boot/uboot-mediatek/patches/200-cmd-add-imsz-and-imszb.patch b/package/boot/uboot-mediatek/patches/200-cmd-add-imsz-and-imszb.patch index 81c24543e2..082f99b767 100644 --- a/package/boot/uboot-mediatek/patches/200-cmd-add-imsz-and-imszb.patch +++ b/package/boot/uboot-mediatek/patches/200-cmd-add-imsz-and-imszb.patch @@ -70,7 +70,7 @@ { --- a/boot/image-fit.c +++ b/boot/image-fit.c -@@ -2046,6 +2046,47 @@ static const char *fit_get_image_type_pr +@@ -2047,6 +2047,47 @@ static const char *fit_get_image_type_pr return "unknown"; } @@ -120,7 +120,7 @@ int arch, int ph_type, int bootstage_id, --- a/include/image.h +++ b/include/image.h -@@ -1124,6 +1124,7 @@ int fit_parse_subimage(const char *spec, +@@ -1112,6 +1112,7 @@ int fit_parse_subimage(const char *spec, ulong *addr, const char **image_name); int fit_get_subimage_count(const void *fit, int images_noffset); diff --git a/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch b/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch index 58f7d316a6..85d65ab48b 100644 --- a/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch +++ b/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch @@ -1,6 +1,6 @@ --- a/cmd/Kconfig +++ b/cmd/Kconfig -@@ -683,6 +683,12 @@ config CMD_ENV_EXISTS +@@ -692,6 +692,12 @@ config CMD_ENV_EXISTS Check if a variable is defined in the environment for use in shell scripting. @@ -15,7 +15,7 @@ help --- a/cmd/nvedit.c +++ b/cmd/nvedit.c -@@ -273,6 +273,60 @@ int do_env_ask(struct cmd_tbl *cmdtp, in +@@ -273,6 +273,60 @@ static int do_env_ask(struct cmd_tbl *cm } #endif diff --git a/package/boot/uboot-mediatek/patches/280-image-fdt-save-name-of-FIT-configuration-in-chosen-node.patch b/package/boot/uboot-mediatek/patches/280-image-fdt-save-name-of-FIT-configuration-in-chosen-node.patch index 419ee4adb8..c2ecbb2c33 100644 --- a/package/boot/uboot-mediatek/patches/280-image-fdt-save-name-of-FIT-configuration-in-chosen-node.patch +++ b/package/boot/uboot-mediatek/patches/280-image-fdt-save-name-of-FIT-configuration-in-chosen-node.patch @@ -16,7 +16,7 @@ Reviewed-by: Tom Rini --- a/boot/image-fdt.c +++ b/boot/image-fdt.c -@@ -617,6 +617,12 @@ int image_setup_libfdt(struct bootm_head +@@ -612,6 +612,12 @@ int image_setup_libfdt(struct bootm_head images->fit_uname_cfg, strlen(images->fit_uname_cfg) + 1, 1); diff --git a/package/boot/uboot-mediatek/patches/290-mt7981-add-USB-nodes.patch b/package/boot/uboot-mediatek/patches/290-mt7981-add-USB-nodes.patch index cb1648f5e8..b6dde70d6d 100644 --- a/package/boot/uboot-mediatek/patches/290-mt7981-add-USB-nodes.patch +++ b/package/boot/uboot-mediatek/patches/290-mt7981-add-USB-nodes.patch @@ -18,7 +18,7 @@ Signed-off-by: John Crispin #include #include #include -@@ -342,4 +343,50 @@ +@@ -340,4 +341,50 @@ status = "disabled"; }; @@ -31,11 +31,11 @@ Signed-off-by: John Crispin + interrupts = ; + phys = <&u2port0 PHY_TYPE_USB2>, + <&u3port0 PHY_TYPE_USB3>; -+ clocks = <&infracfg_ao CK_INFRA_IUSB_SYS_CK>, -+ <&infracfg_ao CK_INFRA_IUSB_CK>, -+ <&infracfg_ao CK_INFRA_IUSB_133_CK>, -+ <&infracfg_ao CK_INFRA_IUSB_66M_CK>, -+ <&topckgen CK_TOP_U2U3_XHCI_SEL>; ++ clocks = <&infracfg CLK_INFRA_IUSB_SYS_CK>, ++ <&infracfg CLK_INFRA_IUSB_CK>, ++ <&infracfg CLK_INFRA_IUSB_133_CK>, ++ <&infracfg CLK_INFRA_IUSB_66M_CK>, ++ <&topckgen CLK_TOP_U2U3_XHCI_SEL>; + clock-names = "sys_ck", + "ref_ck", + "mcu_ck", @@ -54,7 +54,7 @@ Signed-off-by: John Crispin + + u2port0: usb-phy@11e10000 { + reg = <0x11e10000 0x700>; -+ clocks = <&topckgen CK_TOP_USB_FRMCNT_SEL>; ++ clocks = <&topckgen CLK_TOP_USB_FRMCNT_SEL>; + clock-names = "ref"; + #phy-cells = <1>; + status = "okay"; @@ -62,7 +62,7 @@ Signed-off-by: John Crispin + + u3port0: usb-phy@11e10700 { + reg = <0x11e10700 0x900>; -+ clocks = <&topckgen CK_TOP_USB3_PHY_SEL>; ++ clocks = <&topckgen CLK_TOP_USB3_PHY_SEL>; + clock-names = "ref"; + #phy-cells = <1>; + status = "okay"; diff --git a/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch b/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch index 8c13a70468..0d515384b7 100644 --- a/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch +++ b/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch @@ -67,10 +67,10 @@ +} --- a/configs/mt7981_emmc_rfb_defconfig +++ b/configs/mt7981_emmc_rfb_defconfig -@@ -114,3 +114,4 @@ CONFIG_FAT_WRITE=y +@@ -113,3 +113,4 @@ CONFIG_DM_SERIAL=y + CONFIG_MTK_SERIAL=y + CONFIG_FAT_WRITE=y CONFIG_HEXDUMP=y - # CONFIG_EFI_LOADER is not set - CONFIG_LMB_MAX_REGIONS=64 +CONFIG_OF_SYSTEM_SETUP=y --- a/configs/mt7981_nor_rfb_defconfig +++ b/configs/mt7981_nor_rfb_defconfig @@ -81,17 +81,17 @@ +CONFIG_OF_SYSTEM_SETUP=y --- a/configs/mt7981_rfb_defconfig +++ b/configs/mt7981_rfb_defconfig -@@ -135,3 +135,4 @@ CONFIG_MTK_SPIM=y +@@ -134,3 +134,4 @@ CONFIG_SPI=y + CONFIG_DM_SPI=y + CONFIG_MTK_SPIM=y CONFIG_HEXDUMP=y - # CONFIG_EFI_LOADER is not set - CONFIG_LMB_MAX_REGIONS=64 +CONFIG_OF_SYSTEM_SETUP=y --- a/configs/mt7981_sd_rfb_defconfig +++ b/configs/mt7981_sd_rfb_defconfig -@@ -114,3 +114,4 @@ CONFIG_FAT_WRITE=y +@@ -113,3 +113,4 @@ CONFIG_DM_SERIAL=y + CONFIG_MTK_SERIAL=y + CONFIG_FAT_WRITE=y CONFIG_HEXDUMP=y - # CONFIG_EFI_LOADER is not set - CONFIG_LMB_MAX_REGIONS=64 +CONFIG_OF_SYSTEM_SETUP=y --- a/configs/mt7981_snfi_nand_rfb_defconfig +++ b/configs/mt7981_snfi_nand_rfb_defconfig diff --git a/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch b/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch index c7d82012d8..d425361809 100644 --- a/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch +++ b/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch @@ -1,6 +1,6 @@ --- a/configs/mt7623n_bpir2_defconfig +++ b/configs/mt7623n_bpir2_defconfig -@@ -7,52 +7,98 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 +@@ -7,34 +7,67 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x81ffff10 @@ -11,13 +11,14 @@ +CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_TARGET_MT7623=y +CONFIG_RESET_BUTTON_LABEL="factory" + CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_SYS_LOAD_ADDR=0x84000000 +CONFIG_PCI=y +CONFIG_AHCI=y + # CONFIG_EFI_GRUB_ARM32_WORKAROUND is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +# CONFIG_BOOTSTD is not set - CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 +CONFIG_AUTOBOOT_KEYED=y @@ -54,8 +55,8 @@ +CONFIG_CMD_RARP=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DNS=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_UUID=y +CONFIG_CMD_HASH=y @@ -67,12 +68,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r2_env" +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y - CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y CONFIG_USE_IPADDR=y CONFIG_IPADDR="192.168.1.1" CONFIG_USE_SERVERIP=y - CONFIG_SERVERIP="192.168.1.2" +@@ -42,18 +75,31 @@ CONFIG_SERVERIP="192.168.1.2" + CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SCSI_AHCI=y @@ -103,13 +104,12 @@ CONFIG_DM_SERIAL=y CONFIG_MTK_SERIAL=y CONFIG_SYSRESET=y -@@ -60,5 +106,6 @@ CONFIG_SYSRESET_WATCHDOG=y +@@ -61,4 +107,5 @@ CONFIG_SYSRESET_WATCHDOG=y CONFIG_TIMER=y CONFIG_MTK_TIMER=y CONFIG_WDT_MTK=y +CONFIG_RANDOM_UUID=y CONFIG_LZMA=y - # CONFIG_EFI_GRUB_ARM32_WORKAROUND is not set --- /dev/null +++ b/bananapi_bpi-r2_env @@ -0,0 +1,69 @@ diff --git a/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch b/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch index 1fb0ae9c9e..0523b0e521 100644 --- a/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch +++ b/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch @@ -1,6 +1,6 @@ --- a/configs/mt7623a_unielec_u7623_02_defconfig +++ b/configs/mt7623a_unielec_u7623_02_defconfig -@@ -7,51 +7,97 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 +@@ -7,32 +7,65 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x81ffff10 @@ -11,13 +11,13 @@ +CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_TARGET_MT7623=y +CONFIG_RESET_BUTTON_LABEL="factory" + CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_SYS_LOAD_ADDR=0x84000000 +CONFIG_PCI=y +CONFIG_AHCI=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +# CONFIG_BOOTSTD is not set - CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 +CONFIG_AUTOBOOT_KEYED=y @@ -53,8 +53,8 @@ +CONFIG_CMD_RARP=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DNS=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_UUID=y +CONFIG_CMD_HASH=y @@ -66,12 +66,12 @@ +CONFIG_DEFAULT_ENV_FILE="unielec_u7623-02_env" +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y - CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y CONFIG_USE_IPADDR=y CONFIG_IPADDR="192.168.1.1" CONFIG_USE_SERVERIP=y - CONFIG_SERVERIP="192.168.1.2" +@@ -40,18 +73,31 @@ CONFIG_SERVERIP="192.168.1.2" + CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SCSI_AHCI=y diff --git a/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch b/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch index 25ebd5b582..eff8a0d2b0 100644 --- a/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch +++ b/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7622_bananapi_bpi-r64-sdmmc_defconfig -@@ -0,0 +1,130 @@ +@@ -0,0 +1,128 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -12,11 +12,11 @@ +CONFIG_ENV_OFFSET=0x400000 +CONFIG_DEFAULT_DEVICE_TREE="mt7622-bananapi-bpi-r64" +CONFIG_OF_LIBFDT_OVERLAY=y ++CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=25000000 +CONFIG_ENV_OFFSET_REDUND=0x480000 -+CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -48,14 +48,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -78,14 +78,12 @@ +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -217,7 +215,7 @@ +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null +++ b/configs/mt7622_bananapi_bpi-r64-emmc_defconfig -@@ -0,0 +1,119 @@ +@@ -0,0 +1,117 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -229,11 +227,11 @@ +CONFIG_ENV_OFFSET=0x400000 +CONFIG_DEFAULT_DEVICE_TREE="mt7622-bananapi-bpi-r64" +CONFIG_OF_LIBFDT_OVERLAY=y ++CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=25000000 +CONFIG_ENV_OFFSET_REDUND=0x480000 -+CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -263,14 +261,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -290,14 +288,12 @@ +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -408,10 +404,10 @@ +CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_DEVICE_TREE="mt7622-bananapi-bpi-r64" +CONFIG_OF_LIBFDT_OVERLAY=y ++CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=25000000 -+CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_FIT=y @@ -443,8 +439,8 @@ +CONFIG_CMD_RARP=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DNS=y +CONFIG_CMD_EFIDEBUG=y +CONFIG_CMD_PSTORE=y +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 @@ -465,12 +461,12 @@ +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.3" ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_BUTTON=y diff --git a/package/boot/uboot-mediatek/patches/407-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch b/package/boot/uboot-mediatek/patches/407-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch new file mode 100644 index 0000000000..395b4494af --- /dev/null +++ b/package/boot/uboot-mediatek/patches/407-mtk-20-configs-mt7622-enable-environment-for-mt7622_rfb.patch @@ -0,0 +1,33 @@ +From 93d7086edb0db4b05149dfea21a2a82d8f160944 Mon Sep 17 00:00:00 2001 +From: Weijie Gao +Date: Sat, 6 Mar 2021 16:29:33 +0800 +Subject: [PATCH 10/12] configs: mt7622: enable environment for mt7622_rfb + +Enable environment vairables for mt7622_rfb + +Signed-off-by: Weijie Gao +--- + configs/mt7622_rfb_defconfig | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/configs/mt7622_rfb_defconfig ++++ b/configs/mt7622_rfb_defconfig +@@ -6,6 +6,8 @@ CONFIG_TEXT_BASE=0x41e00000 + CONFIG_SYS_MALLOC_F_LEN=0x4000 + CONFIG_NR_DRAM_BANKS=1 + CONFIG_DEFAULT_DEVICE_TREE="mt7622-rfb" ++CONFIG_ENV_SIZE=0x20000 ++CONFIG_ENV_OFFSET=0x280000 + CONFIG_SYS_LOAD_ADDR=0x4007ff28 + CONFIG_DEBUG_UART_BASE=0x11002000 + CONFIG_DEBUG_UART_CLOCK=25000000 +@@ -26,6 +28,9 @@ CONFIG_CMD_SF_TEST=y + CONFIG_CMD_PING=y + CONFIG_CMD_SMC=y + CONFIG_ENV_OVERWRITE=y ++CONFIG_ENV_IS_IN_MTD=y ++CONFIG_ENV_MTD_NAME="spi-nand0" ++CONFIG_ENV_SIZE_REDUND=0x40000 + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y + CONFIG_USE_IPADDR=y + CONFIG_IPADDR="192.168.1.1" diff --git a/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch b/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch index 8768879d94..5b1c352e16 100644 --- a/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch +++ b/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7622_linksys_e8450_defconfig -@@ -0,0 +1,112 @@ +@@ -0,0 +1,110 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -9,10 +9,10 @@ +CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_DEVICE_TREE="mt7622-linksys-e8450-ubi" ++CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=25000000 -+CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_FIT=y @@ -38,14 +38,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_PSTORE=y +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 @@ -75,8 +75,6 @@ +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y +CONFIG_BUTTON=y +CONFIG_BUTTON_GPIO=y +CONFIG_CLK=y @@ -332,7 +330,7 @@ +}; --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -1187,6 +1187,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ +@@ -1192,6 +1192,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt7622-rfb.dtb \ mt7623a-unielec-u7623-02-emmc.dtb \ mt7622-bananapi-bpi-r64.dtb \ diff --git a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch index e41562e90b..4aff24c933 100644 --- a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch +++ b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch @@ -11,10 +11,10 @@ +CONFIG_ENV_OFFSET=0xc0000 +CONFIG_DEFAULT_DEVICE_TREE="mt7622-ubnt-unifi-6-lr" +CONFIG_RESET_BUTTON_SETTLE_DELAY=400 ++CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=25000000 -+CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +# CONFIG_LEGACY_IMAGE_FORMAT is not set @@ -40,13 +40,13 @@ +CONFIG_CMD_GPIO=y +CONFIG_CMD_MTD=y +CONFIG_CMD_SF_TEST=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_PSTORE=y +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 @@ -127,10 +127,10 @@ +CONFIG_ENV_OFFSET=0xc0000 +CONFIG_DEFAULT_DEVICE_TREE="mt7622-ubnt-unifi-6-lr" +CONFIG_RESET_BUTTON_SETTLE_DELAY=400 ++CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=25000000 -+CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +# CONFIG_LEGACY_IMAGE_FORMAT is not set @@ -156,13 +156,13 @@ +CONFIG_CMD_GPIO=y +CONFIG_CMD_MTD=y +CONFIG_CMD_SF_TEST=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_PSTORE=y +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 @@ -243,10 +243,10 @@ +CONFIG_ENV_OFFSET=0xc0000 +CONFIG_DEFAULT_DEVICE_TREE="mt7622-ubnt-unifi-6-lr-v3" +CONFIG_RESET_BUTTON_SETTLE_DELAY=400 ++CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=25000000 -+CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +# CONFIG_LEGACY_IMAGE_FORMAT is not set @@ -272,13 +272,13 @@ +CONFIG_CMD_GPIO=y +CONFIG_CMD_MTD=y +CONFIG_CMD_SF_TEST=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_PSTORE=y +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 @@ -739,7 +739,7 @@ +}; --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -1188,6 +1188,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ +@@ -1193,6 +1193,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt7623a-unielec-u7623-02-emmc.dtb \ mt7622-bananapi-bpi-r64.dtb \ mt7622-linksys-e8450-ubi.dtb \ @@ -909,15 +909,15 @@ +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- a/common/board_r.c +++ b/common/board_r.c -@@ -66,6 +66,7 @@ +@@ -67,6 +67,7 @@ + #include #include - #include #include +#include DECLARE_GLOBAL_DATA_PTR; -@@ -396,6 +397,20 @@ static int initr_onenand(void) +@@ -405,6 +406,20 @@ static int initr_onenand(void) } #endif @@ -938,7 +938,7 @@ #ifdef CONFIG_MMC static int initr_mmc(void) { -@@ -680,6 +695,9 @@ static init_fnc_t init_sequence_r[] = { +@@ -711,6 +726,9 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_NMBM_MTD initr_nmbm, #endif diff --git a/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch b/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch index 046c0a6bb9..f117829316 100644 --- a/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch +++ b/package/boot/uboot-mediatek/patches/420-add-support-for-RAVPower-RP-WD009.patch @@ -161,11 +161,11 @@ Subject: [PATCH] add support for RAVPower RP-WD009 +CONFIG_MTDIDS_DEFAULT="nor0=spi0.0" +CONFIG_MTDPARTS_DEFAULT="spi0.0:192k(factory-uboot),64k(config),64k(factory),1536k(loader),64k(params),64k(user_backup),64k(user),14272k(firmware),64k(mode)" +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" ++CONFIG_NET_RANDOM_ETHADDR=y +# CONFIG_DM_DEVICE_REMOVE is not set +CONFIG_LED=y +CONFIG_LED_BLINK=y diff --git a/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch b/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch index 547849d369..3aed1e1864 100644 --- a/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch +++ b/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch @@ -16,10 +16,10 @@ +CONFIG_SPL_SYS_MALLOC_F_LEN=0x40000 +CONFIG_SPL_BSS_START_ADDR=0x80140000 +CONFIG_SPL_BSS_MAX_SIZE=0x80000 ++CONFIG_SYS_LOAD_ADDR=0x83000000 +CONFIG_SPL=y +CONFIG_DEBUG_UART_BASE=0xbe000c00 +CONFIG_DEBUG_UART_CLOCK=50000000 -+CONFIG_SYS_LOAD_ADDR=0x83000000 +CONFIG_ARCH_MTMIPS=y +CONFIG_SOC_MT7621=y +CONFIG_SYS_MIPS_TIMER_FREQ=440000000 @@ -171,7 +171,7 @@ + + reset { + label = "reset"; -+ gpios = <&gpio 18 GPIO_ACTIVE_LOW>; ++ gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + }; + }; + @@ -180,7 +180,7 @@ + + led_status: status { + label = "green:status"; -+ gpios = <&gpio 24 GPIO_ACTIVE_LOW>; ++ gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; + }; + }; +}; diff --git a/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch b/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch index 2164bf6d5c..da1fef32d2 100644 --- a/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch +++ b/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_netcore_n60_defconfig -@@ -0,0 +1,130 @@ +@@ -0,0 +1,127 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-netcore-n60" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -45,14 +45,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -78,14 +78,12 @@ +CONFIG_DEFAULT_ENV_FILE="netcore_n60_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -130,7 +128,6 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7986a-netcore-n60.dts @@ -0,0 +1,185 @@ diff --git a/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch b/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch index 17f628f852..514570184a 100644 --- a/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch +++ b/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986a_bpi-r3-emmc_defconfig -@@ -0,0 +1,139 @@ +@@ -0,0 +1,136 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -13,11 +13,11 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-emmc" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -51,14 +51,14 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -81,14 +81,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -139,10 +137,9 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7986a_bpi-r3-nor_defconfig -@@ -0,0 +1,139 @@ +@@ -0,0 +1,136 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -155,10 +152,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-emmc" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -192,14 +189,14 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -222,14 +219,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3_nor_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -281,10 +276,9 @@ +CONFIG_LZO=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7986a_bpi-r3-sd_defconfig -@@ -0,0 +1,139 @@ +@@ -0,0 +1,136 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -297,11 +291,11 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-sd" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -335,14 +329,14 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -365,14 +359,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3_sdmmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -423,10 +415,9 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7986a_bpi-r3-snand_defconfig -@@ -0,0 +1,134 @@ +@@ -0,0 +1,131 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -437,10 +428,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-emmc" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -473,14 +464,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -506,14 +497,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -560,7 +549,6 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/bananapi_bpi-r3_sdmmc_env @@ -0,0 +1,81 @@ diff --git a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch index 324d7a9c21..d152737fb5 100644 --- a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch +++ b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_xiaomi_redmi-ax6000_defconfig -@@ -0,0 +1,104 @@ +@@ -0,0 +1,103 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-xiaomi_redmi-ax6000" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_BOOTDELAY=30 @@ -37,14 +37,14 @@ +CONFIG_CMD_DM=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_MTD=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -66,12 +66,12 @@ +CONFIG_DEFAULT_ENV_FILE="xiaomi_redmi-ax6000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_BUTTON=y @@ -104,7 +104,6 @@ +CONFIG_RANDOM_UUID=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7986a-xiaomi_redmi-ax6000.dts @@ -0,0 +1,161 @@ diff --git a/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch b/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch index 76de156433..453de17475 100644 --- a/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch +++ b/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_tplink_tl-xdr4288_defconfig -@@ -0,0 +1,130 @@ +@@ -0,0 +1,127 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-tplink-tl-xdr608x" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -45,14 +45,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -78,14 +78,12 @@ +CONFIG_DEFAULT_ENV_FILE="tplink_tl-xdr4288_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -130,10 +128,9 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7986_tplink_tl-xdr6086_defconfig -@@ -0,0 +1,130 @@ +@@ -0,0 +1,127 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -144,10 +141,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-tplink-tl-xdr608x" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -178,14 +175,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -211,14 +208,12 @@ +CONFIG_DEFAULT_ENV_FILE="tplink_tl-xdr6086_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -263,10 +258,9 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7986_tplink_tl-xdr6088_defconfig -@@ -0,0 +1,130 @@ +@@ -0,0 +1,127 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -277,10 +271,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-tplink-tl-xdr608x" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -311,14 +305,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -344,14 +338,12 @@ +CONFIG_DEFAULT_ENV_FILE="tplink_tl-xdr6088_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -396,7 +388,6 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7986a-tplink-tl-xdr608x.dts @@ -0,0 +1,196 @@ diff --git a/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch b/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch index 26118cf857..73e492e5df 100644 --- a/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch +++ b/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_qihoo-360t7_defconfig -@@ -0,0 +1,125 @@ +@@ -0,0 +1,122 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981_qihoo-360t7" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -44,14 +44,14 @@ +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -77,14 +77,12 @@ +CONFIG_DEFAULT_ENV_FILE="qihoo-360t7_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -125,7 +123,6 @@ +CONFIG_MTK_SPIM=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7981_qihoo-360t7.dts @@ -0,0 +1,185 @@ diff --git a/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch b/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch index e96af0bc1d..83ba6e78bf 100644 --- a/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch +++ b/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_xiaomi_mi-router-wr30u_defconfig -@@ -0,0 +1,125 @@ +@@ -0,0 +1,122 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981_xiaomi_mi-router-wr30u" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -44,14 +44,14 @@ +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -77,14 +77,12 @@ +CONFIG_DEFAULT_ENV_FILE="xiaomi_mi-router-wr30u_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -125,7 +123,6 @@ +CONFIG_MTK_SPIM=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7981_xiaomi_mi-router-wr30u.dts @@ -0,0 +1,221 @@ diff --git a/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch b/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch index 1392aa5647..234602efd3 100644 --- a/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch +++ b/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_h3c_magic-nx30-pro_defconfig -@@ -0,0 +1,125 @@ +@@ -0,0 +1,122 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981_h3c_magic-nx30-pro" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -44,14 +44,14 @@ +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -77,14 +77,12 @@ +CONFIG_DEFAULT_ENV_FILE="h3c_magic-nx30-pro_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -125,7 +123,6 @@ +CONFIG_MTK_SPIM=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7981_h3c_magic-nx30-pro.dts @@ -0,0 +1,205 @@ diff --git a/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch b/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch index d87d77a018..474200b792 100644 --- a/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch +++ b/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch @@ -138,7 +138,7 @@ +}; --- /dev/null +++ b/configs/mt7986a_glinet_gl-mt6000_defconfig -@@ -0,0 +1,106 @@ +@@ -0,0 +1,103 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -151,10 +151,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-glinet-gl-mt6000" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y +CONFIG_FIT=y @@ -182,14 +182,14 @@ +CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 @@ -204,14 +204,12 @@ +CONFIG_DEFAULT_ENV_FILE="glinet_gl-mt6000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_BUTTON=y +CONFIG_BUTTON_GPIO=y +CONFIG_CLK=y @@ -244,7 +242,6 @@ +CONFIG_USB_XHCI_MTK=y +CONFIG_USB_STORAGE=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/glinet_gl-mt6000_env @@ -0,0 +1,25 @@ diff --git a/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch b/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch index f056cbf377..d95a381236 100644 --- a/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch +++ b/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_cmcc_rax3000m-emmc_defconfig -@@ -0,0 +1,125 @@ +@@ -0,0 +1,122 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -13,11 +13,11 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981-cmcc-rax3000m-emmc" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -48,14 +48,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -76,14 +76,12 @@ +CONFIG_DEFAULT_ENV_FILE="cmcc_rax3000m-emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -125,10 +123,9 @@ +CONFIG_LZO=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7981_cmcc_rax3000m-nand_defconfig -@@ -0,0 +1,125 @@ +@@ -0,0 +1,122 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -139,10 +136,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981-cmcc-rax3000m-nand" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -172,14 +169,14 @@ +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -205,14 +202,12 @@ +CONFIG_DEFAULT_ENV_FILE="cmcc_rax3000m-nand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -253,7 +248,6 @@ +CONFIG_MTK_SPIM=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7981-cmcc-rax3000m.dtsi @@ -0,0 +1,85 @@ diff --git a/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch b/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch index f577858b10..1f4a4cb547 100644 --- a/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch +++ b/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_jcg_q30-pro_defconfig -@@ -0,0 +1,125 @@ +@@ -0,0 +1,122 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981_jcg_q30-pro" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -44,14 +44,14 @@ +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -77,14 +77,12 @@ +CONFIG_DEFAULT_ENV_FILE="jcg_q30-pro_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -125,7 +123,6 @@ +CONFIG_MTK_SPIM=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7981_jcg_q30-pro.dts @@ -0,0 +1,179 @@ diff --git a/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch b/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch index b131df79c8..419ab09239 100644 --- a/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch +++ b/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_zyxel_ex5601-t0_defconfig -@@ -0,0 +1,130 @@ +@@ -0,0 +1,127 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-zyxel_ex5601-t0" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -45,14 +45,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -78,14 +78,12 @@ +CONFIG_DEFAULT_ENV_FILE="zyxel_ex5601-t0_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -130,7 +128,6 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7986a-zyxel_ex5601-t0.dts @@ -0,0 +1,181 @@ diff --git a/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch b/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch index 35267bb6d5..3468c7d73a 100644 --- a/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch +++ b/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_xiaomi_mi-router-ax3000t_defconfig -@@ -0,0 +1,107 @@ +@@ -0,0 +1,106 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981_xiaomi_mi-router-ax3000t" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_BOOTDELAY=30 @@ -39,14 +39,14 @@ +CONFIG_CMD_GPT=y +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -68,12 +68,12 @@ +CONFIG_DEFAULT_ENV_FILE="xiaomi_mi-router-ax3000t_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_BUTTON=y @@ -107,7 +107,6 @@ +CONFIG_MTK_SPIM=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7981_xiaomi_mi-router-ax3000t.dts @@ -0,0 +1,187 @@ diff --git a/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch b/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch index 1da0553f23..03120ef051 100644 --- a/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch +++ b/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986a_jdcloud_re-cp-03_defconfig -@@ -0,0 +1,112 @@ +@@ -0,0 +1,109 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -13,11 +13,11 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-jdcloud_re-cp-03" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_BOOTDELAY=30 @@ -44,14 +44,14 @@ +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -72,14 +72,12 @@ +CONFIG_DEFAULT_ENV_FILE="jdcloud_re-cp-03_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_BUTTON=y +CONFIG_BUTTON_GPIO=y +CONFIG_CLK=y @@ -112,7 +110,6 @@ +CONFIG_MTK_SERIAL=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7986a-jdcloud_re-cp-03.dts @@ -0,0 +1,148 @@ diff --git a/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch b/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch index ad556b7d82..3f1629b358 100644 --- a/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch +++ b/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986a_bpi-r3-mini-emmc_defconfig -@@ -0,0 +1,146 @@ +@@ -0,0 +1,143 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -13,11 +13,11 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-mini" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -51,15 +51,15 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_MII=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_MII=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -82,14 +82,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3-mini_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -146,10 +144,9 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7986a_bpi-r3-mini-snand_defconfig -@@ -0,0 +1,140 @@ +@@ -0,0 +1,136 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -160,10 +157,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-mini" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -196,15 +193,15 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_MII=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_MII=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -230,13 +227,11 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3-mini_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -256,7 +251,6 @@ +CONFIG_MTD_UBI_FASTMAP=y +CONFIG_PHY_AIROHA=y +CONFIG_PHY_AIROHA_EN8811H=y -+CONFIG_PHY_AIROHA_FW_IN_UBI=y +CONFIG_PHY_ETHERNET_ID=y +CONFIG_PHY_FIXED=y +CONFIG_DM_MDIO=y @@ -289,7 +283,6 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/bananapi_bpi-r3-mini_snand_env @@ -0,0 +1,61 @@ diff --git a/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch b/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch index f802007fd9..892e4d4521 100644 --- a/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch +++ b/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_nokia_ea0326gmp_defconfig -@@ -0,0 +1,107 @@ +@@ -0,0 +1,106 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981-nokia-ea0326gmp" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_BOOTDELAY=30 @@ -39,14 +39,14 @@ +CONFIG_CMD_GPT=y +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -68,12 +68,12 @@ +CONFIG_DEFAULT_ENV_FILE="nokia_ea0326gmp_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_BUTTON=y @@ -107,7 +107,6 @@ +CONFIG_MTK_SPIM=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7981-nokia-ea0326gmp.dts @@ -0,0 +1,186 @@ diff --git a/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch b/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch index 162e502f1a..b6af71939e 100644 --- a/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch +++ b/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_abt_asr3000_defconfig -@@ -0,0 +1,107 @@ +@@ -0,0 +1,106 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981-abt-asr3000" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_BOOTDELAY=30 @@ -39,14 +39,14 @@ +CONFIG_CMD_GPT=y +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -68,12 +68,12 @@ +CONFIG_DEFAULT_ENV_FILE="abt_asr3000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_BUTTON=y @@ -107,7 +107,6 @@ +CONFIG_MTK_SPIM=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7981-abt-asr3000.dts @@ -0,0 +1,176 @@ diff --git a/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch b/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch index 1b1ac9262f..93fffc1d43 100644 --- a/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch +++ b/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-emmc_defconfig -@@ -0,0 +1,140 @@ +@@ -0,0 +1,137 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -13,11 +13,11 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7988a-bananapi-bpi-r4-emmc" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7988=y ++CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11000000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -53,14 +53,14 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -83,14 +83,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -140,10 +138,9 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-sdmmc_defconfig -@@ -0,0 +1,140 @@ +@@ -0,0 +1,137 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -156,11 +153,11 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7988a-bananapi-bpi-r4-sd" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7988=y ++CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11000000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -196,14 +193,14 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -226,14 +223,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4_sdmmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -283,10 +278,9 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-snand_defconfig -@@ -0,0 +1,140 @@ +@@ -0,0 +1,137 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -297,10 +291,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7988a-bananapi-bpi-r4-emmc" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7988=y ++CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11000000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -336,14 +330,14 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -369,14 +363,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -426,7 +418,6 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/bananapi_bpi-r4_sdmmc_env @@ -0,0 +1,66 @@ @@ -876,7 +867,7 @@ +}; --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-poe-emmc_defconfig -@@ -0,0 +1,140 @@ +@@ -0,0 +1,137 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -889,11 +880,11 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7988a-bananapi-bpi-r4-emmc" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7988=y ++CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11000000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -929,14 +920,14 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -959,14 +950,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4-poe_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -1016,10 +1005,9 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-poe-sdmmc_defconfig -@@ -0,0 +1,140 @@ +@@ -0,0 +1,137 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -1032,11 +1020,11 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7988a-bananapi-bpi-r4-sd" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7988=y ++CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11000000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -1072,14 +1060,14 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -1102,14 +1090,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4-poe_sdmmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -1159,10 +1145,9 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7988a_bananapi_bpi-r4-poe-snand_defconfig -@@ -0,0 +1,140 @@ +@@ -0,0 +1,137 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -1173,10 +1158,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7988a-bananapi-bpi-r4-emmc" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7988=y ++CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11000000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -1212,14 +1197,14 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -1245,14 +1230,12 @@ +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4-poe_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -1302,7 +1285,6 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/bananapi_bpi-r4-poe_emmc_env @@ -0,0 +1,57 @@ diff --git a/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch b/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch index 50ca34f406..9c26bbdad1 100644 --- a/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch +++ b/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_tplink_tl-xtr8488_defconfig -@@ -0,0 +1,130 @@ +@@ -0,0 +1,127 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986a-tplink-tl-xtr8488" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -45,14 +45,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -78,14 +78,12 @@ +CONFIG_DEFAULT_ENV_FILE="tplink_tl-xtr8488_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -130,7 +128,6 @@ +CONFIG_USB_STORAGE=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7986a-tplink-tl-xtr8488.dts @@ -0,0 +1,196 @@ diff --git a/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch b/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch index 003b20a0b7..5819181e2f 100644 --- a/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch +++ b/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch @@ -15,7 +15,7 @@ Subject: [PATCH] add xiaomi redmi ax6s --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -1190,6 +1190,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ +@@ -1195,6 +1195,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt7622-linksys-e8450-ubi.dtb \ mt7622-ubnt-unifi-6-lr.dtb \ mt7622-ubnt-unifi-6-lr-v3.dtb \ @@ -194,7 +194,7 @@ Subject: [PATCH] add xiaomi redmi ax6s +}; --- /dev/null +++ b/configs/mt7622_xiaomi_redmi-router-ax6s-ubi-loader_defconfig -@@ -0,0 +1,98 @@ +@@ -0,0 +1,97 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -203,10 +203,10 @@ Subject: [PATCH] add xiaomi redmi ax6s +CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_DEVICE_TREE="mt7622-xiaomi-redmi-router-ax6s" ++CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=25000000 -+CONFIG_SYS_LOAD_ADDR=0x40080000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_FIT=y @@ -217,7 +217,6 @@ Subject: [PATCH] add xiaomi redmi ax6s +CONFIG_PRE_CONSOLE_BUFFER=y +CONFIG_LOG=y +CONFIG_BOARD_LATE_INIT=y -+CONFIG_LAST_STAGE_INIT=y +CONFIG_HUSH_PARSER=y +# CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="MT7622> " @@ -250,12 +249,12 @@ Subject: [PATCH] add xiaomi redmi ax6s +CONFIG_VERSION_VARIABLE=y +CONFIG_PROT_UDP=y +CONFIG_BOOTP_SEND_HOSTNAME=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_BUTTON=y diff --git a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch index ed54cedbc3..a4a1b5ffe5 100644 --- a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch +++ b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch @@ -206,7 +206,7 @@ +}; --- /dev/null +++ b/configs/mt7981_openwrt-one-nor_defconfig -@@ -0,0 +1,128 @@ +@@ -0,0 +1,124 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -219,9 +219,9 @@ +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y +CONFIG_RESET_BUTTON_LABEL="back" ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_SPI_BOOT=y @@ -257,14 +257,14 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -285,8 +285,6 @@ +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NET_RANDOM_ETHADDR=y -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y +CONFIG_BUTTON=y +CONFIG_BUTTON_GPIO=y +CONFIG_CLK=y @@ -297,7 +295,6 @@ +# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_DM_MTD=y -+# CONFIG_MTD_RAW_NAND is not set +CONFIG_MTD_SPI_NAND=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y @@ -334,10 +331,9 @@ +CONFIG_USB_STORAGE=y +CONFIG_UBIFS_SILENCE_MSG=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7981_openwrt-one-spi-nand_defconfig -@@ -0,0 +1,129 @@ +@@ -0,0 +1,125 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -349,9 +345,9 @@ +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y +CONFIG_RESET_BUTTON_LABEL="back" ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_SPI_BOOT=y @@ -387,14 +383,14 @@ +CONFIG_CMD_PCI=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -419,8 +415,6 @@ +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NET_RANDOM_ETHADDR=y -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y +CONFIG_BUTTON=y +CONFIG_BUTTON_GPIO=y +CONFIG_CLK=y @@ -431,7 +425,6 @@ +# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_DM_MTD=y -+# CONFIG_MTD_RAW_NAND is not set +CONFIG_MTD_SPI_NAND=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y @@ -466,7 +459,6 @@ +CONFIG_USB_XHCI_MTK=y +CONFIG_USB_STORAGE=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/openwrt-one-nor_env @@ -0,0 +1,48 @@ diff --git a/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch b/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch index 069a240d49..139af33c8a 100644 --- a/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch +++ b/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch @@ -147,7 +147,7 @@ +}; --- /dev/null +++ b/configs/mt7981_glinet_gl-x3000_defconfig -@@ -0,0 +1,100 @@ +@@ -0,0 +1,98 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -160,24 +160,25 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981-glinet-gl-x3000" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_ENV_VARS_UBOOT_CONFIG=y +# CONFIG_EXPERT is not set ++# CONFIG_EFI_LOADER is not set +CONFIG_FIT=y +# CONFIG_BOOTSTD is not set +# CONFIG_LEGACY_IMAGE_FORMAT is not set +CONFIG_AUTOBOOT_MENU_SHOW=y +CONFIG_USE_BOOTCOMMAND=y +CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981-glinet-gl-x3000.dtb" ++CONFIG_SYS_CBSIZE=512 ++CONFIG_SYS_PBSIZE=1049 +CONFIG_LOGLEVEL=7 +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " -+CONFIG_SYS_CBSIZE=512 -+CONFIG_SYS_PBSIZE=1049 +CONFIG_CMD_CPU=y +CONFIG_CMD_LICENSE=y +# CONFIG_BOOTM_NETBSD is not set @@ -200,14 +201,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_READ=y +CONFIG_CMD_WRITE=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -245,9 +246,6 @@ +CONFIG_DM_SERIAL=y +CONFIG_MTK_SERIAL=y +CONFIG_HEXDUMP=y -+# CONFIG_EFI_LOADER is not set -+CONFIG_LMB_MAX_REGIONS=64 -+# CONFIG_TOOLS_LIBCRYPTO is not set --- /dev/null +++ b/glinet_gl-x3000_env @@ -0,0 +1,26 @@ diff --git a/package/boot/uboot-mediatek/patches/455-arm-provide-noncached_set_region-prototype-to-fix-build.patch b/package/boot/uboot-mediatek/patches/455-arm-provide-noncached_set_region-prototype-to-fix-build.patch deleted file mode 100644 index ba04f608b4..0000000000 --- a/package/boot/uboot-mediatek/patches/455-arm-provide-noncached_set_region-prototype-to-fix-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -From aab8e6cf7afbbcef60593c6b1795fa5d8e78e597 Mon Sep 17 00:00:00 2001 -From: Jonas Jelonek -Date: Tue, 15 Oct 2024 20:02:25 +0200 -Subject: [PATCH] arm: provide noncached_set_region prototype to fix build - -Due to the removal of weak functions in 7d6cee2cd0 ("cmd: cache: Remove -weak function"), uboot fails to compile after updating to v2024.10 for -mediatek target in OpenWrt with GCC-14 with error: -cmd/cache.c: In function 'do_dcache': -cmd/cache.c:57:25: error: implicit declaration of function - 'noncached_set_region' [-Wimplicit-function-declaration] - -Thus, provide a prototype in arm's include/asm/system.h to fix a build -error in cmd/cache.c, since related prototypes are also located there. -Also add an include of asm/system.h in cmd/cache.c have the function -available there. - -Signed-off-by: Jonas Jelonek ---- - arch/arm/include/asm/system.h | 1 + - cmd/cache.c | 1 + - 2 files changed, 2 insertions(+) - ---- a/arch/arm/include/asm/system.h -+++ b/arch/arm/include/asm/system.h -@@ -658,6 +658,7 @@ void mmu_set_region_dcache_behaviour(phy - * Return: 0 if OK - */ - int noncached_init(void); -+void noncached_set_region(void); - - phys_addr_t noncached_alloc(size_t size, size_t align); - #endif /* CONFIG_SYS_NONCACHED_MEMORY */ ---- a/cmd/cache.c -+++ b/cmd/cache.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - static int parse_argv(const char *); - diff --git a/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch b/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch index 5c9c6e6977..5c11d81108 100644 --- a/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch +++ b/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7988a_arcadyan_mozart_defconfig -@@ -0,0 +1,119 @@ +@@ -0,0 +1,113 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -13,11 +13,11 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7988a-arcadyan-mozart" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7988=y ++CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11000000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_SYS_LOAD_ADDR=0x50000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -48,19 +48,16 @@ +CONFIG_CMD_PWM=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y -+CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y -+CONFIG_CMD_SF_TEST=y -+CONFIG_CMD_USB=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -81,14 +78,12 @@ +CONFIG_DEFAULT_ENV_FILE="arcadyan_mozart_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_BUTTON=y +CONFIG_BUTTON_GPIO=y +CONFIG_CLK=y @@ -119,7 +114,6 @@ +CONFIG_MTK_SERIAL=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arcadyan_mozart_env @@ -0,0 +1,55 @@ diff --git a/package/boot/uboot-mediatek/patches/457-initialized-the-watchdog-subsystem-later.patch b/package/boot/uboot-mediatek/patches/457-initialized-the-watchdog-subsystem-later.patch index 7919b36560..118959b8ee 100644 --- a/package/boot/uboot-mediatek/patches/457-initialized-the-watchdog-subsystem-later.patch +++ b/package/boot/uboot-mediatek/patches/457-initialized-the-watchdog-subsystem-later.patch @@ -13,7 +13,7 @@ Signed-off-by: Enrico Mioso --- a/common/board_r.c +++ b/common/board_r.c -@@ -663,19 +663,13 @@ static init_fnc_t init_sequence_r[] = { +@@ -682,19 +682,13 @@ static init_fnc_t init_sequence_r[] = { serial_initialize, initr_announce, dm_announce, @@ -33,7 +33,7 @@ Signed-off-by: Enrico Mioso #if defined(CONFIG_PCI_INIT_R) && defined(CONFIG_SYS_EARLY_PCI_INIT) /* * Do early PCI configuration _before_ the flash gets initialised, -@@ -690,7 +684,6 @@ static init_fnc_t init_sequence_r[] = { +@@ -709,7 +703,6 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_MTD_NOR_FLASH initr_flash, #endif @@ -41,7 +41,7 @@ Signed-off-by: Enrico Mioso #if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_X86) /* initialize higher level parts of CPU like time base and timers */ cpu_init_r, -@@ -719,6 +712,10 @@ static init_fnc_t init_sequence_r[] = { +@@ -738,6 +731,10 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_PVBLOCK initr_pvblock, #endif diff --git a/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch b/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch index 28bdd95e15..0e1647e94a 100644 --- a/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch +++ b/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch @@ -218,7 +218,7 @@ Signed-off-by: Enrico Mioso +}; --- /dev/null +++ b/configs/mt7981_gatonetworks_gdsp_defconfig -@@ -0,0 +1,144 @@ +@@ -0,0 +1,141 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -231,10 +231,10 @@ Signed-off-by: Enrico Mioso +CONFIG_DEFAULT_DEVICE_TREE="mt7981-gatonetworks_gdsp" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_WATCHDOG_TIMEOUT_MSECS=25000 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_SPI_BOOT=y @@ -281,15 +281,15 @@ Signed-off-by: Enrico Mioso +CONFIG_CMD_CAT=y +CONFIG_CMD_SETEXPR_FMT=y +CONFIG_CMD_XXD=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +# CONFIG_CMD_EFICONFIG is not set @@ -310,10 +310,8 @@ Signed-off-by: Enrico Mioso +CONFIG_DEFAULT_ENV_FILE="gatonetworks_gdsp_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_BUTTON=y +CONFIG_BUTTON_GPIO=y +CONFIG_CLK=y @@ -362,7 +360,6 @@ Signed-off-by: Enrico Mioso +CONFIG_WDT_GPIO=y +CONFIG_UBIFS_SILENCE_MSG=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/gatonetworks_gdsp_env @@ -0,0 +1,38 @@ diff --git a/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch b/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch index 4fae619aa1..72d65ba907 100644 --- a/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch +++ b/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_mercusys_mr90x-v1_defconfig -@@ -0,0 +1,107 @@ +@@ -0,0 +1,106 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7986b-mercusys_mr90x-v1" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7986=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007ef00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_BOOTDELAY=30 @@ -37,14 +37,14 @@ +CONFIG_CMD_DM=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_MTD=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -66,12 +66,12 @@ +CONFIG_DEFAULT_ENV_FILE="mercusys_mr90x-v1_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_BUTTON=y @@ -79,10 +79,10 @@ +CONFIG_CLK=y +CONFIG_GPIO_HOG=y +# CONFIG_I2C is not set -+# CONFIG_MMC is not set +CONFIG_LED=y +CONFIG_LED_BLINK=y +CONFIG_LED_GPIO=y ++# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_MTD_SPI_NAND=y @@ -107,7 +107,6 @@ +CONFIG_RANDOM_UUID=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7986b-mercusys_mr90x-v1.dts @@ -0,0 +1,174 @@ diff --git a/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch b/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch index f33ca07633..516460e391 100644 --- a/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch +++ b/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_routerich_ax3000_defconfig -@@ -0,0 +1,108 @@ +@@ -0,0 +1,105 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -11,10 +11,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981-routerich_ax3000" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007ef00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_BOOTDELAY=30 @@ -39,14 +39,14 @@ +CONFIG_CMD_GPT=y +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_DNS=y +CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -68,14 +68,12 @@ +CONFIG_DEFAULT_ENV_FILE="routerich_ax3000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGMAP=y -+CONFIG_SYSCON=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_BUTTON=y +CONFIG_BUTTON_GPIO=y +CONFIG_CLK=y @@ -108,7 +106,6 @@ +CONFIG_MTK_SPIM=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y -+CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7981-routerich_ax3000.dts @@ -0,0 +1,187 @@