mirror of
https://github.com/kernelkit/infix.git
synced 2026-07-22 01:13:00 +02:00
aarch64: board: Acer Connect Vero rename board
Fix so the board actually build when selected and rename the board to the actual name `Acer Connect Vero W6m`
This commit is contained in:
Mattias Walström
@@ -1,7 +1,7 @@
|
||||
if BR2_aarch64
|
||||
|
||||
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/alder-alder/Config.in"
|
||||
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/acer-connect-vero-w/Config.in"
|
||||
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/acer-connect-vero-w6m/Config.in"
|
||||
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/bananapi-bpi-r3/Config.in"
|
||||
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/bananapi-bpi-r4/Config.in"
|
||||
source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/bananapi-bpi-r64/Config.in"
|
||||
|
||||
@@ -4,7 +4,7 @@ aarch64
|
||||
Board Specific Documentation
|
||||
----------------------------
|
||||
|
||||
- [Acer Connect Vero W6m](acer-connect-vero-w/)
|
||||
- [Acer Connect Vero W6m](acer-connect-vero-w6m/)
|
||||
- [Banana Pi BPi-R3](bananapi-bpi-r3/)
|
||||
- [Banana Pi BPi-R4](bananapi-bpi-r4/)
|
||||
- [Banana Pi BPi-R64](bananapi-bpi-r64/)
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
config BR2_PACKAGE_ACER_CONNECT_VERO_W6
|
||||
bool "Acer Connect Vero w6"
|
||||
depends on BR2_aarch64
|
||||
select BR2_PACKAGE_BANANAPI_BPI_R3
|
||||
help
|
||||
Build Acer Connect Vero w6
|
||||
@@ -1 +0,0 @@
|
||||
dtb-y += mediatek/mt7986a-acer-connect-vero-w.dtb
|
||||
@@ -0,0 +1,6 @@
|
||||
config BR2_PACKAGE_ACER_CONNECT_VERO_W6M
|
||||
bool "Acer Connect Vero W6m"
|
||||
depends on BR2_aarch64
|
||||
select BR2_PACKAGE_BANANAPI_BPI_R3
|
||||
help
|
||||
Build Acer Connect Vero W6m
|
||||
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
@@ -0,0 +1 @@
|
||||
dtb-y += mediatek/mt7986a-acer-connect-vero-w6m.dtb
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
||||
|
||||
/dts-v1/;
|
||||
#include "mt7986a-acer-connect-vero-w-common.dtsi"
|
||||
#include "mt7986a-acer-connect-vero-w-pcie-eeprom.dtsi"
|
||||
#include "mt7986a-acer-connect-vero-w6m-common.dtsi"
|
||||
#include "mt7986a-acer-connect-vero-w6m-pcie-eeprom.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Acer Connect Vero W6m";
|
||||
@@ -4,7 +4,7 @@ CONFIG_BOOTDELAY=2
|
||||
CONFIG_ENV_IS_NOWHERE=y
|
||||
# CONFIG_ENV_IS_IN_MMC is not set
|
||||
CONFIG_MULTI_DTB_FIT=y
|
||||
CONFIG_OF_LIST="mt7986a-bpi-r3-sd mt7986a-bpi-r3-emmc mt7986a-bpi-r3-mini mt7986a-acer-connect-vero-w"
|
||||
CONFIG_OF_LIST="mt7986a-bpi-r3-sd mt7986a-bpi-r3-emmc mt7986a-bpi-r3-mini mt7986a-acer-connect-vero-w6m"
|
||||
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_XHCI_HCD=y
|
||||
|
||||
@@ -134,7 +134,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
|
||||
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
|
||||
BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y
|
||||
BR2_PACKAGE_ALDER_ALDER=y
|
||||
BR2_PACKAGE_ACER_CONNECT_VERO_W6=y
|
||||
BR2_PACKAGE_ACER_CONNECT_VERO_W6M=y
|
||||
BR2_PACKAGE_BANANAPI_BPI_R3=y
|
||||
BR2_PACKAGE_BANANAPI_BPI_R4=y
|
||||
BR2_PACKAGE_BANANAPI_BPI_R64=y
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ All notable changes to the project are documented in this file.
|
||||
- Disallow multicast MAC addresses in custom MAC address configuration
|
||||
- Fix broken Wi-Fi 6 GHz band configuration.
|
||||
|
||||
[AcerConnectVero]: ../board/aarch64/acer-connect-vero-w/
|
||||
[AcerConnectVero]: ../board/aarch64/acer-connect-vero-w6m/
|
||||
|
||||
[v26.04.0][] - 2026-04-30
|
||||
-------------------------
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2e5f34ed626021e3307dcf5a005d9466eecdacd1 Mon Sep 17 00:00:00 2001
|
||||
From 05e640b8845f7ab075cd0806a340219c05b8c68b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <lazzer@gmail.com>
|
||||
Date: Sun, 10 May 2026 21:42:27 +0200
|
||||
Subject: [PATCH 10/10] mt7986: bpi-r3: Enable Acer Connect Vero W
|
||||
@@ -9,31 +9,31 @@ Organization: Wires
|
||||
|
||||
Signed-off-by: Mattias Walström <lazzer@gmail.com>
|
||||
---
|
||||
arch/arm/dts/Makefile | 1 +
|
||||
arch/arm/dts/mt7986a-acer-connect-vero-w.dts | 13 ++++
|
||||
board/mediatek/mt7986/bpir3.c | 78 +++++++++++++++++++-
|
||||
configs/mt7986a_bpir3_emmc_defconfig | 2 +
|
||||
configs/mt7986a_bpir3_sd_defconfig | 2 +
|
||||
arch/arm/dts/Makefile | 1 +
|
||||
.../arm/dts/mt7986a-acer-connect-vero-w6m.dts | 13 ++++
|
||||
board/mediatek/mt7986/bpir3.c | 78 ++++++++++++++++++-
|
||||
configs/mt7986a_bpir3_emmc_defconfig | 2 +
|
||||
configs/mt7986a_bpir3_sd_defconfig | 2 +
|
||||
5 files changed, 95 insertions(+), 1 deletion(-)
|
||||
create mode 100644 arch/arm/dts/mt7986a-acer-connect-vero-w.dts
|
||||
create mode 100644 arch/arm/dts/mt7986a-acer-connect-vero-w6m.dts
|
||||
|
||||
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
|
||||
index 3561e4c3651..b21881b9a1c 100644
|
||||
index 3561e4c3651..66731aa3132 100644
|
||||
--- a/arch/arm/dts/Makefile
|
||||
+++ b/arch/arm/dts/Makefile
|
||||
@@ -1200,6 +1200,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
|
||||
mt7986a-bpi-r3-sd.dtb \
|
||||
mt7986a-bpi-r3-emmc.dtb \
|
||||
mt7986a-bpi-r3-mini.dtb \
|
||||
+ mt7986a-acer-connect-vero-w.dtb \
|
||||
+ mt7986a-acer-connect-vero-w6m.dtb \
|
||||
mt7986a-rfb.dtb \
|
||||
mt7986b-rfb.dtb \
|
||||
mt7986a-sd-rfb.dtb \
|
||||
diff --git a/arch/arm/dts/mt7986a-acer-connect-vero-w.dts b/arch/arm/dts/mt7986a-acer-connect-vero-w.dts
|
||||
diff --git a/arch/arm/dts/mt7986a-acer-connect-vero-w6m.dts b/arch/arm/dts/mt7986a-acer-connect-vero-w6m.dts
|
||||
new file mode 100644
|
||||
index 00000000000..2e18c3eb717
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/dts/mt7986a-acer-connect-vero-w.dts
|
||||
+++ b/arch/arm/dts/mt7986a-acer-connect-vero-w6m.dts
|
||||
@@ -0,0 +1,13 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+
|
||||
@@ -49,7 +49,7 @@ index 00000000000..2e18c3eb717
|
||||
+ reg = <0x40000000 0x40000000>;
|
||||
+};
|
||||
diff --git a/board/mediatek/mt7986/bpir3.c b/board/mediatek/mt7986/bpir3.c
|
||||
index 01eef55bb74..695db8725d9 100644
|
||||
index 01eef55bb74..c5c8eb2b34f 100644
|
||||
--- a/board/mediatek/mt7986/bpir3.c
|
||||
+++ b/board/mediatek/mt7986/bpir3.c
|
||||
@@ -1,14 +1,16 @@
|
||||
@@ -161,7 +161,7 @@ index 01eef55bb74..695db8725d9 100644
|
||||
case BPIR3_MINI:
|
||||
return strcmp(name, "mt7986a-bpi-r3-mini") ? -1 : 0;
|
||||
+ case ASUS_VERO_W:
|
||||
+ return strcmp(name, "mt7986a-acer-connect-vero-w") ? -1 : 0;
|
||||
+ return strcmp(name, "mt7986a-acer-connect-vero-w6m") ? -1 : 0;
|
||||
case BPIR3:
|
||||
default:
|
||||
/*
|
||||
@@ -170,32 +170,32 @@ index 01eef55bb74..695db8725d9 100644
|
||||
if (model && strstr(model, "Mini"))
|
||||
env_set("fdtfile", "mediatek/mt7986a-bananapi-bpi-r3-mini.dtb");
|
||||
+ else if (model && strstr(model, "Vero"))
|
||||
+ env_set("fdtfile", "mediatek/mt7986a-acer-connect-vero-w.dtb");
|
||||
+ env_set("fdtfile", "mediatek/mt7986a-acer-connect-vero-w6m.dtb");
|
||||
|
||||
return 0;
|
||||
}
|
||||
diff --git a/configs/mt7986a_bpir3_emmc_defconfig b/configs/mt7986a_bpir3_emmc_defconfig
|
||||
index 193acb4a9b4..dff2f6f164e 100644
|
||||
index 193acb4a9b4..3f767a9fc0a 100644
|
||||
--- a/configs/mt7986a_bpir3_emmc_defconfig
|
||||
+++ b/configs/mt7986a_bpir3_emmc_defconfig
|
||||
@@ -8,6 +8,8 @@ CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_ENV_SIZE=0x80000
|
||||
CONFIG_ENV_OFFSET=0x300000
|
||||
CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-emmc"
|
||||
+CONFIG_OF_LIST="mt7986a-bpi-r3-sd mt7986a-bpi-r3-emmc mt7986a-bpi-r3-mini mt7986a-acer-connect-vero-w"
|
||||
+CONFIG_OF_LIST="mt7986a-bpi-r3-sd mt7986a-bpi-r3-emmc mt7986a-bpi-r3-mini mt7986a-acer-connect-vero-w6m"
|
||||
+CONFIG_MULTI_DTB_FIT=y
|
||||
CONFIG_TARGET_MT7986=y
|
||||
CONFIG_BOARD_BPI_R3=y
|
||||
CONFIG_SPL_LOAD_FIT=y
|
||||
diff --git a/configs/mt7986a_bpir3_sd_defconfig b/configs/mt7986a_bpir3_sd_defconfig
|
||||
index e498b58a4a5..f281f570075 100644
|
||||
index e498b58a4a5..6fa89d85e69 100644
|
||||
--- a/configs/mt7986a_bpir3_sd_defconfig
|
||||
+++ b/configs/mt7986a_bpir3_sd_defconfig
|
||||
@@ -8,6 +8,8 @@ CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_ENV_SIZE=0x80000
|
||||
CONFIG_ENV_OFFSET=0x300000
|
||||
CONFIG_DEFAULT_DEVICE_TREE="mt7986a-bpi-r3-sd"
|
||||
+CONFIG_OF_LIST="mt7986a-bpi-r3-sd mt7986a-bpi-r3-emmc mt7986a-bpi-r3-mini mt7986a-acer-connect-vero-w"
|
||||
+CONFIG_OF_LIST="mt7986a-bpi-r3-sd mt7986a-bpi-r3-emmc mt7986a-bpi-r3-mini mt7986a-acer-connect-vero-w6m"
|
||||
+CONFIG_MULTI_DTB_FIT=y
|
||||
CONFIG_TARGET_MT7986=y
|
||||
CONFIG_BOARD_BPI_R3=y
|
||||
|
||||
+1
-1
@@ -182,7 +182,7 @@ get_bootloader_name()
|
||||
raspberrypi-rpi64)
|
||||
echo "rpi64_boot"
|
||||
;;
|
||||
acer-connect-vero-w)
|
||||
acer-connect-vero-w6m)
|
||||
echo "bpi_r3_emmc_boot"
|
||||
;;
|
||||
bananapi-bpi-r3)
|
||||
|
||||
Reference in New Issue
Block a user