[OpenWrt-Devel] [PATCHv2] tools/scons: update scons to 3.1.1
Signed-off-by: Russell Senior --- tools/scons/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/scons/Makefile b/tools/scons/Makefile index 5ec6554165..a9f2507835 100644 --- a/tools/scons/Makefile +++ b/tools/scons/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=scons -PKG_VERSION:=3.0.5 +PKG_VERSION:=3.1.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/scons \ http://fossies.org/linux/misc/ -PKG_HASH:=df676f23dc6d4bfa384fc389d95dcd21ab907e6349d4c848958ba4befb73c73e +PKG_HASH:=4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5 include $(INCLUDE_DIR)/host-build.mk -- 2.22.0 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Commas in imagenames
I just stumbled over 2 imagenames with commas in them and was wondering if this is correct or an error during the build process: http://downloads.openwrt.org/snapshots/targets/mediatek/32/openwrt-mediatek- 32-bananapi,bpi-r2-sysupgrade.tar http://downloads.openwrt.org/snapshots/targets/mediatek/32/openwrt-mediatek- 32-mediatek,mt7623a-rfb-emmc-sysupgrade.tar ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCHv2] tools/scons: update scons to 3.1.1
It would be nice if you could include commit description[1] and patch changelog[2] (what was changed/fixed in the v2 of the patch) next time. 1. https://openwrt.org/submitting-patches#submitting_patches 2. https://openwrt.org/submitting-patches#the_canonical_patch_format look for `patch changelogs` -- ynezz ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v4 0/5] ath79: add support for some Netgear WNR routers
This patchset enables ath79 target for following Netgear ar724x-based routers currently supported by ar71xx: * Netgear WNR1000v2 (tiny, 4_32) * Netgear WNR2000v3 (tiny, 4_32) * Netgear WNR2200 (generic, 8_64 + USB) and improves existing support for: * Netgear WNR612v2 (tiny, 4_32) For all above routers, MAC address printed on device label is for LAN interface (eth1, ART offset 0x6). The goal was to provide full functionality in ath79, on a par with ar71xx target. The only minor change is renaming 'netgear:amber:test' LED to 'netgear:amber:power' where applicable (apparently no one defines them as 'test' nowadays). Patched images were successfully flashed to respective devices and are confirmed to work. Patch #1 is a prerequisite. It adds DT flags to control network LEDs and clocks - in ar71xx these get disabled at setup phase in mach-*.c files. Now ath79 target can do this as well and provide sysfs access to LAN/WAN amber and green diodes. Changes from v3: * dts: 'mtd-cal-data' removed * dts: extra spaces removed * dts: 'usb-power' changed to 'usb_power' Patch list (5): ath79: add LAN LEDs control bits for AR724x GPIO function pinmux ath79: WNR612v2: improve device support ath79: add support for Netgear WNR2000 v3 ath79: add support for Netgear WNR1000 v2 ath79: add support for Netgear WNR2200 .../ath79/base-files/etc/board.d/01_leds | 14 ++ .../ath79/base-files/etc/board.d/02_network | 3 + .../etc/hotplug.d/firmware/10-ath9k-eeprom| 3 + .../ath79/dts/ar7240_netgear_wnr1000-v2.dts | 206 +++ .../ath79/dts/ar7240_netgear_wnr612-v2.dts| 2 +- .../ath79/dts/ar7240_netgear_wnr612-v2.dtsi | 20 +- target/linux/ath79/dts/ar7240_on_n150r.dts| 2 +- .../ath79/dts/ar7241_netgear_wnr2000-v3.dts | 211 .../ath79/dts/ar7241_netgear_wnr2200.dts | 236 ++ target/linux/ath79/dts/ar724x.dtsi| 10 +- target/linux/ath79/image/generic.mk | 14 ++ target/linux/ath79/image/tiny-netgear.mk | 30 ++- 12 files changed, 741 insertions(+), 10 deletions(-) create mode 100644 target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts create mode 100644 target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts create mode 100644 target/linux/ath79/dts/ar7241_netgear_wnr2200.dts -- 2.22.0 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v4 5/5] ath79: add support for Netgear WNR2200
This patch adds ath79 support for Netgear WNR2200. Router was previously supported by ar71xx target only. Specification = * Description: Netgear WNR2200 * Loader: U-boot * SOC: Atheros AR7241 (360 MHz) * RAM: 64 MiB * Flash: 8 MiB (SPI NOR) - U-boot binary: 256 KiB - U-boot environment: 64 KiB - Firmware: 7808 KiB - ART: 64 KiB * Ethernet: 4 x 10/100 LAN + 1 x 10/100 WAN * Wireless: 2.4 GHz b/g/n (Atheros AR9287) * USB: yes, 1 x USB 2.0 * Buttons: - Reset - WiFi (rfkill) - WPS * LEDs: - Power (amber/green) - WAN (amber/green) - WLAN (blue) - 4 x LAN (amber/green) - WPS (green) * UART: 4-pin connector JP1, 3.3V (Vcc, TX, RX, GND), 115200 8N1 * Power supply: DC 12V 1.5A * MAC addresses: LAN on case label, WAN +1, WLAN +2 Installation * TFTP recovery * TFTP via U-boot prompt * sysupgrade * Web interface Test build configuration CONFIG_TARGET_ath79=y CONFIG_TARGET_ath79_generic=y CONFIG_TARGET_ath79_generic_DEVICE_netgear_wnr2200=y CONFIG_ALL_KMODS=y CONFIG_DEVEL=y CONFIG_CCACHE=y CONFIG_COLLECT_KERNEL_DEBUG=y CONFIG_IMAGEOPT=y CONFIG_KERNEL_DEBUG_INFO=y CONFIG_KERNEL_DEBUG_KERNEL=y Signed-off-by: Michal Cieslakiewicz --- .../ath79/base-files/etc/board.d/01_leds | 3 +- .../ath79/base-files/etc/board.d/02_network | 1 + .../etc/hotplug.d/firmware/10-ath9k-eeprom| 1 + .../ath79/dts/ar7241_netgear_wnr2200.dts | 236 ++ target/linux/ath79/image/generic.mk | 14 ++ 5 files changed, 254 insertions(+), 1 deletion(-) create mode 100644 target/linux/ath79/dts/ar7241_netgear_wnr2200.dts diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds b/target/linux/ath79/base-files/etc/board.d/01_leds index 7eca103a9e..82006efb6b 100755 --- a/target/linux/ath79/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/base-files/etc/board.d/01_leds @@ -104,7 +104,8 @@ glinet,gl-x750) ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" ;; netgear,wnr1000-v2|\ -netgear,wnr2000-v3) +netgear,wnr2000-v3|\ +netgear,wnr2200) ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0" ucidef_set_led_default "wan-green" "WAN (green)" "netgear:green:wan" "0" ucidef_set_led_switch "lan1green" "LAN1 (green)" "netgear:green:lan1" "switch0" "0x02" "0x04" diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index fe491d1c26..7d53f0a2fb 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -197,6 +197,7 @@ ath79_setup_interfaces() ;; netgear,wnr1000-v2|\ netgear,wnr2000-v3|\ + netgear,wnr2200|\ netgear,wnr612-v2|\ on,n150r|\ tplink,tl-wr740n-v1|\ diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index dbe53b6f64..044e6c0afd 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -167,6 +167,7 @@ case "$FIRMWARE" in ;; netgear,wnr1000-v2|\ netgear,wnr2000-v3|\ + netgear,wnr2200|\ netgear,wnr612-v2|\ on,n150r|\ pcs,cap324|\ diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dts new file mode 100644 index 00..d275dbf8d0 --- /dev/null +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dts @@ -0,0 +1,236 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "ar7241.dtsi" + +/ { + compatible = "netgear,wnr2200", "qca,ar7241"; + model = "Netgear WNR2200"; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + aliases { + led-boot = &power_amber; + led-failsafe = &power_amber; + led-running = &power_green; + led-upgrade = &power_amber; + }; + + keys { + compatible = "gpio-keys-polled"; + poll-interval = <20>; + + wps { + label = "wps"; + linux,code = ; + gpios = <&ath9k 5 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + linux,code = ; + gpios = <&ath9k 6 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + rfkill { + label = "rfkill"; + linux,code = ; + gpios = <&ath9k 3 GPI
[OpenWrt-Devel] [PATCH v4 4/5] ath79: add support for Netgear WNR1000 v2
This patch adds ath79 support for Netgear WNR1000v2. Router was previously supported by ar71xx target only. Note: this is a 4_32 device with limited upgrade capabilities. Specification = * Description: Netgear WNR1000 v2 * Loader: U-boot * SOC: Atheros AR7240 (340 MHz) * RAM: 32 MiB * Flash: 4 MiB (SPI NOR) - U-boot binary: 256 KiB - U-boot environment: 64 KiB - Firmware: 3712 KiB - ART: 64 KiB * Ethernet: 4 x 10/100 LAN + 1 x 10/100 WAN * Wireless: 2.4 GHz b/g/n (Atheros AR9285) * USB: no * Buttons: - Reset - WiFi (rfkill) - WPS * LEDs: - Power (amber/green) - WAN (amber/green) - WLAN (blue) - 4 x LAN (amber/green) - WPS (green) * UART: 4-pin connector JP2, 3.3V (Vcc, TX, RX, GND), 115200 8N1 * Power supply: DC 12V 1A * MAC addresses: LAN on case label, WAN +1, WLAN +2 Installation * TFTP recovery * TFTP via U-boot prompt * sysupgrade * Web interface Test build configuration CONFIG_TARGET_ath79=y CONFIG_TARGET_ath79_tiny=y CONFIG_TARGET_ath79_tiny_DEVICE_netgear_wnr1000-v2=y CONFIG_ALL_KMODS=y CONFIG_DEVEL=y CONFIG_CCACHE=y CONFIG_COLLECT_KERNEL_DEBUG=y CONFIG_IMAGEOPT=y CONFIG_KERNEL_DEBUG_INFO=y CONFIG_KERNEL_DEBUG_KERNEL=y Signed-off-by: Michal Cieslakiewicz --- .../ath79/base-files/etc/board.d/01_leds | 1 + .../ath79/base-files/etc/board.d/02_network | 1 + .../etc/hotplug.d/firmware/10-ath9k-eeprom| 1 + .../ath79/dts/ar7240_netgear_wnr1000-v2.dts | 206 ++ target/linux/ath79/image/tiny-netgear.mk | 12 + 5 files changed, 221 insertions(+) create mode 100644 target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds b/target/linux/ath79/base-files/etc/board.d/01_leds index 4e919e7576..7eca103a9e 100755 --- a/target/linux/ath79/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/base-files/etc/board.d/01_leds @@ -103,6 +103,7 @@ glinet,gl-ar300m-lite) glinet,gl-x750) ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" ;; +netgear,wnr1000-v2|\ netgear,wnr2000-v3) ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0" ucidef_set_led_default "wan-green" "WAN (green)" "netgear:green:wan" "0" diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index aff62274b6..fe491d1c26 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -195,6 +195,7 @@ ath79_setup_interfaces() ucidef_add_switch_port_attr "switch0" 2 led 9 ucidef_add_switch_port_attr "switch0" 5 led 2 ;; + netgear,wnr1000-v2|\ netgear,wnr2000-v3|\ netgear,wnr612-v2|\ on,n150r|\ diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 747c1aab58..dbe53b6f64 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -165,6 +165,7 @@ case "$FIRMWARE" in winchannel,wb2000) ath9k_eeprom_extract "art" 20480 1088 ;; + netgear,wnr1000-v2|\ netgear,wnr2000-v3|\ netgear,wnr612-v2|\ on,n150r|\ diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts new file mode 100644 index 00..8ae3f95d9d --- /dev/null +++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts @@ -0,0 +1,206 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "ar7240.dtsi" + +/ { + compatible = "netgear,wnr1000-v2", "qca,ar7240"; + model = "Netgear WNR1000 v2"; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + aliases { + led-boot = &power_amber; + led-failsafe = &power_amber; + led-running = &power_green; + led-upgrade = &power_amber; + }; + + keys { + compatible = "gpio-keys-polled"; + poll-interval = <20>; + + wps { + label = "wps"; + linux,code = ; + gpios = <&ath9k 6 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + linux,code = ; + gpios = <&ath9k 7 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + rfkill { + label = "rfkill"; + linux,code = ; +
[OpenWrt-Devel] [PATCH v4 1/5] ath79: add LAN LEDs control bits for AR724x GPIO function pinmux
Currently AR724x pinmux for register 0x18040028 controls only JTAG disable bit. This patch adds new DTS settings to control LAN LEDs and CLKs that allow full software control over these diodes - exactly the same is done by ar71xx target in device setup phase for many routers (WNR2000v3 for example). 'switch_led_disable_pins' clears AR724X_GPIO_FUNC_ETH_SWITCH_LED[0-4]_EN bits. 'clks_disable_pins' clears AR724X_GPIO_FUNC_CLK_OBS[1-5]_EN and AR724X_GPIO_FUNC_GE0_MII_CLK_EN bits. These all should be used together, along with 'jtag_disable_pins', to allow OS to control all GPIO-connected LEDs and buttons on device. Signed-off-by: Michal Cieslakiewicz --- target/linux/ath79/dts/ar724x.dtsi | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/target/linux/ath79/dts/ar724x.dtsi b/target/linux/ath79/dts/ar724x.dtsi index b2844bf179..95832d998a 100644 --- a/target/linux/ath79/dts/ar724x.dtsi +++ b/target/linux/ath79/dts/ar724x.dtsi @@ -75,7 +75,15 @@ #pinctrl-cells = <2>; jtag_disable_pins: pinmux_jtag_disable_pins { - pinctrl-single,bits = <0x0 0x1 0x1>; + pinctrl-single,bits = <0x0 0x1 0x1>; + }; + + switch_led_disable_pins: pinmux_switch_led_disable_pins { + pinctrl-single,bits = <0x0 0x0 0xf8>; + }; + + clks_disable_pins: pinmux_clks_disable_pins { + pinctrl-single,bits = <0x0 0x0 0x81f00>; }; }; -- 2.22.0 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v4 2/5] ath79: WNR612v2: improve device support
This patch improves ath79 support for Netgear WNR612v2. Router functionality becomes identical to ar71xx version. Changes include: * software control over LAN LEDs via sysfs * correct MAC addresses for network interfaces * correct image size in device definition * formatting adjustments to source DT files Signed-off-by: Michal Cieslakiewicz --- .../ath79/dts/ar7240_netgear_wnr612-v2.dts| 2 +- .../ath79/dts/ar7240_netgear_wnr612-v2.dtsi | 20 +-- target/linux/ath79/dts/ar7240_on_n150r.dts| 2 +- target/linux/ath79/image/tiny-netgear.mk | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dts index b3ceecf932..e6e3e8b6da 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dts +++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dts @@ -4,7 +4,7 @@ #include "ar7240_netgear_wnr612-v2.dtsi" / { - model = "Netgear WNR612 v2"; compatible = "netgear,wnr612-v2", "qca,ar7240"; + model = "Netgear WNR612 v2"; }; diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi index 8e934429a3..ec4d5d710f 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi +++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi @@ -28,6 +28,10 @@ leds { compatible = "gpio-leds"; + + pinctrl-names = "default"; + pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>; + power: power { label = "netgear:green:power"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; @@ -47,6 +51,10 @@ label = "netgear:green:wan"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; }; + }; + + ath9k-leds { + compatible = "gpio-leds"; wlan: wlan { label = "netgear:green:wlan"; @@ -70,7 +78,7 @@ #address-cells = <1>; #size-cells = <1>; - uboot: partition@0 { + partition@0 { reg = <0x0 0x4>; label = "u-boot"; read-only; @@ -87,7 +95,7 @@ label = "firmware"; }; - partition@3f { + art: partition@3f { reg = <0x3f 0x1>; label = "art"; read-only; @@ -99,15 +107,13 @@ ð0 { status = "okay"; - mtd-mac-address = <&uboot 0x1fc00>; - mtd-mac-address-increment = <(-1)>; + mtd-mac-address = <&art 0x0>; }; ð1 { status = "okay"; - mtd-mac-address = <&uboot 0x1fc00>; - mtd-mac-address-increment = <1>; + mtd-mac-address = <&art 0x6>; }; &pcie { @@ -116,6 +122,8 @@ ath9k: wifi@0,0 { compatible = "pci168c,002b"; reg = <0x 0 0 0 0>; + mtd-mac-address = <&art 0x0>; + mtd-mac-address-increment = <1>; qca,no-eeprom; #gpio-cells = <2>; gpio-controller; diff --git a/target/linux/ath79/dts/ar7240_on_n150r.dts b/target/linux/ath79/dts/ar7240_on_n150r.dts index a318846a83..886ac6dad5 100644 --- a/target/linux/ath79/dts/ar7240_on_n150r.dts +++ b/target/linux/ath79/dts/ar7240_on_n150r.dts @@ -4,7 +4,7 @@ #include "ar7240_netgear_wnr612-v2.dtsi" / { - model = "ON Network N150R"; compatible = "on,n150r", "qca,ar7240"; + model = "ON Network N150R"; }; diff --git a/target/linux/ath79/image/tiny-netgear.mk b/target/linux/ath79/image/tiny-netgear.mk index 67ef28c9cc..2f17d79757 100644 --- a/target/linux/ath79/image/tiny-netgear.mk +++ b/target/linux/ath79/image/tiny-netgear.mk @@ -4,7 +4,7 @@ define Device/netgear_ar7240 ATH_SOC := ar7240 NETGEAR_KERNEL_MAGIC := 0x32303631 KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma - IMAGE_SIZE := 3904k + IMAGE_SIZE := 3712k IMAGE/default := append-kernel | pad-to (BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs $(Device/netgear_ath79) endef -- 2.22.0 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v4 3/5] ath79: add support for Netgear WNR2000 v3
This patch adds ath79 support for Netgear WNR2000v3. Router was previously supported by ar71xx target only. Note: this is a 4_32 device with limited upgrade capabilities. Specification = * Description: Netgear WNR2000 v3 * Loader: U-boot * SOC: Atheros AR7241 (360 MHz) * RAM: 32 MiB * Flash: 4 MiB (SPI NOR) - U-boot binary: 256 KiB - U-boot environment: 64 KiB - Firmware: 3712 KiB - ART: 64 KiB * Ethernet: 4 x 10/100 LAN + 1 x 10/100 WAN * Wireless: 2.4 GHz b/g/n (Atheros AR9287) * USB: no * Buttons: - Reset - WiFi (rfkill) - WPS * LEDs: - Power (amber/green) - WAN (amber/green) - WLAN (blue) - 4 x LAN (amber/green) - WPS (green) * UART: 4-pin connector JP1, 3.3V (Vcc, TX, RX, GND), 115200 8N1 * Power supply: DC 12V 1A Installation * TFTP recovery * TFTP via U-boot prompt * sysupgrade * Web interface Test build configuration CONFIG_TARGET_ath79=y CONFIG_TARGET_ath79_tiny=y CONFIG_TARGET_ath79_tiny_DEVICE_netgear_wnr2000-v3=y CONFIG_ALL_KMODS=y CONFIG_DEVEL=y CONFIG_CCACHE=y CONFIG_COLLECT_KERNEL_DEBUG=y CONFIG_IMAGEOPT=y CONFIG_KERNEL_DEBUG_INFO=y CONFIG_KERNEL_DEBUG_KERNEL=y Signed-off-by: Michal Cieslakiewicz --- .../ath79/base-files/etc/board.d/01_leds | 12 + .../ath79/base-files/etc/board.d/02_network | 1 + .../etc/hotplug.d/firmware/10-ath9k-eeprom| 1 + .../ath79/dts/ar7241_netgear_wnr2000-v3.dts | 211 ++ target/linux/ath79/image/tiny-netgear.mk | 16 ++ 5 files changed, 241 insertions(+) create mode 100644 target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds b/target/linux/ath79/base-files/etc/board.d/01_leds index f1d738ba9f..4e919e7576 100755 --- a/target/linux/ath79/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/base-files/etc/board.d/01_leds @@ -103,6 +103,18 @@ glinet,gl-ar300m-lite) glinet,gl-x750) ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" ;; +netgear,wnr2000-v3) + ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0" + ucidef_set_led_default "wan-green" "WAN (green)" "netgear:green:wan" "0" + ucidef_set_led_switch "lan1green" "LAN1 (green)" "netgear:green:lan1" "switch0" "0x02" "0x04" + ucidef_set_led_switch "lan2green" "LAN2 (green)" "netgear:green:lan2" "switch0" "0x04" "0x04" + ucidef_set_led_switch "lan3green" "LAN3 (green)" "netgear:green:lan3" "switch0" "0x08" "0x04" + ucidef_set_led_switch "lan4green" "LAN4 (green)" "netgear:green:lan4" "switch0" "0x10" "0x04" + ucidef_set_led_switch "lan1amber" "LAN1 (amber)" "netgear:amber:lan1" "switch0" "0x02" "0x02" + ucidef_set_led_switch "lan2amber" "LAN2 (amber)" "netgear:amber:lan2" "switch0" "0x04" "0x02" + ucidef_set_led_switch "lan3amber" "LAN3 (amber)" "netgear:amber:lan3" "switch0" "0x08" "0x02" + ucidef_set_led_switch "lan4amber" "LAN4 (amber)" "netgear:amber:lan4" "switch0" "0x10" "0x02" + ;; netgear,wnr612-v2|\ on,n150r) ucidef_set_led_netdev "wan" "WAN" "netgear:green:wan" "eth0" diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index 99b9d421f4..aff62274b6 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -195,6 +195,7 @@ ath79_setup_interfaces() ucidef_add_switch_port_attr "switch0" 2 led 9 ucidef_add_switch_port_attr "switch0" 5 led 2 ;; + netgear,wnr2000-v3|\ netgear,wnr612-v2|\ on,n150r|\ tplink,tl-wr740n-v1|\ diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index ec597dd1d4..747c1aab58 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -165,6 +165,7 @@ case "$FIRMWARE" in winchannel,wb2000) ath9k_eeprom_extract "art" 20480 1088 ;; + netgear,wnr2000-v3|\ netgear,wnr612-v2|\ on,n150r|\ pcs,cap324|\ diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts new file mode 100644 index 00..c43c917afa --- /dev/null +++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts @@ -0,0 +1,211 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "ar7241.dtsi" + +/ { + compatible = "netgear,wnr2000-v3", "qca,ar7241"; + model = "Netgear WNR2000 v3"; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + aliases { + led-
Re: [OpenWrt-Devel] Review and cleanup of base packages
Mathias Kresin [2019-08-11 11:16:12]: Hi, > Personally I prefer to have some debug tools I use regularly, like tcpdump, > iftop and iperf*, in the base packages. During development I don't include > the feeds. I don't include the feeds either as simple symlink just works. > Rather I would like to see the tool "io", which allows memory/register > manipulation, included in the base packages. Quite handy tool during driver > debugging/development. Indeed, I use it as well: ln -s $PWD/../packages.git/utils/io package/utils/io echo CONFIG_PACKAGE_io=y >> .config So I don't think, that the package should be included in the base tree, just because we would like to use it. > > network/config/ltq-vdsl-app > > At least this one is referenced in target/linux/lantiq/xrx200/target.mk > > > utils/fritz-tools > > The fritz-tools "meta" package provides the fritz-tffs package, which is > included at least by target/linux/lantiq/Makefile. Thanks for reviewing that list, those packages simply slipped through my grepping session. -- ynezz ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v4 3/5] ath79: add support for Netgear WNR2000 v3
> -Original Message- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] On > Behalf Of Michal Cieslakiewicz > Sent: Dienstag, 13. August 2019 10:52 > To: openwrt-devel@lists.openwrt.org > Cc: Adrian Schmutzler > Subject: [OpenWrt-Devel] [PATCH v4 3/5] ath79: add support for Netgear > WNR2000 v3 > > This patch adds ath79 support for Netgear WNR2000v3. > Router was previously supported by ar71xx target only. > Note: this is a 4_32 device with limited upgrade capabilities. Sorry, found two things again. > + ucidef_set_led_default "wan-green" "WAN (green)" "netgear:green:wan" "0" Can this be done with default-state = off in DTS? > +&gpio { > + status = "okay"; > +}; I think this is not required as gpio is not disabled. But please test. As those changes are minor, maybe wait with a v5 until you receive feedback from someone else, then ... Best Adrian openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v4 4/5] ath79: add support for Netgear WNR1000 v2
Hi, > + keys { > + compatible = "gpio-keys-polled"; > + poll-interval = <20>; > + I'd use "ath9k-keys" here and also in 5/5 ... Best Adrian openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v4 0/5] ath79: add support for some Netgear WNR routers
> -Original Message- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] On > Behalf Of Michal Cieslakiewicz > Sent: Dienstag, 13. August 2019 10:47 > To: openwrt-devel@lists.openwrt.org > Cc: Adrian Schmutzler > Subject: [OpenWrt-Devel] [PATCH v4 0/5] ath79: add support for some Netgear > WNR routers > > This patchset enables ath79 target for following Netgear ar724x-based > routers currently supported by ar71xx: > * Netgear WNR1000v2 (tiny, 4_32) > * Netgear WNR2000v3 (tiny, 4_32) > * Netgear WNR2200 (generic, 8_64 + USB) This patchset is already in good shape. It would be nice if one of the devs had a look onto it. Notes from my side: - I'm not familiar with the pinmux stuff, so I have not reviewed that. - I'm not sure whether compatible = "qca,ar7241-eth", "syscon", "simple-mfd"; should be used to exchange initialization order as done here. (@Chuanhong Guo) - In patch 5/5, the usb_power hog is a subnode of the ath9k node, as it is controlled by a wireless chip pin. Is this the correct way to do it? Best Adrian openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v4 4/5] ath79: add support for Netgear WNR1000 v2
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On Tue, 13 Aug 2019 13:09:22 +0200 "Adrian Schmutzler" wrote: > Hi, > > > + keys { > > + compatible = "gpio-keys-polled"; > > + poll-interval = <20>; > > + > > I'd use "ath9k-keys" here and also in 5/5 ... > > Best > > Adrian Hi, Well, I had identical doubts, but now IRQ keys are reality, so it is indeed a good idea to emphasize that. Scheduled for v5. Regards Michal -BEGIN PGP SIGNATURE- iQIyBAEBCAAdFiEEi7ylFMzTSbpOuOZIHU8//LdGKWsFAl1SnfYACgkQHU8//LdG KWtMdw/3dNnpRkA00Q8kEgssX8dierTsEHouAb+un4rLbLZa4FmBqmCUpayQIiVX /qx3qus8XkRKwLXf5qC9qzd5ZB5l68ggSnTStlBpV4QZdAWOYhyB6UP+FVxg38BA 9whvcXBIWcE3GeFp453XcdM8112vk50GMUFNenKSKtaBqW+xVhqkPlPWTHmca6AC 7+FPHiGn4ZNIGsYJP6/SgNrYUweiGsZOiWMRBYGeI6/NGaco4NH7Whs2jEzZzjNK zKlc7A16r7om5woIjJXg4/3tHfhgj0iO8Jc3Ep4q6jWodmfTOM643BMJc3edTmEU WYusCH2iKdI0dh6T0qDejZ3eYtiyxYpOD83qosc2rYUbTMRDjlAy2bmRFqi1yGUk /sJKsUwk3AjeiEFLi2ulsAeaQmy/oDOLjjPoJqVG8QNGmYjcWl8tTM/qELM18Wo4 ABAablEeediNb9OLc0vsw5M0JfC5440/qgDF82K04khGu445GIBSWoht2wcwwFiJ SqxKTkUjY2zmkBY5M9bwl9Kwf0MGxX+C5cBC1C3i3h8pXNyAyQcwhanqIB2TXd/i tM7DOMr7iI0jGonxHDRvMs8CiBacS3kfiQlFPQSXfyzorOdb2aGSgpIC8JgRMYnr 7KuzhH6hGNhKiaJHSucYKWsfBKMvdIJxqPkx7VFsKiRLPfPGGA== =e2NU -END PGP SIGNATURE- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v6] ath79: add support of Netgear WNDR3800CH
> -Original Message- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] On > Behalf Of Dmitry Tunin > Sent: Mittwoch, 7. August 2019 22:08 > To: openwrt-devel@lists.openwrt.org > Cc: Dmitry Tunin > Subject: [OpenWrt-Devel] [PATCH v6] ath79: add support of Netgear WNDR3800CH > > Add support for the ar71xx supported Netgear WNDR3800CH to ath79. > The device is identical to WNDR3800 except NETGEAR_BOARD_ID. > > Signed-off-by: Dmitry Tunin Reviewed-by: Adrian Schmutzler Simple patch, no need to have this lying around forever. I cannot check SUPPORTED_DEVICES as the value is retrieved by wndr3700_board_detect in ar71xx. Best Adrian openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v4 3/5] ath79: add support for Netgear WNR2000 v3
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On Tue, 13 Aug 2019 13:03:55 +0200 "Adrian Schmutzler" wrote: > > -Original Message- > > From: openwrt-devel > > [mailto:openwrt-devel-boun...@lists.openwrt.org] On Behalf Of > > Michal Cieslakiewicz Sent: Dienstag, 13. August 2019 10:52 To: > > openwrt-devel@lists.openwrt.org Cc: Adrian Schmutzler > > Subject: [OpenWrt-Devel] [PATCH v4 3/5] > > ath79: add support for Netgear WNR2000 v3 > > > > This patch adds ath79 support for Netgear WNR2000v3. > > Router was previously supported by ar71xx target only. > > Note: this is a 4_32 device with limited upgrade capabilities. > > Sorry, found two things again. > > > + ucidef_set_led_default "wan-green" "WAN (green)" > > "netgear:green:wan" "0" > > Can this be done with default-state = off in DTS? > Probably copy-paste from ar71xx files. Tested on WNR2000v3, setting state to off is not needed at all, so another one line less in v5. > > +&gpio { > > + status = "okay"; > > +}; > > I think this is not required as gpio is not disabled. But please test. > Again, WNR2000v3 confirms what you suggest, gpio is enabled by default. Marked fo removal in v5. > As those changes are minor, maybe wait with a v5 until you receive > feedback from someone else, then ... > > Best > > Adrian Fair enough, in the meantime I will proceed gradually with testing pre-v5 on all 4 router models... Cheers Michal -BEGIN PGP SIGNATURE- iQIzBAEBCAAdFiEEi7ylFMzTSbpOuOZIHU8//LdGKWsFAl1SpOEACgkQHU8//LdG KWsRMhAAj8xLox2VKzcJ+MLoDShgnL56tAEqzm9sLDIuhFxWfbnM5CsKtB4Q+fRS K/9Da3JIe8LqNmom3KYPX4l8mXJYLw1fUbqte2miZVC8IfIZYlPp048JsYQvIuCi kksH8shFigNxUz6u5pazhyOeY7zjR9f5mb/6CAMLigjt5lEwrL3NbL1iCveFaRFF rlEYeEWoK+GLHFXCKCMAZIo3QL25OG+pkuIV2RgPuXBzmeQnClWbGKhbuzrqoF7Y wW4GMdLgj/HG3v5HbzWiPXVjZElI1ZPjaUSTKE4625wA6V5AQ6vbTmhSL5BxjPky j3Fb/4klOUv0bea9JcfOe0IX9sCs+VNFbE9yeI8FCmcEN4h48qbtihQFCwfcqT7E VpH6pIWBXBJ8K1ZxYlnBLW6X5nQy++coi7O7K3BsPEimd8hHr/DIeAMJC4zprwbE n05Yqr3gk9kJ6D/YQW1gUxzAKREV30YYD/xx3lML9ypnb226zdxPrnhj+0+hp0zj tXY3GfXM48yWivhGNBn8PX5Pb6PPBaJYyOKGox06y8PXjgyUFSITJymn9ZvjK5my 1Zv68gR5TIaJf9LZ0+dsA8zXCle0PxkImsS902/pJfIG7QgqtI7OYaW7ZrCM0D4I keg9WKtuA95cdZrsLIozHJItGNLh1gOmY1fWPeGZsCq2jltbngw= =ouzk -END PGP SIGNATURE- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Attendees Data Base Of SCTE Cable-Tec Expo 2019
Hi, We are in the process of closing files for the month. Typically when I haven't heard back from someone it means they're either really busy or aren't interested. If you aren't interested, do I have your permission to take off your email? If you're still interested, I would highly appreciate if you would share your thoughts, so that we can assist you best solution along with affordable cost. Looking forward to hearing from you. Julie Devidson From: Julie Davidson [mailto:julie.david...@fortune4leads.com] Sent: 08 August 2019 14:05 To: 'openwrt-devel@lists.openwrt.org' Subject: Attendees Data Base Of SCTE Cable-Tec Expo 2019 Hi, I think you might be interested in obtaining Database of SCTE Cable-Tec Expo 2019.and there will be a Pricing associated with the Data Base. Attendees Data: Fiber and broadband experts,PPC Broadband were among hundreds of industry leaders,,industry professionals,technology to many different decision makers and professionals and many more Data Contains: Contact Name, Title, Company Name, Size, Physical Address, Email address, Contact Number& Fax numbers and etc. If you're interested, Please let me know I will assist you with counts, pricing and more information? Looking forward for your honourable response. Regards, Julie Davidson Marketing Executive If you do not wish to hear from us again, please respond back with and we will honour your request. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ramips: add support for Xiaomi Mi Wi-Fi Router 3G v2
- CMIIT ID: 2019AP2581 - SoC: MediaTek MT7621 - Flash:16MiB NOR SPI (GigaDevice GD25Q128B) - RAM: 128MiB DDR3 (ESMT M15T1G1664A) - Serial: As marked on PCB, 3V3 logic, baudrate is 115200, 8n1 - Ethernet: 3x 10/100/1000 Mbps (switched, 2xLAN + WAN) - WIFI0:MT7603E 2.4GHz 802.11b/g/n - WIFI1:MT7612E 5GHz 802.11ac - Antennas: 4x external (2 per radio), non-detachable - LEDs: Programmable "power" LED (two-coloured, yellow/blue) Non-programmable "internet" LED (shows WAN activity) - Buttons: Reset INSTALLATION: Bootloader won't accept any serial input unless "boot_wait" u-boot environment variable is changed to "on". Vendor firmware (looks like an illegal OpenWrt fork) won't accept any serial input unless "uart_en" is set to "1". Tricks to force u-boot to use default environment do not help as it's restricted in the same way. With bootloader unlocked the easiest way would be to TFTP the sysupgrade image or to sysupgrade after loading an initramfs one. For porting the flash contents were changed externally with an SPI programmer (after lifting Vcc flash IC pin away from the PCB). Signed-off-by: Paul Fertser --- .../linux/ramips/base-files/etc/board.d/02_network | 4 + target/linux/ramips/dts/mt7621_xiaomi_mir3gv2.dts | 147 + target/linux/ramips/image/mt7621.mk| 10 ++ 3 files changed, 161 insertions(+) create mode 100644 target/linux/ramips/dts/mt7621_xiaomi_mir3gv2.dts diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index ca111c9d4c..7280da50fc 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -464,6 +464,10 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "2:lan:2" "3:lan:1" "1:wan" "6t@eth0" ;; + xiaomi,mir3gv2) + ucidef_add_switch "switch0" \ + "2:lan:2" "3:lan:1" "4:wan" "6t@eth0" + ;; xiaomi,mir3p) ucidef_add_switch "switch0" \ "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0" diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3gv2.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3gv2.dts new file mode 100644 index 00..81f6d20ae8 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3gv2.dts @@ -0,0 +1,147 @@ +/dts-v1/; + +#include "mt7621.dtsi" + +#include +#include + +/ { + compatible = "xiaomi,mir3gv2", "mediatek,mt7621-soc"; + model = "Xiaomi Mi Router 3G v2"; + + aliases { + led-boot = &led_status_yellow; + led-failsafe = &led_status_yellow; + led-running = &led_status_blue; + led-upgrade = &led_status_yellow; + }; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + leds { + compatible = "gpio-leds"; + + led_status_blue: status_blue { + label = "mir3gv2:blue:status"; + gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + }; + + led_status_yellow: status_yellow { + label = "mir3gv2:yellow:status"; + gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + }; + }; + + button { + compatible = "gpio-keys-polled"; + poll-interval = <20>; + + reset { + label = "reset"; + gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&spi0 { + status = "okay"; + + m25p80@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <8000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x3>; + read-only; + }; + + partition@3 { + label = "u-boot-env"; + reg = <0x3 0x1>; + read-only; + }; + + partition@4 { + label = "Bdata"; + reg = <0x4 0x1>; + read-only; + }; + + factory: partition@5 { + label = "factory"; + reg = <0x5 0x1>; + read-only; + }; + + partition@6 { +
Re: [OpenWrt-Devel] [PATCH] ramips: add support for Xiaomi Mi Wi-Fi Router 3G v2
> -Original Message- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] On > Behalf Of Paul Fertser > Sent: Dienstag, 13. August 2019 18:59 > To: John Crispin > Cc: Paul Fertser ; openwrt-devel@lists.openwrt.org > Subject: [OpenWrt-Devel] [PATCH] ramips: add support for Xiaomi Mi Wi-Fi > Router 3G v2 > Hi, just some comments without deeper review: > diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3gv2.dts > b/target/linux/ramips/dts/mt7621_xiaomi_mir3gv2.dts > new file mode 100644 > index 00..81f6d20ae8 > --- /dev/null > +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3gv2.dts > @@ -0,0 +1,147 @@ > +/dts-v1/; > + > +#include "mt7621.dtsi" > + > +#include > +#include > + > +/ { > + compatible = "xiaomi,mir3gv2", "mediatek,mt7621-soc"; > + model = "Xiaomi Mi Router 3G v2"; Please separate the version with a minus, so "xiaomi,mir3g-v2" for compatible and "xiaomi_mir3g-v2" for device node in .mk file. (Update 02_network, too ...) > + button { > + compatible = "gpio-keys-polled"; > + poll-interval = <20>; Try "gpio-keys" here and remove poll-interval ... > +ðernet { > + mtd-mac-address = <&factory 0xe000>; Is there also a second MAC address for WAN in 0xe006 or somewhere else nearby? Can the WAN MAC address be read somewhere else from flash? I would like to avoid setting wan_mac by the default case in 02_network. > +define Device/xiaomi_mir3gv2 > + MTK_SOC := mt7621 > + IMAGE_SIZE := 14848k > + DEVICE_VENDOR := Xiaomi > + DEVICE_MODEL := Mi router 3G v2 Capitalize "router". Despite, use DEVICE_VARIANT, so: + DEVICE_MODEL := Mi Router 3G + DEVICE_VARIANT := v2 > + SUPPORTED_DEVICES += mir3gv2 Drop this line. Best Adrian openpgp-digital-signature.asc Description: PGP signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2] ramips: add support for Xiaomi Mi Wi-Fi Router 3G v2
Adrian, thank you for the review indeed. The factory partition has a MAC that matches printed label at the location you guessed, thanks for pointing that out. From: Paul Fertser Date: Tue, 13 Aug 2019 18:57:39 +0300 Subject: [PATCH v2] ramips: add support for Xiaomi Mi Wi-Fi Router 3G v2 - CMIIT ID: 2019AP2581 - SoC: MediaTek MT7621 - Flash:16MiB NOR SPI (GigaDevice GD25Q128B) - RAM: 128MiB DDR3 (ESMT M15T1G1664A) - Serial: As marked on PCB, 3V3 logic, baudrate is 115200, 8n1 - Ethernet: 3x 10/100/1000 Mbps (switched, 2xLAN + WAN) - WIFI0:MT7603E 2.4GHz 802.11b/g/n - WIFI1:MT7612E 5GHz 802.11ac - Antennas: 4x external (2 per radio), non-detachable - LEDs: Programmable "power" LED (two-coloured, yellow/blue) Non-programmable "internet" LED (shows WAN activity) - Buttons: Reset INSTALLATION: Bootloader won't accept any serial input unless "boot_wait" u-boot environment variable is changed to "on". Vendor firmware (looks like an illegal OpenWrt fork) won't accept any serial input unless "uart_en" is set to "1". Tricks to force u-boot to use default environment do not help as it's restricted in the same way. With bootloader unlocked the easiest way would be to TFTP the sysupgrade image or to sysupgrade after loading an initramfs one. For porting the flash contents were changed externally with an SPI programmer (after lifting Vcc flash IC pin away from the PCB). Signed-off-by: Paul Fertser --- Changes since v1: - Addressed all Adrian Schmutzl's comments Gave this version quick runtime testing, everything seems to be fine. .../linux/ramips/base-files/etc/board.d/02_network | 7 + target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts | 146 + target/linux/ramips/image/mt7621.mk| 10 ++ 3 files changed, 163 insertions(+) create mode 100644 target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index ca111c9d4c..3ffc684139 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -464,6 +464,10 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "2:lan:2" "3:lan:1" "1:wan" "6t@eth0" ;; + xiaomi,mir3g-v2) + ucidef_add_switch "switch0" \ + "2:lan:2" "3:lan:1" "4:wan" "6t@eth0" + ;; xiaomi,mir3p) ucidef_add_switch "switch0" \ "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0" @@ -675,6 +679,9 @@ ramips_setup_macs() xiaomi,mir3p) lan_mac=$(mtd_get_mac_binary factory 0xe006) ;; + xiaomi,mir3g-v2) + wan_mac=$(mtd_get_mac_binary factory 0xe006) + ;; xiaomi,miwifi-mini) lan_mac=$(macaddr_setbit_la "$(cat /sys/class/net/eth0/address)") ;; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts new file mode 100644 index 00..a1963d0072 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts @@ -0,0 +1,146 @@ +/dts-v1/; + +#include "mt7621.dtsi" + +#include +#include + +/ { + compatible = "xiaomi,mir3g-v2", "mediatek,mt7621-soc"; + model = "Xiaomi Mi Router 3G v2"; + + aliases { + led-boot = &led_status_yellow; + led-failsafe = &led_status_yellow; + led-running = &led_status_blue; + led-upgrade = &led_status_yellow; + }; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + leds { + compatible = "gpio-leds"; + + led_status_blue: status_blue { + label = "mir3gv2:blue:status"; + gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + }; + + led_status_yellow: status_yellow { + label = "mir3gv2:yellow:status"; + gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + }; + }; + + button { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&spi0 { + status = "okay"; + + m25p80@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <8000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x3>; +
Re: [OpenWrt-Devel] [PATCH v2] ramips: add support for Xiaomi Mi Wi-Fi Router 3G v2
On Tue, Aug 13, 2019 at 09:25:41PM +0300, Paul Fertser wrote: > From: Paul Fertser > Date: Tue, 13 Aug 2019 18:57:39 +0300 > Subject: [PATCH v2] ramips: add support for Xiaomi Mi Wi-Fi Router 3G v2 OK, I messed it up, and this is not picked up by patchwork properly. Please excuse me, I'll do better when sending the next version after review. -- Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software! mailto:fercer...@gmail.com ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] xfsprogs: Replace valloc with posix_memalign
On Mon, May 6, 2019 at 2:57 PM Rosen Penev wrote: > > Fixes compilation under uClibc-ng. > > Signed-off-by: Rosen Penev Can this also be backported to 18.06? It's failing there as well: https://downloads.openwrt.org/releases/faillogs-18.06/arc_arc700/base/xfsprogs/compile.txt > --- > package/utils/xfsprogs/Makefile | 2 +- > ...six_memalign-instead-of-deprecated-v.patch | 31 +++ > 2 files changed, 32 insertions(+), 1 deletion(-) > create mode 100644 > package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch > > diff --git a/package/utils/xfsprogs/Makefile b/package/utils/xfsprogs/Makefile > index 50a5147b04..353773840a 100644 > --- a/package/utils/xfsprogs/Makefile > +++ b/package/utils/xfsprogs/Makefile > @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=xfsprogs > PKG_CPE_ID:=cpe:/a:sgi:xfsprogs > -PKG_RELEASE:=2 > +PKG_RELEASE:=3 > PKG_VERSION:=4.11.0 > PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs > PKG_HASH:=c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 > diff --git > a/package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch > > b/package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch > new file mode 100644 > index 00..7bf1c77a40 > --- /dev/null > +++ > b/package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch > @@ -0,0 +1,31 @@ > +From 930f9aa8f08759fa739dd6e615ba8b3a1890008d Mon Sep 17 00:00:00 2001 > +From: Rosen Penev > +Date: Mon, 6 May 2019 13:56:13 -0700 > +Subject: [PATCH] db/malloc: Use posix_memalign instead of deprecated valloc > + > +valloc is not available with uClibc-ng as well as being deprecated, which > +causes compilation errors. aligned_alloc is not available before C11 so > +used posix_memalign.' > + > +Signed-off-by: Rosen Penev > +--- > + db/malloc.c | 3 +-- > + 1 file changed, 1 insertion(+), 2 deletions(-) > + > +diff --git a/db/malloc.c b/db/malloc.c > +index 77b3e022..38fe0b05 100644 > +--- a/db/malloc.c > b/db/malloc.c > +@@ -56,8 +56,7 @@ xmalloc( > + { > + void*ptr; > + > +- ptr = valloc(size); > +- if (ptr) > ++ if(!posix_memalign(&ptr, sysconf(_SC_PAGESIZE), size)) > + return ptr; > + badmalloc(); > + /* NOTREACHED */ > +-- > +2.17.1 > + > -- > 2.17.1 > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] libbsd: Fix compilation under ARC
On Fri, May 17, 2019 at 12:34 AM Petr Štetiar wrote: > > Rosen Penev [2019-05-16 18:47:07]: > > > Added merge request here: > > https://gitlab.freedesktop.org/libbsd/libbsd/merge_requests/6 > > thanks, I've merged it https://git.openwrt.org/4ffa38e15ca9 Can this be backported to 18.06? It fails there as well: https://downloads.openwrt.org/releases/faillogs-18.06/arc_arc700/base/libbsd/compile.txt > > -- ynezz ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] nftables: Fix compilation with uClibc-ng
On Mon, May 6, 2019 at 12:44 AM Petr Štetiar wrote: > > Rosen Penev [2019-05-05 15:24:19]: > > > On Fri, May 3, 2019 at 11:49 AM, Rosen Penev wrote: > > > On Fri, May 3, 2019 at 4:50 AM Petr Štetiar wrote: > > > > > > > > Rosen Penev [2019-05-01 10:08:10]: > > > > > > > > Hi, > > > > > > > > > Missing header for va_list. > > > > > > > > shouldn't this go through upstream first? Thanks. > > > Sent > > This was applied upstream. > > Nice, thanks. I've updated the content of the patch to match that in upstream > and merged that into my staging tree. > > 1. https://git.openwrt.org/9efc6ad195 > > -- ynezz Can you backport this to 18.06? It fails there as well: https://downloads.openwrt.org/releases/faillogs-18.06/arc_arc700/base/nftables/compile.txt ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ipq40xx: fix AVM NAND caldata extraction
The AVM Fritz!Box 7530 (and probably other AVM IPQ4019 NAND devices) has it's caldata not stored consistently, but instead at currently 3 known possible offsets. As we get a non-zero exit code from fritz_cal_extract, simply try all three possible offsets on both bootloader partitions, until a matching caldata for each radio is found. Reported-by: Hauke Mehrtens Signed-off-by: David Bauer --- .../etc/hotplug.d/firmware/11-ath10k-caldata | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) 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 1e64b93a46..5f7e5f4923 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 @@ -112,7 +112,11 @@ case "$FIRMWARE" in ;; avm,fritzrepeater-3000) /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") + /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") ;; linksys,ea8300) ath10kcal_extract "ART" 36864 12064 @@ -146,7 +150,11 @@ case "$FIRMWARE" in avm,fritzbox-7530 |\ avm,fritzrepeater-3000) /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") + /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") ;; compex,wpj428 |\ engenius,eap1300 |\ @@ -203,7 +211,11 @@ case "$FIRMWARE" in avm,fritzbox-7530 |\ avm,fritzrepeater-3000) /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") + /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ + /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") ;; compex,wpj428 |\ engenius,eap1300 |\ -- 2.22.0 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [at91][patch v3 01/11] uboot-at91: bump linux4sam_5.8 to linux4sam_6.0
Signed-off-by: Sandeep Sheriker M --- package/boot/uboot-at91/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index a3262b5..15a26be 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=linux4sam_5.8 +PKG_VERSION:=linux4sam_6.0 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/linux4sam/u-boot-at91.git -PKG_SOURCE_VERSION:=59f202622154f82e708a6ca2bf86350a5c1b2d33 +PKG_SOURCE_VERSION:=1e7d2e5973c1fb780e55e28a801c6c574158ac14 include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk -- 2.7.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [at91][patch v3 00/11] at91 patch series
Hi, This patch series contains 1. rework in creating sdcard images for different subtarget. 2. creating a fit images. 3. add support for sam9x5ek soc 4. add uboot env file. 5. bump uboot & at91bootstrap to latest versions --- v2 -> v3 fixed errors while creating sdcard images for multiple targets. Sandeep Sheriker M (11): uboot-at91: bump linux4sam_5.8 to linux4sam_6.0 uboot-at91:add at91sam9x5ek soc uboot-at91: changed som1 ek default defconfigs uboot-at91: fix -Wformat-security at91bootstrap: bump v3.8.10 to v3.8.12 at91bootstrap: add support for at91sam9x5ek at91bootstrap: add sama5d27_som1_eksd1_uboot as default defconfig at91: move at91-sdcard command to sama5.mk at91: add uboot environments at91:sama5: create fit image at91:sam9x: create sdcard images package/boot/at91bootstrap/Makefile| 25 +--- package/boot/uboot-at91/Makefile | 25 .../patches/001-fix-Wformat-security.patch | 13 +++ target/linux/at91/image/Makefile | 12 -- target/linux/at91/image/sam9x.mk | 44 +- target/linux/at91/image/sama5.mk | 44 ++ target/linux/at91/image/uboot-env.txt | 14 +++ 7 files changed, 158 insertions(+), 19 deletions(-) create mode 100644 package/boot/uboot-at91/patches/001-fix-Wformat-security.patch create mode 100644 target/linux/at91/image/uboot-env.txt -- 2.7.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [at91][patch v3 02/11] uboot-at91:add at91sam9x5ek soc
add support to build u-boot binaries for at91sam9x5ek socs. Signed-off-by: Sandeep Sheriker M --- package/boot/uboot-at91/Makefile | 9 + 1 file changed, 9 insertions(+) diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index 15a26be..90f1a3b 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -38,6 +38,14 @@ define U-Boot/at91sam9x5ek_nandflash at91sam9x35ek endef +define U-Boot/at91sam9x5ek_mmc + NAME:=AT91SAM9X5-EK board (SDcard) + BUILD_SUBTARGET:=sam9x + BUILD_DEVICES:=at91sam9g15ek at91sam9g25ek \ + at91sam9g35ek at91sam9x25ek \ +at91sam9x35ek +endef + define U-Boot/sama5d3_xplained_nandflash NAME:=SAMA5D3 Xplained board (NandFlash) BUILD_SUBTARGET:=sama5 @@ -107,6 +115,7 @@ endef UBOOT_TARGETS := \ at91sam9m10g45ek_nandflash \ at91sam9x5ek_nandflash \ + at91sam9x5ek_mmc \ sama5d3_xplained_nandflash \ sama5d3_xplained_mmc \ sama5d2_xplained_mmc \ -- 2.7.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [at91][patch v3 03/11] uboot-at91: changed som1 ek default defconfigs
replaced som1 ek spi flash with qspi defconfig and mmc with mmc1 defconfig. Signed-off-by: Sandeep Sheriker M --- package/boot/uboot-at91/Makefile | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index 90f1a3b..c17f1e0 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -88,13 +88,13 @@ define U-Boot/sama5d4_xplained_nandflash BUILD_DEVICES:=at91-sama5d4_xplained endef -define U-Boot/sama5d27_som1_ek_mmc - NAME:=SAMA5D27 SOM1 Ek (SDCard) +define U-Boot/sama5d27_som1_ek_mmc1 + NAME:=SAMA5D27 SOM1 Ek (SDCard1) BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d27_som1_ek endef -define U-Boot/sama5d27_som1_ek_spiflash +define U-Boot/sama5d27_som1_ek_qspiflash NAME:=SAMA5D27 SOM1 Ek (QSPI Flash) BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d27_som1_ek @@ -123,8 +123,8 @@ UBOOT_TARGETS := \ sama5d4_xplained_mmc \ sama5d4_xplained_spiflash \ sama5d4_xplained_nandflash\ -sama5d27_som1_ek_mmc \ -sama5d27_som1_ek_spiflash \ + sama5d27_som1_ek_mmc1 \ + sama5d27_som1_ek_qspiflash \ sama5d2_ptc_ek_nandflash \ sama5d2_ptc_ek_mmc -- 2.7.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [at91][patch v3 04/11] uboot-at91: fix -Wformat-security
add patch to fix -Wformat-security warnings. Signed-off-by: Sandeep Sheriker M --- package/boot/uboot-at91/Makefile| 2 +- .../boot/uboot-at91/patches/001-fix-Wformat-security.patch | 13 + 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 package/boot/uboot-at91/patches/001-fix-Wformat-security.patch diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index c17f1e0..547b72f 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -131,7 +131,7 @@ UBOOT_TARGETS := \ define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ CROSS_COMPILE=$(TARGET_CROSS) \ -DTC=$(LINUX_DIR)/scripts/dtc/dtc \ +DTC=$(PKG_BUILD_DIR)/scripts/dtc/dtc \ KCFLAGS="$(filter-out -fstack-protector \ -mfloat-abi=hard, $(TARGET_CFLAGS)) -mfloat-abi=soft" endef diff --git a/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch b/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch new file mode 100644 index 000..18f9af7 --- /dev/null +++ b/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch @@ -0,0 +1,13 @@ +diff --git a/cmd/version.c b/cmd/version.c +index b2fffe9..bcbbeb1 100644 +--- a/cmd/version.c b/cmd/version.c +@@ -18,7 +18,7 @@ static int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) + { + char buf[DISPLAY_OPTIONS_BANNER_LENGTH]; + +- printf(display_options_get_banner(false, buf, sizeof(buf))); ++ printf("%s",display_options_get_banner(false, buf, sizeof(buf))); + #ifdef CC_VERSION_STRING + puts(CC_VERSION_STRING "\n"); + #endif -- 2.7.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [at91][patch v3 09/11] at91: add uboot environments
add uboot environments to sdcard image Signed-off-by: Sandeep Sheriker M --- target/linux/at91/image/sama5.mk | 11 ++- target/linux/at91/image/uboot-env.txt | 14 ++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 target/linux/at91/image/uboot-env.txt diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk index d02f51a..4fee464 100644 --- a/target/linux/at91/image/sama5.mk +++ b/target/linux/at91/image/sama5.mk @@ -27,6 +27,15 @@ define Build/at91-sdcard $(BIN_DIR)/at91bootstrap-$(DEVICE_NAME:at91-%=%)sd_uboot/at91bootstrap.bin \ ::BOOT.bin) + $(CP) uboot-env.txt $@-uboot-env.txt + sed -i '2d;3d' $@-uboot-env.txt + sed -i '2i board='"$(DEVICE_NAME:at91-%=%)"'' $@-uboot-env.txt + sed -i '3i board_name='"$(DEVICE_NAME:at91-%=%)"'' $@-uboot-env.txt + + mkenvimage -s 0x4000 -o $@-uboot.env $@-uboot-env.txt + + mcopy -i $@.boot $@-uboot.env ::uboot.env + ./gen_at91_sdcard_img.sh \ $@.img \ $@.boot \ @@ -36,7 +45,7 @@ define Build/at91-sdcard gzip -nc9 $@.img > $@ - rm -f $@.img $@.boot ) + rm -f $@.img $@.boot $@-uboot.env $@-uboot-env.txt) endef define Device/at91-sama5d2_xplained diff --git a/target/linux/at91/image/uboot-env.txt b/target/linux/at91/image/uboot-env.txt new file mode 100644 index 000..80d051b --- /dev/null +++ b/target/linux/at91/image/uboot-env.txt @@ -0,0 +1,14 @@ +/* Do Not remove First 2 lines, Makefile will modify these lines with proper board names */ +board=at91sam9x25ek +board_name=at91sam9x25ek +bootargs=console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait rootfstype=ext4 +bootargsd2=console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait rootfstype=ext4 +bootargsxx=console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait rootfstype=ext4 +bootcmd=run setbootargs; run fatload_mmc; bootm 0x2100 +bootdelay=1 +fatload_mmc=if test ${board_name} = sama5d2_xplained || test ${board_name} = sama5d27_som1_ek; then fatload mmc 1:1 0x2100 ${board_name}-fit.itb; else fatload mmc 0:1 0x2100 ${board_name}-fit.itb; fi +setbootargs=if test ${board_name} = sama5d2_xplained || test ${board_name} = sama5d27_som1_ek; then setenv bootargs ${bootargsd2}; else setenv bootargs ${bootargsxx}; fi +ethact=gmac0 +stderr=serial +stdin=serial +stdout=serial -- 2.7.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [at91][patch v3 07/11] at91bootstrap: add sama5d27_som1_eksd1_uboot as default defconfig
Signed-off-by: Sandeep Sheriker M --- package/boot/at91bootstrap/Makefile | 6 +++--- target/linux/at91/image/Makefile| 10 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index 6496b5a..1c07e21 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -128,9 +128,9 @@ AT91BOOTSTRAP_TARGETS := \ sama5d4_xplainednf_uboot_secure \ sama5d4_xplaineddf_uboot_secure \ sama5d4_xplainedsd_uboot_secure \ - sama5d27_som1_eksd_uboot \ - sama5d27_som1_ekqspi_uboot \ - sama5d2_ptc_eknf_uboot \ +sama5d27_som1_eksd1_uboot \ +sama5d27_som1_ekqspi_uboot \ +sama5d2_ptc_eknf_uboot \ sama5d2_ptc_eksd_uboot define Build/Compile diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile index e4c17e3..3a906a6 100644 --- a/target/linux/at91/image/Makefile +++ b/target/linux/at91/image/Makefile @@ -55,9 +55,13 @@ define Build/at91-sdcard $(BIN_DIR)/u-boot-$(DEVICE_NAME:at91-%=%)_mmc/u-boot.bin \ ::u-boot.bin - mcopy -i $@.boot \ -$(BIN_DIR)/at91bootstrap-$(DEVICE_NAME:at91-%=%)sd*/at91bootstrap.bin \ -::BOOT.bin + $(if $(findstring at91-sama5d27_som1_ek,$@), \ + mcopy -i $@.boot \ + $(BIN_DIR)/at91bootstrap-$(DEVICE_NAME:at91-%=%)sd1_uboot/at91bootstrap.bin \ + ::BOOT.bin, + mcopy -i $@.boot \ + $(BIN_DIR)/at91bootstrap-$(DEVICE_NAME:at91-%=%)sd_uboot/at91bootstrap.bin \ + ::BOOT.bin) ./gen_at91_sdcard_img.sh \ $@.img \ -- 2.7.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [at91][patch v3 05/11] at91bootstrap: bump v3.8.10 to v3.8.12
Signed-off-by: Sandeep Sheriker M --- package/boot/at91bootstrap/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index 8a08a7a..642d094 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -9,13 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=at91bootstrap -PKG_VERSION:=v3.8.10 +PKG_VERSION:=v3.8.12 PKG_RELEASE:= PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/linux4sam/at91bootstrap.git -PKG_SOURCE_VERSION:=04efa5500d60a0211d14b6ee60df7ce0a828704d - +PKG_SOURCE_VERSION:= 28e15d07e9f24efb04b87bb0baa211a0c5640ef1 PKG_BUILD_DIR = \ $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) -- 2.7.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [at91][patch v3 08/11] at91: move at91-sdcard command to sama5.mk
Signed-off-by: Sandeep Sheriker M --- target/linux/at91/image/sama5.mk | 33 + 1 file changed, 33 insertions(+) diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk index f9a190c..d02f51a 100644 --- a/target/linux/at91/image/sama5.mk +++ b/target/linux/at91/image/sama5.mk @@ -6,6 +6,39 @@ define Device/default-nand MKUBIFS_OPTS := -m $$(PAGESIZE) -e 124KiB -c 2048 endef +define Build/at91-sdcard + $(if $(findstring ext4,$@), \ + rm -f $@.boot + mkfs.fat -C $@.boot $(FAT32_BLOCKS) + + mcopy -i $@.boot $(KDIR)/zImage ::zImage + + $(if $(findstring at91-sama5d27_som1_ek,$@), \ + mcopy -i $@.boot \ + $(BIN_DIR)/u-boot-$(DEVICE_NAME:at91-%=%)_mmc1/u-boot.bin \ + ::u-boot.bin + mcopy -i $@.boot \ + $(BIN_DIR)/at91bootstrap-$(DEVICE_NAME:at91-%=%)sd1_uboot/at91bootstrap.bin \ + ::BOOT.bin, + mcopy -i $@.boot \ + $(BIN_DIR)/u-boot-$(DEVICE_NAME:at91-%=%)_mmc/u-boot.bin \ + ::u-boot.bin + mcopy -i $@.boot \ + $(BIN_DIR)/at91bootstrap-$(DEVICE_NAME:at91-%=%)sd_uboot/at91bootstrap.bin \ + ::BOOT.bin) + + ./gen_at91_sdcard_img.sh \ + $@.img \ + $@.boot \ + $(KDIR)/root.ext4 \ + $(AT91_SD_BOOT_PARTSIZE) \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) + + gzip -nc9 $@.img > $@ + + rm -f $@.img $@.boot ) +endef + define Device/at91-sama5d2_xplained $(Device/evaluation-dtb) DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D2 Xplained -- 2.7.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [at91][patch v3 06/11] at91bootstrap: add support for at91sam9x5ek
Signed-off-by: Sandeep Sheriker M --- package/boot/at91bootstrap/Makefile | 14 ++ 1 file changed, 14 insertions(+) diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index 642d094..6496b5a 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -27,6 +27,18 @@ define AT91Bootstrap/Default AT91BOOTSTRAP_IMAGE:=at91bootstrap.bin endef +define AT91Bootstrap/at91sam9x5eknf_uboot + NAME:=AT91Bootstrap for AT91SAM9X5-EK board (NandFlash) + BUILD_SUBTARGET:=sam9x + BUILD_DEVICES:=at91sam9x25ek at91sam9x35ek +endef + +define AT91Bootstrap/at91sam9x5eksd_uboot + NAME:=AT91Bootstrap for AT91SAM9X5-EK board (SDcard) + BUILD_SUBTARGET:=sam9x + BUILD_DEVICES:=at91sam9x25ek at91sam9x35ek +endef + define AT91Bootstrap/sama5d2_xplaineddf_uboot TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (SPI Flash) BUILD_SUBTARGET:=sama5 @@ -106,6 +118,8 @@ define AT91Bootstrap/sama5d2_ptc_eksd_uboot endef AT91BOOTSTRAP_TARGETS := \ +at91sam9x5eknf_uboot \ +at91sam9x5eksd_uboot \ sama5d2_xplaineddf_uboot \ sama5d2_xplaineddf_qspi_uboot \ sama5d2_xplainedsd_uboot \ -- 2.7.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel