Stupid question - what calls these files? I assume I have to call my new function from somewhere.
I'm working on it. On Mon, Apr 25, 2016 at 9:22 PM, John Crispin <[email protected]> wrote: > > > On 25/04/2016 15:18, Andrew Yong wrote: >> I have just found out that I need to perform this additional step on >> this SamKnows Whitebox 8 every boot: >> >> /usr/sbin/fw_setenv bootcount 0 >> >> Where would be an appropriate place to put this? I could add (yet >> another) init script in ./target/linux/ramips/base-files/etc/init.d >> with START=99 (this is how SamKnows does it) and add a check >> against $(ramips_board_name). > > look at > target/linux/ramips/base-files/lib/preinit/04_handle_checksumming and > add a target/linux/ramips/base-files/lib/preinit/04_handle_bootcount > using a similar pattern please > > John > > >> >> Without this, SamKnows' custom u-boot will attempt to boot from a backup >> partition after bootcount exceeds 3 (3 "failed" boots). >> >> For an end-user without TTL serial access, it would be a soft brick. >> >> I'm cleaning up the rest of the patches, fixed some minor gpio >> mis-definitions and testing out some wifi fixes before I do a v5. >> > > > >> On 25 Apr 2016 20:58, "John Crispin" <[email protected] >> <mailto:[email protected]>> wrote: >> >> Hi, >> >> few comments inline. apart from those 2 nitpicks the patch looks good. >> >> John >> >> On 25/04/2016 03:05, Andrew Yong wrote: >> > This patch adds support for the SamKnows version 8.0 Whitebox, built >> > around the MT7621 platform. 2.4GHz appears to be working, albeit >> > poorly; 5GHz not working yet. >> > >> > Fixed in v4: >> > - I didn't commit some fixes in PATCHv3, that's fixed now >> > - DTS: Syntax error fixed, LEDs and buttons mapped correctly now >> > - diag.sh updated to blink WPS LED on boot >> > - 2.4GHz wifi is working but txpower is stuck at 0, DTS ROM offset >> > matches SamKnows firmware >> > - 5GHz wifi not working, DTS pcie1,0 matches SamKnows firmware >> > >> > Initial support for SamKnows SK-WB8 >> > >> > Signed-off-by: Andrew Yong <[email protected] <mailto:[email protected]>> >> > >> > diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds >> > b/target/linux/ramips/base-files/etc/board.d/01_leds >> > index e3b8500..df30085 100755 >> > --- a/target/linux/ramips/base-files/etc/board.d/01_leds >> > +++ b/target/linux/ramips/base-files/etc/board.d/01_leds >> > @@ -241,6 +241,9 @@ rt-n14u) >> > set_wifi_led "$board:blue:air" >> > set_usb_led "$board:blue:usb" >> > ;; >> > +sk-wb8) >> > + set_usb_led "$board:green:usb" >> > + ;; >> > tiny-ac) >> > set_wifi_led "$board:orange:wifi" >> > set_usb_led "$board:green:usb" >> > 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 3c958ae..3e876d2 100755 >> > --- a/target/linux/ramips/base-files/etc/board.d/02_network >> > +++ b/target/linux/ramips/base-files/etc/board.d/02_network >> > @@ -77,6 +77,7 @@ ramips_setup_interfaces() >> > pbr-m1|\ >> > psg1208|\ >> > sap-g3200u3|\ >> > + sk-wb8|\ >> > wf-2881|\ >> > whr-300hp2|\ >> > whr-600d|\ >> > @@ -310,6 +311,9 @@ ramips_setup_macs() >> > lan_mac=$(macaddr_setbit_la "$lan_mac") >> > wan_mac=$(mtd_get_mac_binary factory 32772) >> > ;; >> > + sk-wb8) >> > + wan_mac=$(mtd_get_mac_binary factory 57350) >> > + ;; >> > tew-691gr) >> > lan_mac=$(cat /sys/class/net/eth0/address) >> > wan_mac=$(macaddr_add "$lan_mac" 3) >> > diff --git a/target/linux/ramips/base-files/etc/diag.sh >> > b/target/linux/ramips/base-files/etc/diag.sh >> > index bd0ff05..a941fca 100644 >> > --- a/target/linux/ramips/base-files/etc/diag.sh >> > +++ b/target/linux/ramips/base-files/etc/diag.sh >> > @@ -76,7 +76,8 @@ get_status_led() { >> > ;; >> > awapn2403|\ >> > dir-645|\ >> > - wrh-300cr) >> > + wrh-300cr|\ >> > + sk-wb8) >> >> alphabetic ordering please >> >> > status_led="$board:green:wps" >> > ;; >> > cf-wr800n|\ >> > diff --git a/target/linux/ramips/base-files/lib/ramips.sh >> > b/target/linux/ramips/base-files/lib/ramips.sh >> > index 550ec55..4f1bd41 100755 >> > --- a/target/linux/ramips/base-files/lib/ramips.sh >> > +++ b/target/linux/ramips/base-files/lib/ramips.sh >> > @@ -370,6 +370,9 @@ ramips_board_detect() { >> > *"SAP-G3200U3") >> > name="sap-g3200u3" >> > ;; >> > + *"SamKnows Whitebox 8") >> > + name="sk-wb8" >> > + ;; >> >> alphabetic ordering please >> >> > *"SL-R7205"*) >> > name="sl-r7205" >> > ;; >> > diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh >> > b/target/linux/ramips/base-files/lib/upgrade/platform.sh >> > index 73ba6e6..fcc1b79 100755 >> > --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh >> > +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh >> > @@ -109,6 +109,7 @@ platform_check_image() { >> > rt-n56u|\ >> > rut5xx|\ >> > sap-g3200u3|\ >> > + sk-wb8|\ >> > sl-r7205|\ >> > tew-691gr|\ >> > tew-692gr|\ >> > diff --git a/target/linux/ramips/dts/SK-WB8.dts >> > b/target/linux/ramips/dts/SK-WB8.dts >> > new file mode 100644 >> > index 0000000..3292194 >> > --- /dev/null >> > +++ b/target/linux/ramips/dts/SK-WB8.dts >> > @@ -0,0 +1,122 @@ >> > +/dts-v1/; >> > + >> > +#include "mt7621.dtsi" >> > + >> > +/ { >> > + compatible = "mediatek,mt7621-eval-board", >> "mediatek,mt7621-soc"; >> > + model = "SamKnows SK-WB8"; >> > + >> > + memory@0 { >> > + device_type = "memory"; >> > + reg = <0x0 0x4000000>; >> > + }; >> > + >> > + chosen { >> > + bootargs = "console=ttyS0,57600"; >> > + }; >> > + >> > + palmbus@1E000000 { >> > + spi@b00 { >> > + status = "okay"; >> > + >> > + m25p80@0 { >> > + #address-cells = <1>; >> > + #size-cells = <1>; >> > + compatible = "mx25l6405d"; >> > + reg = <0 0>; >> > + linux,modalias = "m25p80"; >> > + spi-max-frequency = <10000000>; >> > + >> > + partition@0 { >> > + label = "u-boot"; >> > + reg = <0x0 0x30000>; >> > + read-only; >> > + }; >> > + >> > + partition@30000 { >> > + label = "u-boot-env"; >> > + reg = <0x30000 0x10000>; >> > + read-only; >> > + }; >> > + >> > + factory: partition@40000 { >> > + label = "factory"; >> > + reg = <0x40000 0x10000>; >> > + read-only; >> > + }; >> > + >> > + partition@50000 { >> > + label = "firmware"; >> > + reg = <0x50000 0x7b0000>; >> > + }; >> > + >> > + }; >> > + }; >> > + }; >> > + >> > + pcie@1e140000 { >> > + status = "okay"; >> > + >> > + pcie0 { >> > + mt76@0,0 { >> > + reg = <0x0000 0 0 0 0>; >> > + device_type = "pci"; >> > + mediatek,mtd-eeprom = <&factory >> 0x8000>; >> > + mediatek,2ghz = <0>; >> > + }; >> > + }; >> > + >> > + pcie1 { >> > + mt76@1,0 { >> > + reg = <0x0000 0 0 0 0>; >> > + device_type = "pci"; >> > + mediatek,mtd-eeprom = <&factory >> 0x0000>; >> > + mediatek,5ghz = <0>; >> > + }; >> > + }; >> > + }; >> > + >> > + ethernet@1e100000 { >> > + mtd-mac-address = <&factory 0xe000>; >> > + }; >> > + >> > + gpio-leds { >> > + compatible = "gpio-leds"; >> > + >> > + wps { >> > + label = "sk-wb8:green:wps"; >> > + gpios = <&gpio1 14 1>; >> > + }; >> > + >> > + usb { >> > + label = "sk-wb8:green:usb"; >> > + gpios = <&gpio1 15 1>; >> > + }; >> > + }; >> > + >> > + gpio-keys-polled { >> > + compatible = "gpio-keys-polled"; >> > + #address-cells = <1>; >> > + #size-cells = <0>; >> > + poll-interval = <20>; >> > + wps { >> > + label = "wps"; >> > + gpios = <&gpio1 11 1>; >> > + linux,code = <0x211>; >> > + }; >> > + reset { >> > + label = "reset"; >> > + gpios = <&gpio1 9 1>; >> > + linux,code = <0x198>; >> > + }; >> > + }; >> > + >> > + pinctrl { >> > + state_default: pinctrl0 { >> > + gpio { >> > + ralink,group = "i2c", "uart2", >> > "uart3", "rgmii2", "sdhci"; >> > + ralink,function = "gpio"; >> > + }; >> > + }; >> > + }; >> > +}; >> > diff --git a/target/linux/ramips/image/mt7621.mk <http://mt7621.mk> >> > b/target/linux/ramips/image/mt7621.mk <http://mt7621.mk> >> > index 0af9596..3e2f7eb 100644 >> > --- a/target/linux/ramips/image/mt7621.mk <http://mt7621.mk> >> > +++ b/target/linux/ramips/image/mt7621.mk <http://mt7621.mk> >> > @@ -132,6 +132,12 @@ define Device/ubnt-erx >> > endef >> > TARGET_DEVICES += ubnt-erx >> > >> > +define Device/sk-wb8 >> > + DTS := SK-WB8 >> > + IMAGE_SIZE := $(ralink_default_fw_size_16M) >> > +endef >> > +TARGET_DEVICES += sk-wb8 >> > + >> > # FIXME: is this still needed? >> > define Image/Prepare >> > #define Build/Compile >> > diff --git a/target/linux/ramips/mt7621/profiles/sk-wb8.mk >> <http://sk-wb8.mk> >> > b/target/linux/ramips/mt7621/profiles/sk-wb8.mk <http://sk-wb8.mk> >> > new file mode 100644 >> > index 0000000..efa4858 >> > --- /dev/null >> > +++ b/target/linux/ramips/mt7621/profiles/sk-wb8.mk <http://sk-wb8.mk> >> > @@ -0,0 +1,18 @@ >> > +# >> > +# Copyright (C) 2015 OpenWrt.org >> > +# >> > +# This is free software, licensed under the GNU General Public >> License v2. >> > +# See /LICENSE for more information. >> > +# >> > + >> > +define Profile/SK-WB8 >> > + NAME:=SK-WB8 Profile >> > + PACKAGES:=\ >> > + kmod-usb-core kmod-usb3 \ >> > + kmod-ledtrig-usbdev >> > +endef >> > + >> > +define Profile/SK-WB8/Description >> > + Package set optimized for the SamKnows SK-WB8. >> > +endef >> > +$(eval $(call Profile,SK-WB8)) >> > _______________________________________________ >> > openwrt-devel mailing list >> > [email protected] >> <mailto:[email protected]> >> > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel >> > >> _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
