Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-05-14 17:03:00 +08:00
commit ce2b2bccbc
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 31 additions and 6 deletions

View File

@ -50,6 +50,7 @@ ipq40xx_setup_interfaces()
aruba,ap-365|\
avm,fritzrepeater-1200|\
dlink,dap-2610|\
engenius,eap1300|\
extreme-networks,ws-ap3915i|\
meraki,mr33|\
meraki,mr74|\

View File

@ -310,6 +310,7 @@ CONFIG_NVMEM=y
CONFIG_NVMEM_QCOM_QFPROM=y
# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_SPMI_SDAM is not set
CONFIG_NVMEM_U_BOOT_ENV=y
CONFIG_NVMEM_SYSFS=y
CONFIG_OF=y
CONFIG_OF_ADDRESS=y

View File

@ -194,8 +194,13 @@
reg = <0x190000 0x1dc0000>;
};
partition9@1f50000 {
compatible = "u-boot,env";
label = "u-boot-env";
reg = <0x01f50000 0x00010000>;
macaddr_ubootenv_ethaddr: ethaddr {
#nvmem-cell-cells = <1>;
};
};
partition10@1f60000 {
label = "userconfig";
@ -215,16 +220,35 @@
status = "okay";
};
&switch {
status = "okay";
};
&swport5 {
status = "okay";
label = "lan";
nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_ubootenv_ethaddr 0>;
};
&gmac {
status = "okay";
};
&mdio {
status = "okay";
};
&wifi0 {
status = "okay";
nvmem-cell-names = "pre-calibration";
nvmem-cells = <&precal_art_1000>;
nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_ubootenv_ethaddr 1>;
qcom,ath10k-calibration-variant = "EnGenius-EAP1300";
};
&wifi1 {
status = "okay";
nvmem-cell-names = "pre-calibration";
nvmem-cells = <&precal_art_5000>;
nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_ubootenv_ethaddr 2>;
qcom,ath10k-calibration-variant = "EnGenius-EAP1300";
};

View File

@ -455,8 +455,7 @@ define Device/engenius_eap1300
IMAGE_SIZE := 25344k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
endef
# Missing DSA Setup
#TARGET_DEVICES += engenius_eap1300
TARGET_DEVICES += engenius_eap1300
define Device/engenius_eap2200
$(call Device/FitImage)