OpenWrt v22.03.0-rc3: adjust config defaults

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
ath79: NanoBeam M5 fix target_devices
2022-05-27 12:09:29 +02:00 · 2022-05-21 20:52:39 +02:00 · 2022-05-21 20:52:30 +02:00 · 2022-05-21 18:36:24 +02:00
7 changed files with 43 additions and 9 deletions
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,4 +1,4 @@
-src-git-full packages https://git.openwrt.org/feed/packages.git^b708cf5a17a1498b02c3ca4fd66f99aba3773c9c
+src-git-full packages https://git.openwrt.org/feed/packages.git^f263b042af593e64269aa0b926fce71af0fe0b57
 src-git-full luci https://git.openwrt.org/project/luci.git^d8ecf48f20da632af86def0f18093861c522914b
-src-git-full routing https://git.openwrt.org/feed/routing.git^f6d2b09643dfdc3b3916cb116ebc3f45a058fae6
+src-git-full routing https://git.openwrt.org/feed/routing.git^b7a8391b772344d51fd2a966d508b15d9ee30154
 src-git-full telephony https://git.openwrt.org/feed/telephony.git^4c148548df2aae3c036a5e309ff0474dbb1f48ac
--- a/include/version.mk
+++ b/include/version.mk
@@ -23,13 +23,13 @@ PKG_CONFIG_DEPENDS += \
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))

 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03.0-rc2)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),22.03.0-rc3)

 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19374-34b6abf5a8)
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19378-9f415792e1)

 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03.0-rc2)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/22.03.0-rc3)

 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -183,7 +183,7 @@ if VERSIONOPT
 	config VERSION_REPO
 		string
 		prompt "Release repository"
-		default "https://downloads.openwrt.org/releases/22.03-SNAPSHOT"
+		default "https://downloads.openwrt.org/releases/22.03.0-rc3"
 		help
 			This is the repository address embedded in the image, it defaults
 			to the trunk snapshot repo; the url may contain the following placeholders:
@@ -259,7 +259,7 @@ if VERSIONOPT
 	config VERSION_CODE_FILENAMES
 		bool
 		prompt "Revision code in filenames"
-		default y
+		default n
 		help
 			Enable this to include the revision identifier or the configured
 			version code into the firmware image, SDK- and Image Builder archive
--- a/target/linux/ath79/dts/ar9342_ubnt_nanobeam-m5-xw.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_nanobeam-m5-xw.dts
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "ar9342_ubnt_xw.dtsi"
+
+/ {
+	compatible = "ubnt,nanobeam-m5-xw", "ubnt,xw", "qca,ar9342";
+	model = "Ubiquiti NanoBeam M5 (XW)";
+};
+
+&mdio0 {
+	status = "okay";
+
+	phy-mask = <0x1>;
+
+	phy1: ethernet-phy@1 {
+		reg = <1>;
+		phy-mode = "mii";
+		reset-gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+
+	phy-handle = <&phy1>;
+};
--- a/target/linux/ath79/image/generic-ubnt.mk
+++ b/target/linux/ath79/image/generic-ubnt.mk
@@ -255,6 +255,14 @@ define Device/ubnt_nanobeam-ac-xc
 endef
 TARGET_DEVICES += ubnt_nanobeam-ac-xc

+define Device/ubnt_nanobeam-m5-xw
+  $(Device/ubnt-xw)
+  DEVICE_MODEL := NanoBeam M5
+  DEVICE_PACKAGES += rssileds
+  SUPPORTED_DEVICES += loco-m-xw
+endef
+TARGET_DEVICES += ubnt_nanobeam-m5-xw
+
 define Device/ubnt_nanobridge-m
  $(Device/ubnt-xm)
  SOC := ar7241
--- a/2
+++ b/2
@@ -1 +1 @@
-r19374-34b6abf5a8
+r19378-9f415792e1
--- a/version.date
+++ b/version.date
@@ -1 +1 @@
-1653140740
+1653159159
Author	SHA1	Message	Date
Hauke Mehrtens	f0e0bcba5e	OpenWrt v22.03.0-rc3: adjust config defaults Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>	2022-05-27 12:09:29 +02:00
Jan-Niklas Burfeind	9f415792e1	ath79: NanoBeam M5 fix target_devices Update the name of for the Ubiquiti NanoBeam M5 to match the auto-generated one at runtime. Otherwise sysupgrade complains about mismatching device names. This also required renaming the DTS. Signed-off-by: Jan-Niklas Burfeind <git@aiyionpri.me> (cherry picked from commit `21a3ce97d5`)	2022-05-21 20:52:39 +02:00
Jan-Niklas Burfeind	d9cb31f944	ath79: add support for Ubiquiti NanoBeam M5 Ubiquiti NanoBeam M5 devices are CPE equipment for customer locations with one Ethernet port and a 5 GHz 300Mbps wireless interface. Specificatons: - Atheros AR9342 - 535 MHz CPU - 64 MB RAM - 8 MB Flash - 1x 10/100 Mbps Ethernet with passive PoE input (24 V) - 6 LEDs of which four are rssi - 1 reset button - UART (4-pin) header on PCB Notes: The device was supported by OpenWrt in ar71xx. Flash instructions (web/ssh/tftp): Loading the image via ssh vias a stock firmware prior "AirOS 5.6". Downgrading stock is possible. * Flashing is possible via AirOS software update page: The "factory" ROM image is recognized as non-native and then installed correctly. AirOS warns to better be familiar with the recovery procedure. * Flashing can be done via ssh, which is becoming difficult due to legacy keyexchange methods. This is an exempary ssh-config: KexAlgorithms +diffie-hellman-group1-sha1 HostKeyAlgorithms ssh-rsa PubkeyAcceptedKeyTypes ssh-rsa User ubnt The password is ubnt. Connecting via IPv6 link local worked best for me. 1. scp the factory image to /tmp 2. fwupdate.real -m /tmp/firmware_image_file.bin -d * Alternatively tftp is possible: 1. Configure PC with static IP 192.168.1.2/24. 2. Enter the rescue mode. Power off the device, push the reset button on the device (or the PoE) and keep it pressed. Power on the device, while still pushing the reset button. 3. When all the leds blink at the same time, release the reset button. 4. Upload the firmware image file via TFTP: tftp 192.168.1.20 tftp> bin tftp> trace Packet tracing on. tftp> put firmware_image.bin Signed-off-by: Jan-Niklas Burfeind <git@aiyionpri.me> (cherry picked from commit `4cd3ff8a79`)	2022-05-21 20:52:30 +02:00
Paul Spooren	fca0069247	OpenWrt v22.03.0-rc2: revert to branch defaults Signed-off-by: Paul Spooren <mail@aparcar.org>	2022-05-21 18:36:24 +02:00