fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-09-11 18:09:00 +08:00
commit a8fe54372e
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
9 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/boot/uboot-envtools/files/mediatek_filogic
View File

@ -114,6 +114,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")

2
package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch
View File

@ -149,7 +149,7 @@
+
+ partition@200000 {
+ label = "ubi";
+ reg = <0x100000 0x7f00000>;
+ reg = <0x100000 0xff00000>;
+ };
+ };
+ };

2
package/boot/uboot-rockchip/Makefile
View File

@ -9,7 +9,7 @@ PKG_VERSION:=2024.07
PKG_RELEASE:=1
PKG_HASH:=f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>
PKG_MAINTAINER:=Sarah Maedel <openwrt@tbspace.de>
UBOOT_USE_BINMAN:=1
UBOOT_USE_INTREE_DTC:=1

13
package/utils/ucode/Makefile
View File

@ -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 += \

3
target/linux/ipq40xx/image/generic.mk
View File

@ -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

30
target/linux/mediatek/dts/mt7981b-openwrt-one.dts
View File

@ -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>;
};
};
@ -331,7 +329,7 @@
partition@580000 {
label = "ubi";
reg = <0x100000 0x7F00000>;
reg = <0x100000 0xFF00000>;
compatible = "linux,ubi";
volumes {
@ -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 {

1
target/linux/ramips/dts/mt7628an_yuncore_cpe200.dts
View File

@ -6,6 +6,7 @@
/ {
compatible = "yuncore,cpe200", "mediatek,mt7628an-soc";
model = "Yuncore CPE200";
chosen {
bootargs = "console=ttyS0,57600";

1
target/linux/ramips/dts/mt7628an_yuncore_m300.dts
View File

@ -6,6 +6,7 @@
/ {
compatible = "yuncore,m300", "mediatek,mt7628an-soc";
model = "Yuncore M300";
chosen {
bootargs = "console=ttyS0,57600";

2
target/linux/rockchip/image/armv8.mk
View File

@ -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