mirror of
				https://github.com/Telecominfraproject/wlan-ap.git
				synced 2025-10-31 10:28:06 +00:00 
			
		
		
		
	ucentral: development update
* update ucentral * add edgecore SPW2AC1200 support * add wwan support * fix passpoint support Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
		| @@ -1,14 +1,14 @@ | ||||
| From 5519a028a1181e1a538010acff9e0a2390e8f0b0 Mon Sep 17 00:00:00 2001 | ||||
| From 9823f41c1d99446cfd3285553fbba0cf61e86ac4 Mon Sep 17 00:00:00 2001 | ||||
| From: John Crispin <john@phrozen.org> | ||||
| Date: Thu, 27 May 2021 13:25:19 +0200 | ||||
| Subject: [PATCH 01/36] hostapd: upsate to latest HEAD | ||||
| Subject: [PATCH 01/42] hostapd: upsate to latest HEAD | ||||
|  | ||||
| Signed-off-by: John Crispin <john@phrozen.org> | ||||
| --- | ||||
|  package/network/services/hostapd/Makefile     |   9 +- | ||||
|  .../hostapd/files/hostapd-basic.config        |   2 +- | ||||
|  .../hostapd/files/hostapd-full.config         |   4 +- | ||||
|  .../network/services/hostapd/files/hostapd.sh | 153 ++++++++-- | ||||
|  .../network/services/hostapd/files/hostapd.sh | 155 +++++++++-- | ||||
|  ...-fix-frequency-setup-with-HE-enabled.patch | 196 ------------- | ||||
|  .../001-wolfssl-init-RNG-with-ECC-key.patch   |  43 +++ | ||||
|  ...-init-order-disable-pri-sec-channel-.patch | 126 --------- | ||||
| @@ -67,7 +67,7 @@ Signed-off-by: John Crispin <john@phrozen.org> | ||||
|  ...of-secondary-device-types-for-P2P-gr.patch |  33 --- | ||||
|  .../services/hostapd/src/src/ap/ubus.c        |  70 ++++- | ||||
|  .../services/hostapd/src/src/ap/ubus.h        |  16 ++ | ||||
|  62 files changed, 757 insertions(+), 2320 deletions(-) | ||||
|  62 files changed, 758 insertions(+), 2321 deletions(-) | ||||
|  delete mode 100644 package/network/services/hostapd/patches/001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch | ||||
|  create mode 100644 package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch | ||||
|  delete mode 100644 package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch | ||||
| @@ -162,7 +162,7 @@ index df272e443a..61b6daf861 100644 | ||||
|  # EAP-SAKE for the integrated EAP server | ||||
|  #CONFIG_EAP_SAKE=y | ||||
| diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh | ||||
| index 45a49b8faa..06d6c579af 100644 | ||||
| index 45a49b8faa..ee9827b092 100644 | ||||
| --- a/package/network/services/hostapd/files/hostapd.sh | ||||
| +++ b/package/network/services/hostapd/files/hostapd.sh | ||||
| @@ -49,6 +49,7 @@ hostapd_append_wpa_key_mgmt() { | ||||
| @@ -302,6 +302,15 @@ index 45a49b8faa..06d6c579af 100644 | ||||
|  } | ||||
|   | ||||
|  hostapd_set_vlan_file() { | ||||
| @@ -384,7 +411,7 @@ append_iw_anqp_3gpp_cell_net() { | ||||
|  	if [ -z "$iw_anqp_3gpp_cell_net_conf" ]; then | ||||
|  		iw_anqp_3gpp_cell_net_conf="$1" | ||||
|  	else | ||||
| -		iw_anqp_3gpp_cell_net_conf="$iw_anqp_3gpp_cell_net_conf:$1" | ||||
| +		iw_anqp_3gpp_cell_net_conf="$iw_anqp_3gpp_cell_net_conf;$1" | ||||
|  	fi | ||||
|  } | ||||
|   | ||||
| @@ -396,10 +423,22 @@ append_iw_nai_realm() { | ||||
|  	[ -n "$1" ] && append bss_conf "nai_realm=$1" "$N" | ||||
|  } | ||||
|   | ||||
| @@ -6,7 +6,7 @@ PKG_RELEASE:=1 | ||||
| PKG_SOURCE_URL=https://github.com/blogic/ucentral-schema.git | ||||
| PKG_SOURCE_PROTO:=git | ||||
| PKG_SOURCE_DATE:=2021-02-15 | ||||
| PKG_SOURCE_VERSION:=978604e4720dcdec388171ea3b037c2ed7e19aab | ||||
| PKG_SOURCE_VERSION:=1c6efe8d91a429eb24683357145531093de240d4 | ||||
|  | ||||
| PKG_MAINTAINER:=John Crispin <john@phrozen.org> | ||||
| PKG_LICENSE:=BSD-3-Clause | ||||
|   | ||||
| @@ -0,0 +1,80 @@ | ||||
| { | ||||
| 	"uuid": 2, | ||||
| 	"radios": [ | ||||
| 		{ | ||||
| 			"band": "2G", | ||||
| 			"country": "CA", | ||||
| 			"channel-mode": "HE", | ||||
| 			"channel-width": 80, | ||||
| 			"channel": 32 | ||||
| 		} | ||||
| 	], | ||||
|  | ||||
| 	"interfaces": [ | ||||
| 		{ | ||||
| 			"name": "WAN", | ||||
| 			"role": "upstream", | ||||
| 			"wwan": { | ||||
| 				"protocol": "qmi", | ||||
| 				"pin-code": "7846", | ||||
| 				"access-point-name": "web.vodafone.de", | ||||
| 				"packet-data-protocol": "dual-stack", | ||||
| 				"authentication-type": "none" | ||||
| 			} | ||||
| 		}, | ||||
| 		{ | ||||
| 			"name": "LAN", | ||||
| 			"role": "downstream", | ||||
| 			"services": [ "ssh", "lldp" ], | ||||
| 			"ethernet": [ | ||||
| 				{ | ||||
| 					"select-ports": [ | ||||
| 						"LAN*" | ||||
| 					] | ||||
| 				} | ||||
| 			], | ||||
| 			"ipv4": { | ||||
| 				"addressing": "static", | ||||
| 				"subnet": "192.168.1.1/24", | ||||
| 				"dhcp": { | ||||
| 					"lease-first": 10, | ||||
| 					"lease-count": 100, | ||||
| 					"lease-time": "6h" | ||||
| 				} | ||||
| 			}, | ||||
| 			"ssids": [ | ||||
| 				{ | ||||
| 					"name": "OpenWifi", | ||||
| 					"wifi-bands": [ | ||||
| 						"2G" | ||||
| 					], | ||||
| 					"bss-mode": "ap", | ||||
| 					"encryption": { | ||||
| 						"proto": "psk2", | ||||
| 						"key": "OpenWifi", | ||||
| 						"ieee80211w": "optional" | ||||
| 					} | ||||
| 				} | ||||
| 			] | ||||
|  | ||||
| 		} | ||||
| 	], | ||||
| 	"metrics": { | ||||
| 		"statistics": { | ||||
| 			"interval": 120, | ||||
| 			"types": [ "ssids", "lldp", "clients" ] | ||||
| 		}, | ||||
| 		"health": { | ||||
| 			"interval": 120 | ||||
| 		} | ||||
| 	}, | ||||
| 	"services": { | ||||
| 		"lldp": { | ||||
| 			"describe": "uCentral", | ||||
| 			"location": "universe" | ||||
| 		}, | ||||
| 		"ssh": { | ||||
| 			"port": 22 | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
| @@ -411,7 +411,7 @@ append_iw_anqp_3gpp_cell_net() { | ||||
| 	if [ -z "$iw_anqp_3gpp_cell_net_conf" ]; then | ||||
| 		iw_anqp_3gpp_cell_net_conf="$1" | ||||
| 	else | ||||
| 		iw_anqp_3gpp_cell_net_conf="$iw_anqp_3gpp_cell_net_conf:$1" | ||||
| 		iw_anqp_3gpp_cell_net_conf="$iw_anqp_3gpp_cell_net_conf;$1" | ||||
| 	fi | ||||
| } | ||||
|  | ||||
|   | ||||
							
								
								
									
										475
									
								
								patches/0037-ipq4018-add-EdgeCore-SPW2AC1200-support.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										475
									
								
								patches/0037-ipq4018-add-EdgeCore-SPW2AC1200-support.patch
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,475 @@ | ||||
| From c651355c099a42c12f1953f4d027b32172a45bbb Mon Sep 17 00:00:00 2001 | ||||
| From: John Crispin <john@phrozen.org> | ||||
| Date: Thu, 1 Jul 2021 16:37:24 +0200 | ||||
| Subject: [PATCH] ipq4018: add EdgeCore SPW2AC1200 support | ||||
|  | ||||
| Signed-off-by: John Crispin <john@phrozen.org> | ||||
| --- | ||||
|  package/boot/uboot-envtools/files/ipq40xx     |   1 + | ||||
|  .../ipq40xx/base-files/etc/board.d/01_leds    |   1 + | ||||
|  .../ipq40xx/base-files/etc/board.d/02_network |   1 + | ||||
|  .../etc/hotplug.d/firmware/11-ath10k-caldata  |   2 + | ||||
|  .../base-files/lib/upgrade/platform.sh        |   4 +- | ||||
|  .../arm/boot/dts/qcom-ipq4018-spw2ac1200.dts  | 332 ++++++++++++++++++ | ||||
|  target/linux/ipq40xx/image/generic.mk         |  13 + | ||||
|  .../901-arm-boot-add-dts-files.patch          |   3 +- | ||||
|  8 files changed, 355 insertions(+), 2 deletions(-) | ||||
|  create mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-spw2ac1200.dts | ||||
|  | ||||
| diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx | ||||
| index b24cbf979e..ac66a7f2bd 100644 | ||||
| --- a/package/boot/uboot-envtools/files/ipq40xx | ||||
| +++ b/package/boot/uboot-envtools/files/ipq40xx | ||||
| @@ -34,6 +34,7 @@ case "$board" in | ||||
|  alfa-network,ap120c-ac |\ | ||||
|  devolo,magic-2-wifi-next |\ | ||||
|  edgecore,ecw5211 |\ | ||||
| +edgecore,spw2ac1200 |\ | ||||
|  glinet,gl-ap1300 |\ | ||||
|  glinet,gl-b1300 |\ | ||||
|  luma,wrtq-329acn |\ | ||||
| diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds | ||||
| index f9674126ba..efd5d002db 100755 | ||||
| --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds | ||||
| +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds | ||||
| @@ -63,6 +63,7 @@ qxwlan,e2600ac-c2) | ||||
|  	ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt" | ||||
|  	;; | ||||
|  edgecore,ecw5211 |\ | ||||
| +edgecore,spw2ac1200 |\ | ||||
|  cig,wf610d |\ | ||||
|  zyxel,nbg6617 |\ | ||||
|  zyxel,wre6606) | ||||
| diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network | ||||
| index 597fa9f08b..7bc8c5e6aa 100755 | ||||
| --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network | ||||
| +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network | ||||
| @@ -43,6 +43,7 @@ ipq40xx_setup_interfaces() | ||||
|  	cilab,meshpoint-one|\ | ||||
|  	cig,wf610d|\ | ||||
|  	edgecore,ecw5211|\ | ||||
| +	edgecore,spw2ac1200 |\ | ||||
|  	edgecore,oap100|\ | ||||
|  	openmesh,a42|\ | ||||
|  	openmesh,a62) | ||||
| diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | ||||
| index a9bbc791b8..da7931d018 100644 | ||||
| --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | ||||
| +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | ||||
| @@ -101,6 +101,7 @@ case "$FIRMWARE" in | ||||
|  	compex,wpj419 |\ | ||||
|  	compex,wpj428 |\ | ||||
|  	edgecore,ecw5211 |\ | ||||
| +	edgecore,spw2ac1200 |\ | ||||
|  	edgecore,oap100 |\ | ||||
|  	engenius,eap1300 |\ | ||||
|  	engenius,eap2200 |\ | ||||
| @@ -212,6 +213,7 @@ case "$FIRMWARE" in | ||||
|  	compex,wpj419 |\ | ||||
|  	compex,wpj428 |\ | ||||
|  	edgecore,ecw5211 |\ | ||||
| +	edgecore,spw2ac1200 |\ | ||||
|  	edgecore,oap100 |\ | ||||
|  	engenius,eap1300 |\ | ||||
|  	engenius,eap2200 |\ | ||||
| diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh | ||||
| index 530545e442..f6fc828134 100644 | ||||
| --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh | ||||
| +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh | ||||
| @@ -76,7 +76,9 @@ platform_do_upgrade() { | ||||
|  	tp-link,ec420-g1) | ||||
|  		nand_do_upgrade "$1" | ||||
|  		;; | ||||
| -	alfa-network,ap120c-ac) | ||||
| +	alfa-network,ap120c-ac|\ | ||||
| +	edgecore,spw2ac1200) | ||||
| +		mkdir -p /var/lock/ | ||||
|  		part="$(awk -F 'ubi.mtd=' '{printf $2}' /proc/cmdline | sed -e 's/ .*$//')" | ||||
|  		if [ "$part" = "rootfs1" ]; then | ||||
|  			fw_setenv active 2 || exit 1 | ||||
| diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-spw2ac1200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-spw2ac1200.dts | ||||
| new file mode 100644 | ||||
| index 0000000000..a152ba57f4 | ||||
| --- /dev/null | ||||
| +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-spw2ac1200.dts | ||||
| @@ -0,0 +1,332 @@ | ||||
| +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT | ||||
| + | ||||
| +#include "qcom-ipq4019.dtsi" | ||||
| +#include <dt-bindings/gpio/gpio.h> | ||||
| +#include <dt-bindings/input/input.h> | ||||
| +#include <dt-bindings/soc/qcom,tcsr.h> | ||||
| + | ||||
| +/ { | ||||
| +	model = "Edgecore SPW2AC1200"; | ||||
| +	compatible = "edgecore,spw2ac1200"; | ||||
| + | ||||
| +	aliases { | ||||
| +		led-boot = &led_power; | ||||
| +		led-failsafe = &led_power; | ||||
| +		led-running = &led_power; | ||||
| +		led-upgrade = &led_power; | ||||
| +		label-mac-device = &gmac0; | ||||
| +	}; | ||||
| + | ||||
| +	chosen { | ||||
| +		bootargs-append = " root="; | ||||
| +	}; | ||||
| + | ||||
| +	keys { | ||||
| +		compatible = "gpio-keys"; | ||||
| + | ||||
| +		reset { | ||||
| +			label = "reset"; | ||||
| +			gpios = <&tlmm 63 GPIO_ACTIVE_LOW>; | ||||
| +			linux,code = <KEY_RESTART>; | ||||
| +		}; | ||||
| +	}; | ||||
| + | ||||
| +	leds { | ||||
| +		compatible = "gpio-leds"; | ||||
| + | ||||
| +		led_power: power { | ||||
| +			label = "yellow:power"; | ||||
| +			gpios = <&tlmm 5 GPIO_ACTIVE_LOW>; | ||||
| +		}; | ||||
| + | ||||
| +		wlan2g { | ||||
| +			label = "green:wlan2g"; | ||||
| +			gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; | ||||
| +			linux,default-trigger = "phy0tpt"; | ||||
| +		}; | ||||
| + | ||||
| +		wlan5g { | ||||
| +			label = "green:wlan5g"; | ||||
| +			gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; | ||||
| +			linux,default-trigger = "phy1tpt"; | ||||
| +		}; | ||||
| +	}; | ||||
| + | ||||
| +	soc { | ||||
| +		rng@22000 { | ||||
| +			status = "okay"; | ||||
| +		}; | ||||
| + | ||||
| +		ess-psgmii@98000 { | ||||
| +			status = "okay"; | ||||
| +		}; | ||||
| + | ||||
| +		counter@4a1000 { | ||||
| +			compatible = "qcom,qca-gcnt"; | ||||
| +			reg = <0x4a1000 0x4>; | ||||
| +		}; | ||||
| + | ||||
| +		tcsr@1949000 { | ||||
| +			compatible = "qcom,tcsr"; | ||||
| +			reg = <0x1949000 0x100>; | ||||
| +			qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>; | ||||
| +		}; | ||||
| + | ||||
| +		tcsr@194b000 { | ||||
| +			compatible = "qcom,tcsr"; | ||||
| +			reg = <0x194b000 0x100>; | ||||
| +			qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>; | ||||
| +		}; | ||||
| + | ||||
| +		ess_tcsr@1953000 { | ||||
| +			compatible = "qcom,tcsr"; | ||||
| +			reg = <0x1953000 0x1000>; | ||||
| +			qcom,ess-interface-select = <TCSR_ESS_PSGMII>; | ||||
| +		}; | ||||
| + | ||||
| +		tcsr@1957000 { | ||||
| +			compatible = "qcom,tcsr"; | ||||
| +			reg = <0x1957000 0x100>; | ||||
| +			qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>; | ||||
| +		}; | ||||
| + | ||||
| +		usb2@60f8800 { | ||||
| +			status = "okay"; | ||||
| +		}; | ||||
| + | ||||
| +		usb3@8af8800 { | ||||
| +			status = "okay"; | ||||
| + | ||||
| +			dwc3@8a00000 { | ||||
| +				phys = <&usb3_hs_phy>; | ||||
| +				phy-names = "usb2-phy"; | ||||
| +			}; | ||||
| +		}; | ||||
| + | ||||
| +		crypto@8e3a000 { | ||||
| +			status = "okay"; | ||||
| +		}; | ||||
| + | ||||
| +		watchdog@b017000 { | ||||
| +			status = "okay"; | ||||
| +		}; | ||||
| + | ||||
| +		ess-switch@c000000 { | ||||
| +			status = "okay"; | ||||
| + | ||||
| +			switch_lan_bmp = <0x10>; | ||||
| +			switch_wan_bmp = <0x20>; | ||||
| +		}; | ||||
| + | ||||
| +		edma@c080000 { | ||||
| +			status = "okay"; | ||||
| +		}; | ||||
| +	}; | ||||
| +}; | ||||
| + | ||||
| +&tlmm { | ||||
| +	mdio_pins: mdio_pinmux { | ||||
| +		mux_mdio { | ||||
| +			pins = "gpio53"; | ||||
| +			function = "mdio"; | ||||
| +			bias-pull-up; | ||||
| +		}; | ||||
| + | ||||
| +		mux_mdc { | ||||
| +			pins = "gpio52"; | ||||
| +			function = "mdc"; | ||||
| +			bias-pull-up; | ||||
| +		}; | ||||
| +	}; | ||||
| + | ||||
| +	serial_pins: serial_pinmux { | ||||
| +		mux { | ||||
| +			pins = "gpio60", "gpio61"; | ||||
| +			function = "blsp_uart0"; | ||||
| +			bias-disable; | ||||
| +		}; | ||||
| +	}; | ||||
| + | ||||
| +	spi0_pins: spi0_pinmux { | ||||
| +		pin { | ||||
| +			function = "blsp_spi0"; | ||||
| +			pins = "gpio55", "gpio56", "gpio57"; | ||||
| +			drive-strength = <2>; | ||||
| +			bias-disable; | ||||
| +		}; | ||||
| + | ||||
| +		pin_cs { | ||||
| +			function = "gpio"; | ||||
| +			pins = "gpio54", "gpio4"; | ||||
| +			drive-strength = <2>; | ||||
| +			bias-disable; | ||||
| +			output-high; | ||||
| +		}; | ||||
| +	}; | ||||
| + | ||||
| +	i2c0_pins: i2c0_pinmux { | ||||
| +		mux_i2c { | ||||
| +			function = "blsp_i2c0"; | ||||
| +			pins = "gpio58", "gpio59"; | ||||
| +			drive-strength = <16>; | ||||
| +			bias-disable; | ||||
| +		}; | ||||
| +	}; | ||||
| +}; | ||||
| + | ||||
| +&blsp_dma { | ||||
| +	status = "okay"; | ||||
| +}; | ||||
| + | ||||
| +&blsp1_spi1 { | ||||
| +	status = "okay"; | ||||
| + | ||||
| +	pinctrl-0 = <&spi0_pins>; | ||||
| +	pinctrl-names = "default"; | ||||
| +	cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>, <&tlmm 4 GPIO_ACTIVE_HIGH>; | ||||
| + | ||||
| +	flash@0 { | ||||
| +		compatible = "jedec,spi-nor"; | ||||
| +		reg = <0>; | ||||
| +		spi-max-frequency = <24000000>; | ||||
| + | ||||
| +		partitions { | ||||
| +			compatible = "fixed-partitions"; | ||||
| +			#address-cells = <1>; | ||||
| +			#size-cells = <1>; | ||||
| + | ||||
| +			partition@0 { | ||||
| +				label = "0:SBL1"; | ||||
| +				reg = <0x00000000 0x00040000>; | ||||
| +				read-only; | ||||
| +			}; | ||||
| + | ||||
| +			partition@40000 { | ||||
| +				label = "0:MIBIB"; | ||||
| +				reg = <0x00040000 0x00020000>; | ||||
| +				read-only; | ||||
| +			}; | ||||
| + | ||||
| +			partition@60000 { | ||||
| +				label = "0:QSEE"; | ||||
| +				reg = <0x00060000 0x00060000>; | ||||
| +				read-only; | ||||
| +			}; | ||||
| + | ||||
| +			partition@c0000 { | ||||
| +				label = "0:CDT"; | ||||
| +				reg = <0x000c0000 0x00010000>; | ||||
| +				read-only; | ||||
| +			}; | ||||
| + | ||||
| +			partition@d0000 { | ||||
| +				label = "0:DDRPARAMS"; | ||||
| +				reg = <0x000d0000 0x00010000>; | ||||
| +				read-only; | ||||
| +			}; | ||||
| + | ||||
| +			partition@e0000 { | ||||
| +				label = "0:APPSBLENV"; /* uboot env */ | ||||
| +				reg = <0x000e0000 0x00010000>; | ||||
| +			}; | ||||
| + | ||||
| +			partition@f0000 { | ||||
| +				label = "0:APPSBL"; /* uboot */ | ||||
| +				reg = <0x000f0000 0x00080000>; | ||||
| +				read-only; | ||||
| +			}; | ||||
| + | ||||
| +			partition@170000 { | ||||
| +				label = "0:ART"; | ||||
| +				reg = <0x00170000 0x00010000>; | ||||
| +				read-only; | ||||
| +			}; | ||||
| + | ||||
| +			partition@180000 { | ||||
| +				label = "certificates"; | ||||
| +				reg = <0x00180000 0x00010000>; | ||||
| +			}; | ||||
| +		}; | ||||
| +	}; | ||||
| + | ||||
| +	flash@1 { | ||||
| +		compatible = "spi-nand"; | ||||
| +		reg = <1>; | ||||
| +		spi-max-frequency = <24000000>; | ||||
| + | ||||
| +		partitions { | ||||
| +			compatible = "fixed-partitions"; | ||||
| +			#address-cells = <1>; | ||||
| +			#size-cells = <1>; | ||||
| + | ||||
| +			partition@0 { | ||||
| +				label = "rootfs1"; | ||||
| +				reg = <0x00000000 0x04000000>; | ||||
| +			}; | ||||
| + | ||||
| +			partition@4000000 { | ||||
| +				label = "rootfs2"; | ||||
| +				reg = <0x04000000 0x04000000>; | ||||
| +			}; | ||||
| +		}; | ||||
| +	}; | ||||
| +}; | ||||
| + | ||||
| +&blsp1_i2c3 { | ||||
| +	status = "okay"; | ||||
| + | ||||
| +	pinctrl-0 = <&i2c0_pins>; | ||||
| +	pinctrl-names = "default"; | ||||
| + | ||||
| +	tpm@29 { | ||||
| +		compatible = "atmel,at97sc3204t"; | ||||
| +		reg = <0x29>; | ||||
| +	}; | ||||
| +}; | ||||
| + | ||||
| +&blsp1_uart1 { | ||||
| +	status = "okay"; | ||||
| + | ||||
| +	pinctrl-0 = <&serial_pins>; | ||||
| +	pinctrl-names = "default"; | ||||
| +}; | ||||
| + | ||||
| +&cryptobam { | ||||
| +	status = "okay"; | ||||
| +}; | ||||
| + | ||||
| +&mdio { | ||||
| +	status = "okay"; | ||||
| + | ||||
| +	pinctrl-0 = <&mdio_pins>; | ||||
| +	pinctrl-names = "default"; | ||||
| +}; | ||||
| + | ||||
| +&gmac0 { | ||||
| +	qcom,poll_required = <1>; | ||||
| +	qcom,phy_mdio_addr = <4>; | ||||
| +	vlan_tag = <2 0x20>; | ||||
| +}; | ||||
| + | ||||
| +&gmac1 { | ||||
| +	qcom,poll_required = <1>; | ||||
| +	qcom,phy_mdio_addr = <3>; | ||||
| +	vlan_tag = <1 0x10>; | ||||
| +}; | ||||
| + | ||||
| +&wifi0 { | ||||
| +	status = "okay"; | ||||
| +}; | ||||
| + | ||||
| +&wifi1 { | ||||
| +	status = "okay"; | ||||
| +	qcom,ath10k-calibration-variant = "ALFA-Network-AP120C-AC"; | ||||
| +}; | ||||
| + | ||||
| +&usb3_hs_phy { | ||||
| +	status = "okay"; | ||||
| +}; | ||||
| + | ||||
| +&usb2_hs_phy { | ||||
| +	status = "okay"; | ||||
| +}; | ||||
| diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk | ||||
| index ee648edc50..e4e437bb95 100644 | ||||
| --- a/target/linux/ipq40xx/image/generic.mk | ||||
| +++ b/target/linux/ipq40xx/image/generic.mk | ||||
| @@ -376,6 +376,19 @@ define Device/edgecore_ecw5211 | ||||
|  endef | ||||
|  TARGET_DEVICES += edgecore_ecw5211 | ||||
|   | ||||
| +define Device/edgecore_spw2ac1200 | ||||
| +	$(call Device/FitImage) | ||||
| +	$(call Device/UbiFit) | ||||
| +	DEVICE_VENDOR := Edgecore | ||||
| +	DEVICE_MODEL := SPW2AC1200 | ||||
| +	SOC := qcom-ipq4018 | ||||
| +	BLOCKSIZE := 128k | ||||
| +	PAGESIZE := 2048 | ||||
| +	DEVICE_DTS_CONFIG := config@ap.dk01.1-c2 | ||||
| +	DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools kmod-usb-net kmod-usb-net-cdc-qmi uqmi | ||||
| +endef | ||||
| +TARGET_DEVICES += edgecore_spw2ac1200 | ||||
| + | ||||
|  define Device/edgecore_oap100 | ||||
|  	$(call Device/FitImage) | ||||
|  	$(call Device/UbiFit) | ||||
| diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch | ||||
| index aec0d01ed6..492cc67b2c 100644 | ||||
| --- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch | ||||
| +++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch | ||||
| @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org> | ||||
|   | ||||
|  --- a/arch/arm/boot/dts/Makefile | ||||
|  +++ b/arch/arm/boot/dts/Makefile | ||||
| -@@ -837,11 +837,59 @@ dtb-$(CONFIG_ARCH_QCOM) += \ | ||||
| +@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \ | ||||
|   	qcom-apq8074-dragonboard.dtb \ | ||||
|   	qcom-apq8084-ifc6540.dtb \ | ||||
|   	qcom-apq8084-mtp.dtb \ | ||||
| @@ -22,6 +22,7 @@ Signed-off-by: John Crispin <john@phrozen.org> | ||||
|  +	qcom-ipq4018-ea6350v3.dtb \ | ||||
|  +	qcom-ipq4018-eap1300.dtb \ | ||||
|  +	qcom-ipq4018-ecw5211.dtb \ | ||||
| ++	qcom-ipq4018-spw2ac1200.dtb \ | ||||
|  +	qcom-ipq4018-emd1.dtb \ | ||||
|  +	qcom-ipq4018-emr3500.dtb \ | ||||
|  +	qcom-ipq4018-ens620ext.dtb \ | ||||
| --  | ||||
| 2.25.1 | ||||
|  | ||||
							
								
								
									
										35
									
								
								patches/0038-Revert-libusb-update-to-1.0.24.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								patches/0038-Revert-libusb-update-to-1.0.24.patch
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,35 @@ | ||||
| From 4f4e6eec1cab67d6cea9bfa61da5fbbd1a21fdee Mon Sep 17 00:00:00 2001 | ||||
| From: John Crispin <john@phrozen.org> | ||||
| Date: Fri, 2 Jul 2021 12:02:04 +0200 | ||||
| Subject: [PATCH] Revert "libusb: update to 1.0.24" | ||||
|  | ||||
| This reverts commit 0798b13d7df0deafd005b14d52420c4f480d146e. | ||||
| --- | ||||
|  package/libs/libusb/Makefile | 6 +++--- | ||||
|  1 file changed, 3 insertions(+), 3 deletions(-) | ||||
|  | ||||
| diff --git a/package/libs/libusb/Makefile b/package/libs/libusb/Makefile | ||||
| index e931536339..1667fb2840 100644 | ||||
| --- a/package/libs/libusb/Makefile | ||||
| +++ b/package/libs/libusb/Makefile | ||||
| @@ -8,14 +8,14 @@ | ||||
|  include $(TOPDIR)/rules.mk | ||||
|   | ||||
|  PKG_NAME:=libusb | ||||
| -PKG_VERSION:=1.0.24 | ||||
| -PKG_RELEASE:=1 | ||||
| +PKG_VERSION:=1.0.22 | ||||
| +PKG_RELEASE:=2 | ||||
|   | ||||
|  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 | ||||
|  PKG_SOURCE_URL:=\ | ||||
|    https://github.com/libusb/libusb/releases/download/v$(PKG_VERSION) \ | ||||
|    @SF/$(PKG_NAME) | ||||
| -PKG_HASH:=7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a | ||||
| +PKG_HASH:=75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157 | ||||
|   | ||||
|  PKG_MAINTAINER:= Felix Fietkau <nbd@nbd.name> | ||||
|  PKG_LICENSE:=LGPL-2.1-or-later | ||||
| --  | ||||
| 2.25.1 | ||||
|  | ||||
							
								
								
									
										16
									
								
								profiles/edgecore_spw2ac1200.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								profiles/edgecore_spw2ac1200.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,16 @@ | ||||
| --- | ||||
| profile: edgecore_spw2ac1200 | ||||
| target: ipq40xx | ||||
| subtarget: generic | ||||
| description: Build image for the Edgecore spw2ac1200 | ||||
| image: bin/targets/ipq40xx/generic/openwrt-ipq40xx-generic-edgecore_spw2ac1200-squashfs-nand-sysupgrade.bin | ||||
| include: | ||||
|   - ucentral-ap | ||||
| packages: | ||||
|   - ath10k-firmware-qca4019-ct-htt | ||||
|   - ath10k-firmware-qca9888-ct-htt | ||||
|   - ath10k-firmware-qca9984-ct-htt | ||||
| diffconfig: | | ||||
|   # CONFIG_PACKAGE_ath10k-firmware-qca4019-ct is not set | ||||
|   # CONFIG_PACKAGE_ath10k-firmware-qca9888-ct is not set | ||||
|   # CONFIG_PACKAGE_ath10k-firmware-qca9984-ct is not set | ||||
							
								
								
									
										6
									
								
								profiles/wwan.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								profiles/wwan.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| --- | ||||
| description: Add the WWAN dependencies | ||||
| packages: | ||||
|   - umbim | ||||
|   - uqmi | ||||
|   - usb-modeswitch | ||||
		Reference in New Issue
	
	Block a user
	 John Crispin
					John Crispin