From f5c42670d278001eaa73fbc36b5ebc1105a996a3 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 31 Aug 2024 18:56:59 +0200 Subject: [PATCH 1/9] mediatek: fix OpenWrt One MACs * Ignore the MACs passed by the bootloader. * fix nvmem-cell-cells warning * fix the node names * add dbdc wifi MACs Signed-off-by: John Crispin --- .../mediatek/dts/mt7981b-openwrt-one.dts | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/target/linux/mediatek/dts/mt7981b-openwrt-one.dts b/target/linux/mediatek/dts/mt7981b-openwrt-one.dts index b2223f8d76..2193c782b5 100644 --- a/target/linux/mediatek/dts/mt7981b-openwrt-one.dts +++ b/target/linux/mediatek/dts/mt7981b-openwrt-one.dts @@ -8,8 +8,6 @@ compatible = "openwrt,one", "mediatek,mt7981"; aliases { - ethernet0 = &gmac0; - ethernet1 = &gmac1; serial0 = &uart0; led-boot = &led_status_white; led-failsafe = &led_status_red; @@ -140,7 +138,7 @@ phy-handle = <&phy15>; phy-mode = "2500base-x"; nvmem-cell-names = "mac-address"; - nvmem-cells = <&macaddr_factory_4>; + nvmem-cells = <&macaddr_factory_24>; }; gmac1: mac@1 { @@ -149,7 +147,7 @@ phy-mode = "gmii"; phy-handle = <&int_gbe_phy>; nvmem-cell-names = "mac-address"; - nvmem-cells = <&macaddr_factory_a>; + nvmem-cells = <&macaddr_factory_2a>; }; }; @@ -388,15 +386,19 @@ }; macaddr_factory_4: macaddr@4 { + reg = <0x4 0x6>; compatible = "mac-base"; - reg = <0x24 0x6>; #nvmem-cell-cells = <1>; }; - macaddr_factory_a: macaddr@a { + macaddr_factory_24: macaddr@24 { + reg = <0x24 0x6>; compatible = "mac-base"; + }; + + macaddr_factory_2a: macaddr@2a { reg = <0x2a 0x6>; - #nvmem-cell-cells = <1>; + compatible = "mac-base"; }; }; }; @@ -444,6 +446,18 @@ nvmem-cells = <&eeprom_factory_0>; nvmem-cell-names = "eeprom"; status = "okay"; + + band@0 { + reg = <0>; + nvmem-cells = <&macaddr_factory_4 0>; + nvmem-cell-names = "mac-address"; + }; + + band@1 { + reg = <1>; + nvmem-cells = <&macaddr_factory_4 1>; + nvmem-cell-names = "mac-address"; + }; }; &pcie { From ee798653f3a9f5cd2fcd2c483f764fecd9ce80c9 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 31 Aug 2024 18:58:50 +0200 Subject: [PATCH 2/9] mediatek: fix OpenWrt One NAND size The final version of the PCB has 256MB NAND instead of 128MB. Signed-off-by: John Crispin --- target/linux/mediatek/dts/mt7981b-openwrt-one.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mediatek/dts/mt7981b-openwrt-one.dts b/target/linux/mediatek/dts/mt7981b-openwrt-one.dts index 2193c782b5..cfc5319d91 100644 --- a/target/linux/mediatek/dts/mt7981b-openwrt-one.dts +++ b/target/linux/mediatek/dts/mt7981b-openwrt-one.dts @@ -329,7 +329,7 @@ partition@580000 { label = "ubi"; - reg = <0x100000 0x7F00000>; + reg = <0x100000 0xFF00000>; compatible = "linux,ubi"; volumes { From 28d8f3392563aaca5d70c85727fa6a9d134078ce Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 31 Aug 2024 18:59:35 +0200 Subject: [PATCH 3/9] uboot-envtools: add support for OpenWrt One Signed-off-by: John Crispin --- package/boot/uboot-envtools/files/mediatek_filogic | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic index b567481215..417a3ad9de 100644 --- a/package/boot/uboot-envtools/files/mediatek_filogic +++ b/package/boot/uboot-envtools/files/mediatek_filogic @@ -104,6 +104,9 @@ openembed,som7981) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x80000" ubootenv_add_uci_sys_config "/dev/mtd3" "0x0" "0x100000" "0x100000" ;; +openwrt,one) + ubootenv_add_ubi_default + ;; smartrg,sdg-8733|\ smartrg,sdg-8734) local envdev=$(find_mmc_part "u-boot-env" "mmcblk0") From 0db6f9a856842ef85d5470d9b8ec6b1d435fe261 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 31 Aug 2024 19:00:47 +0200 Subject: [PATCH 4/9] uboot-mediatek: fix OpenWrt One NAND size The final version of the PCB has 256MB NAND instead of 128MB. Signed-off-by: John Crispin --- package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0178c8da6d..7355c64089 100644 --- a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch +++ b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch @@ -149,7 +149,7 @@ + + partition@200000 { + label = "ubi"; -+ reg = <0x100000 0x7f00000>; ++ reg = <0x100000 0xff00000>; + }; + }; + }; From f625d9b31cdde2ed451da789952de5b87f7dc4a8 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 11 Sep 2024 00:14:43 +0200 Subject: [PATCH 5/9] ramips: mt76x8: add missing model string to Yuncore CPE200 Add missing 'model' string to DT, so /tmp/sysinfo/model gets populated. Fixes: 64dae1052b ("ramips: mt76x8: add support for Yuncore CPE200") Signed-off-by: Daniel Golle --- target/linux/ramips/dts/mt7628an_yuncore_cpe200.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ramips/dts/mt7628an_yuncore_cpe200.dts b/target/linux/ramips/dts/mt7628an_yuncore_cpe200.dts index c8bd39b6ac..6e6202f02b 100644 --- a/target/linux/ramips/dts/mt7628an_yuncore_cpe200.dts +++ b/target/linux/ramips/dts/mt7628an_yuncore_cpe200.dts @@ -6,6 +6,7 @@ / { compatible = "yuncore,cpe200", "mediatek,mt7628an-soc"; + model = "Yuncore CPE200"; chosen { bootargs = "console=ttyS0,57600"; From ab25600c650628f8089e005638848de0d2767882 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 11 Sep 2024 00:16:12 +0200 Subject: [PATCH 6/9] ramips: mt76x8: add missing model string to Yuncore M300 Add missing 'model' string to DT, so /tmp/sysinfo/model gets populated. Fixes: e497c975d3 ("ramips: mt76x8: add support for Yuncore M300") Signed-off-by: Daniel Golle --- target/linux/ramips/dts/mt7628an_yuncore_m300.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ramips/dts/mt7628an_yuncore_m300.dts b/target/linux/ramips/dts/mt7628an_yuncore_m300.dts index 7a28c66996..8897c11d67 100644 --- a/target/linux/ramips/dts/mt7628an_yuncore_m300.dts +++ b/target/linux/ramips/dts/mt7628an_yuncore_m300.dts @@ -6,6 +6,7 @@ / { compatible = "yuncore,m300", "mediatek,mt7628an-soc"; + model = "Yuncore M300"; chosen { bootargs = "console=ttyS0,57600"; From 8d7676dfba2524f8cf615fee68dc4075195fda7b Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 29 Aug 2024 00:46:30 +0200 Subject: [PATCH 7/9] treewide: update contact information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change contact information of comitter as requested. Reviewed-by: Sarah Mädel Signed-off-by: David Bauer --- package/boot/arm-trusted-firmware-rockchip/Makefile | 4 ++-- package/boot/uboot-rockchip/Makefile | 2 +- target/linux/rockchip/image/armv8.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/boot/arm-trusted-firmware-rockchip/Makefile b/package/boot/arm-trusted-firmware-rockchip/Makefile index 6fbcbef0a8..38a644efa3 100644 --- a/package/boot/arm-trusted-firmware-rockchip/Makefile +++ b/package/boot/arm-trusted-firmware-rockchip/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 Tobias Maedel +# Copyright (C) 2020 Sarah Maedel # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ PKG_RELEASE:=1 PKG_HASH:=88215a62291b9ba87da8e50b077741103cdc08fb6c9e1ebd34dfaace746d3201 -PKG_MAINTAINER:=Tobias Maedel +PKG_MAINTAINER:=Sarah Maedel include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/trusted-firmware-a.mk diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index 50c8a95ba0..7718c8985b 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -9,7 +9,7 @@ PKG_VERSION:=2024.07 PKG_RELEASE:=1 PKG_HASH:=f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f -PKG_MAINTAINER:=Tobias Maedel +PKG_MAINTAINER:=Sarah Maedel UBOOT_USE_BINMAN:=1 UBOOT_USE_INTREE_DTC:=1 diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 99dde6aef1..8bbdf0b3d7 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2020 Tobias Maedel +# Copyright (C) 2020 Sarah Maedel # FIT will be loaded at 0x02080000. Leave 16M for that, align it to 2M and load the kernel after it. KERNEL_LOADADDR := 0x03200000 From ae42ecaad4e7b4878083f08a2cba6ce511ac6c43 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 19 Aug 2024 15:25:10 +0200 Subject: [PATCH 8/9] ucode: fix host installation The path for linking libucode.so was not specified for the ucode binary. This breaks execution of ucode in the host context. Signed-off-by: David Bauer --- package/utils/ucode/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile index aa7a28483d..125f32ba65 100644 --- a/package/utils/ucode/Makefile +++ b/package/utils/ucode/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ucode -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/jow-/ucode.git @@ -25,16 +25,17 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk -CMAKE_OPTIONS += -DSOVERSION=$(PKG_ABI_VERSION) +CMAKE_OPTIONS += \ + -DSOVERSION=$(PKG_ABI_VERSION) + -DCMAKE_SKIP_RPATH=FALSE \ + -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" ifeq ($(HOST_OS),Darwin) CMAKE_HOST_OPTIONS += \ - -DCMAKE_SKIP_RPATH=FALSE \ - -DCMAKE_MACOSX_RPATH=1 \ - -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib" + -DCMAKE_MACOSX_RPATH=1 else CMAKE_HOST_OPTIONS += \ - -DSOVERSION=$(PKG_ABI_VERSION) + -DUSE_RPATH="${STAGING_DIR_HOSTPKG}/lib" endif CMAKE_HOST_OPTIONS += \ From c7ba5574f52f25334add66c15190b578ac873739 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 10 Sep 2024 04:25:59 +0200 Subject: [PATCH 9/9] ipq40xx: define config-names for Aruba boards Aruba boards now ship with multiple DTS and image-configurations per image. Newer apboot revs expect a configuration for their hardware to be present. Signed-off-by: David Bauer --- target/linux/ipq40xx/image/generic.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index 0aff89afa3..a2931ff01e 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -179,12 +179,14 @@ endef define Device/aruba_ap-303 $(call Device/aruba_glenmorangie) DEVICE_MODEL := AP-303 + DEVICE_DTS_CONFIG := Glenmorangie@1 endef TARGET_DEVICES += aruba_ap-303 define Device/aruba_ap-303h $(call Device/aruba_glenmorangie) DEVICE_MODEL := AP-303H + DEVICE_DTS_CONFIG := Aberlour@1 endef TARGET_DEVICES += aruba_ap-303h @@ -192,6 +194,7 @@ define Device/aruba_ap-365 $(call Device/aruba_glenmorangie) DEVICE_MODEL := AP-365 DEVICE_PACKAGES := kmod-hwmon-ad7418 + DEVICE_DTS_CONFIG := Bunker@1 endef TARGET_DEVICES += aruba_ap-365