Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- a/target/linux/mvebu/image/Makefile
- +++ b/target/linux/mvebu/image/Makefile
- @@ -157,6 +157,7 @@ $(eval $(call NANDProfile,Caiman,armada-
- $(eval $(call NANDProfile,Cobra,armada-385-linksys-cobra,128KiB,2048,512,2048))
- $(eval $(call NANDProfile,Rango,armada-385-linksys-rango,128KiB,2048,512,2048))
- $(eval $(call NANDProfile,Shelby,armada-385-linksys-shelby,128KiB,2048,512,2048))
- +$(eval $(call NANDProfile,Venom,armada-385-linksys-venom,128KiB,2048,512,2048))
- # Boards with large NOR, where we want to use UBI
- $(eval $(call UBINORProfile,OpenBlocks-AX-3-4,armada-xp-openblocks-ax3-4,128KiB))
- @@ -220,6 +221,16 @@ define Image/Build/Profile/Rango/squashf
- ) > $(BIN_DIR)/$(IMG_PREFIX)-armada-385-linksys-rango-squashfs-factory.img
- endef
- +# Venom: Linksys WRT32X
- +define Image/Build/Profile/Venom/squashfs
- + $(call Image/Build/UbinizeImage,armada-385-linksys-venom,,squashfs, -p 128KiB -m 2048 -s 512 -O 2048)
- + ( \
- + dd if=$(KDIR)/uImage-armada-385-linksys-venom bs=3072k conv=sync; \
- + dd if=$(KDIR)/$(IMG_PREFIX)-armada-385-linksys-venom-squashfs-ubinized.bin \
- + bs=2048 conv=sync; \
- + ) > $(BIN_DIR)/$(IMG_PREFIX)-armada-385-linksys-venom-squashfs-factory.img
- +endef
- +
- ###
- ### Marvell
- ###
- --- a/target/linux/mvebu/profiles/linksys.mk
- +++ b/target/linux/mvebu/profiles/linksys.mk
- @@ -94,3 +94,14 @@ define Profile/Rango/Description
- endef
- $(eval $(call Profile,Rango))
- +
- +define Profile/Venom
- + NAME:=Linksys WRT32X (Venom)
- + PACKAGES:= kmod-mwlwifi wpad-mini swconfig
- +endef
- +
- +define Profile/Venom/Description
- + Package set compatible with the Linksys WRT32X (Venom).
- +endef
- +
- +$(eval $(call Profile,Venom))
- --- a/target/linux/mvebu/patches-3.18/099-build_linksys_a385_dts.patch
- +++ b/target/linux/mvebu/patches-3.18/099-build_linksys_a385_dts.patch
- @@ -1,6 +1,6 @@
- --- a/arch/arm/boot/dts/Makefile
- +++ b/arch/arm/boot/dts/Makefile
- -@@ -501,6 +501,10 @@ dtb-$(CONFIG_MACH_ARMADA_375) += \
- +@@ -501,6 +501,11 @@ dtb-$(CONFIG_MACH_ARMADA_375) += \
- dtb-$(CONFIG_MACH_ARMADA_38X) += \
- armada-385-db.dtb \
- armada-385-db-ap.dtb \
- @@ -8,6 +8,7 @@
- + armada-385-linksys-cobra.dtb \
- + armada-385-linksys-rango.dtb \
- + armada-385-linksys-shelby.dtb \
- ++ armada-385-linksys-venom.dtb \
- armada-385-rd.dtb
- dtb-$(CONFIG_MACH_ARMADA_XP) += \
- armada-xp-axpwifiap.dtb \
- --- a/target/linux/mvebu/patches-3.18/209-solidrun_clearfog.patch
- +++ b/target/linux/mvebu/patches-3.18/209-solidrun_clearfog.patch
- @@ -1,9 +1,9 @@
- --- a/arch/arm/boot/dts/Makefile
- +++ b/arch/arm/boot/dts/Makefile
- -@@ -505,6 +505,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \
- - armada-385-linksys-cobra.dtb \
- +@@ -506,6 +506,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \
- armada-385-linksys-rango.dtb \
- armada-385-linksys-shelby.dtb \
- + armada-385-linksys-venom.dtb \
- + armada-388-clearfog.dtb \
- armada-385-rd.dtb
- dtb-$(CONFIG_MACH_ARMADA_XP) += \
- --- a/dev/null
- +++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-venom.dts
- @@ -0,0 +1,409 @@
- +/*
- + * Device Tree file for the Linksys WRT32X (Venom)
- + *
- + * Copyright (C) 2017 Imre Kaloz <kaloz@openwrt.org>
- + *
- + *
- + * This file is dual-licensed: you can use it either under the terms
- + * of the GPL or the X11 license, at your option. Note that this dual
- + * licensing only applies to this file, and not this project as a
- + * whole.
- + *
- + * a) This file is licensed under the terms of the GNU General Public
- + * License version 2. This program is licensed "as is" without
- + * any warranty of any kind, whether express or implied.
- + *
- + * Or, alternatively,
- + *
- + * b) Permission is hereby granted, free of charge, to any person
- + * obtaining a copy of this software and associated documentation
- + * files (the "Software"), to deal in the Software without
- + * restriction, including without limitation the rights to use,
- + * copy, modify, merge, publish, distribute, sublicense, and/or
- + * sell copies of the Software, and to permit persons to whom the
- + * Software is furnished to do so, subject to the following
- + * conditions:
- + *
- + * The above copyright notice and this permission notice shall be
- + * included in all copies or substantial portions of the Software.
- + *
- + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- + * OTHER DEALINGS IN THE SOFTWARE.
- + */
- +
- +/dts-v1/;
- +#include <dt-bindings/gpio/gpio.h>
- +#include <dt-bindings/input/input.h>
- +#include "armada-385.dtsi"
- +
- +/ {
- + model = "Linksys WRT32X";
- + compatible = "linksys,venom", "linksys,armada385", "marvell,armada385",
- + "marvell,armada380";
- +
- + chosen {
- + stdout-path = "serial0:115200n8";
- + };
- +
- + memory {
- + device_type = "memory";
- + reg = <0x00000000 0x20000000>; /* 512 MB */
- + };
- +
- + soc {
- + ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
- + MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
- + MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
- + MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
- + MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
- +
- + internal-regs {
- +
- + spi@10600 {
- + status = "disabled";
- + };
- +
- + i2c@11000 {
- + pinctrl-names = "default";
- + pinctrl-0 = <&i2c0_pins>;
- + status = "okay";
- +
- + tmp421@4c {
- + compatible = "ti,tmp421";
- + reg = <0x4c>;
- + };
- +
- + pca9635@68 {
- + #address-cells = <1>;
- + #size-cells = <0>;
- + compatible = "nxp,pca9635";
- + reg = <0x68>;
- +
- + wan_amber@0 {
- + label = "venom:amber:wan";
- + reg = <0x0>;
- + };
- +
- + wan_blue@1 {
- + label = "venom:blue:wan";
- + reg = <0x1>;
- + };
- +
- + wlan_2g@2 {
- + label = "venom:blue:wlan_2g";
- + reg = <0x2>;
- + };
- +
- + wlan_5g@3 {
- + label = "venom:blue:wlan_5g";
- + reg = <0x3>;
- + };
- +
- + usb2@5 {
- + label = "venom:blue:usb2";
- + reg = <0x5>;
- + };
- +
- + usb3_1@6 {
- + label = "venom:blue:usb3_1";
- + reg = <0x6>;
- + };
- +
- + usb3_2@7 {
- + label = "venom:blue:usb3_2";
- + reg = <0x7>;
- + };
- +
- + wps_blue@8 {
- + label = "venom:blue:wps";
- + reg = <0x8>;
- + };
- +
- + wps_amber@9 {
- + label = "venom:amber:wps";
- + reg = <0x9>;
- + };
- + };
- + };
- +
- + /* J10: VCC, NC, RX, NC, TX, GND */
- + serial@12000 {
- + status = "okay";
- + };
- +
- + ethernet@70000 {
- + status = "okay";
- + phy-mode = "rgmii-id";
- + fixed-link {
- + speed = <1000>;
- + full-duplex;
- + };
- + };
- +
- + ethernet@34000 {
- + status = "okay";
- + phy-mode = "sgmii";
- + fixed-link {
- + speed = <1000>;
- + full-duplex;
- + };
- + };
- +
- + mdio {
- + status = "okay";
- + };
- +
- + sata@a8000 {
- + status = "okay";
- + };
- +
- + /* USB part of the eSATA/USB 2.0 port */
- + usb@58000 {
- + status = "okay";
- + };
- +
- + usb3@f8000 {
- + status = "okay";
- + usb-phy = <&usb3_phy>;
- + };
- +
- + flash@d0000 {
- + status = "okay";
- + num-cs = <1>;
- + marvell,nand-keep-config;
- + marvell,nand-enable-arbiter;
- + nand-on-flash-bbt;
- +
- + partition@0 {
- + label = "u-boot";
- + reg = <0x0000000 0x200000>; /* 2MB */
- + /* read-only; */
- + };
- +
- + partition@200000 {
- + label = "u_env";
- + reg = <0x200000 0x20000>; /* 128KB */
- + };
- +
- + partition@220000 {
- + label = "s_env";
- + reg = <0x220000 0x40000>; /* 256KB */
- + };
- +
- + partition@180000 {
- + label = "unused_area";
- + reg = <0x260000 0x5c0000>; /* 5.75MB */
- + };
- +
- + partition@7e0000 {
- + label = "devinfo";
- + reg = <0x7e0000 0x40000>; /* 256KB */
- + read-only;
- + };
- +
- + /* kernel1 overlaps with rootfs1 by design */
- + partition@900000 {
- + label = "kernel1";
- + reg = <0x900000 0x7b00000>; /* 123MB */
- + };
- +
- + partition@c00000 {
- + label = "rootfs1";
- + reg = <0xc00000 0x7800000>; /* 120MB */
- + };
- +
- + /* kernel2 overlaps with rootfs2 by design */
- + partition@8400000 {
- + label = "kernel2";
- + reg = <0x8400000 0x7b00000>; /* 123MB */
- + };
- +
- + partition@8700000 {
- + label = "rootfs2";
- + reg = <0x8700000 0x7800000>; /* 120MB */
- + };
- +
- + /* last MB is for the BBT, not writable */
- + partition@ff00000 {
- + label = "BBT";
- + reg = <0xff00000 0x100000>;
- + };
- +
- + };
- + };
- +
- + pcie-controller {
- + status = "okay";
- +
- + pcie@1,0 {
- + /* Marvell 88W8964, 5GHz-only */
- + status = "okay";
- +
- + mwlwifi {
- + marvell,2ghz = <0>;
- + marvell,chainmask = <4 4>;
- + };
- +
- + };
- +
- + pcie@2,0 {
- + /* Marvell 88W8964, 2GHz-only */
- + status = "okay";
- +
- + mwlwifi {
- + marvell,5ghz = <0>;
- + marvell,chainmask = <4 4>;
- + };
- +
- + };
- + };
- + };
- +
- + usb3_phy: usb3_phy {
- + compatible = "usb-nop-xceiv";
- + vcc-supply = <®_xhci0_vbus>;
- + };
- +
- + reg_xhci0_vbus: xhci0-vbus {
- + compatible = "regulator-fixed";
- + pinctrl-names = "default";
- + pinctrl-0 = <&xhci0_vbus_pins>;
- + regulator-name = "xhci0-vbus";
- + regulator-min-microvolt = <5000000>;
- + regulator-max-microvolt = <5000000>;
- + enable-active-high;
- + gpio = <&gpio1 16 GPIO_ACTIVE_HIGH>;
- + };
- +
- + gpio_keys {
- + compatible = "gpio-keys";
- + #address-cells = <1>;
- + #size-cells = <0>;
- + pinctrl-0 = <&keys_pin>;
- + pinctrl-names = "default";
- +
- + button@1 {
- + label = "WPS";
- + linux,code = <KEY_WPS_BUTTON>;
- + gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
- + };
- +
- + button@2 {
- + label = "Factory Reset Button";
- + linux,code = <KEY_RESTART>;
- + gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
- + };
- + };
- +
- + gpio-leds {
- + compatible = "gpio-leds";
- + pinctrl-0 = <&power_led_pin &sata_led_pin>;
- + pinctrl-names = "default";
- +
- + power {
- + gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
- + default-state = "on";
- + };
- +
- + sata {
- + gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
- + default-state = "off";
- + };
- + };
- +
- + dsa@0 {
- + compatible = "marvell,dsa";
- + #address-cells = <2>;
- + #size-cells = <0>;
- +
- + dsa,ethernet = <ð2>;
- + dsa,mii-bus = <&mdio>;
- +
- + switch@0 {
- + #address-cells = <1>;
- + #size-cells = <0>;
- + reg = <0x0 0>; /* MDIO address 0, switch 0 in tree */
- +
- + port@0 {
- + reg = <0>;
- + label = "lan4";
- + };
- +
- + port@1 {
- + reg = <1>;
- + label = "lan3";
- + };
- +
- + port@2 {
- + reg = <2>;
- + label = "lan2";
- + };
- +
- + port@3 {
- + reg = <3>;
- + label = "lan1";
- + };
- +
- + port@4 {
- + reg = <4>;
- + label = "wan";
- + };
- +
- + port@5 {
- + reg = <5>;
- + label = "cpu";
- + };
- + };
- + };
- +
- + gpio-leds {
- + power {
- + label = "venom:blue:power";
- + };
- +
- + sata {
- + label = "venom:blue:sata";
- + };
- + };
- +
- + mvsw61xx {
- + #address-cells = <1>;
- + #size-cells = <0>;
- + compatible = "marvell,88e6352";
- + status = "okay";
- + reg = <0x10>;
- +
- + mii-bus = <&mdio>;
- + cpu-port-0 = <5>;
- + cpu-port-1 = <6>;
- + };
- +
- +};
- +
- +&pinctrl {
- + keys_pin: keys-pin {
- + marvell,pins = "mpp24", "mpp29";
- + marvell,function = "gpio";
- + };
- +
- + power_led_pin: power-led-pin {
- + marvell,pins = "mpp56";
- + marvell,function = "gpio";
- + };
- +
- + sata_led_pin: sata-led-pin {
- + marvell,pins = "mpp21";
- + marvell,function = "gpio";
- + };
- +
- + xhci0_vbus_pins: xhci0-vbus-pins {
- + marvell,pins = "mpp47";
- + marvell,function = "gpio";
- + };
- +};
- --- a/target/linux/mvebu/base-files/etc/diag.sh
- +++ b/target/linux/mvebu/base-files/etc/diag.sh
- @@ -6,6 +6,21 @@
- get_status_led() {
- case $(mvebu_board_name) in
- + armada-385-linksys-caiman)
- + status_led="caiman:white:power"
- + ;;
- + armada-385-linksys-cobra)
- + status_led="cobra:white:power"
- + ;;
- + armada-385-linksys-rango)
- + status_led="rango:white:power"
- + ;;
- + armada-385-linksys-shelby)
- + status_led="shelby:white:power"
- + ;;
- + armada-385-linksys-venom)
- + status_led="venom:blue:power"
- + ;;
- armada-xp-linksys-mamba)
- status_led="mamba:white:power"
- ;;
- --- a/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
- +++ b/target/linux/mvebu/base-files/etc/uci-defaults/01_leds
- @@ -29,6 +29,10 @@ armada-385-linksys-shelby)
- ucidef_set_led_usbdev "usb2" "USB2" "pca963x:shelby:white:usb2" "1-1"
- ucidef_set_led_usbdev "usb3" "USB3" "pca963x:shelby:white:usb3_1" "2-1"
- ;;
- +armada-385-linksys-venom)
- + ucidef_set_led_netdev "wan" "WAN" "pca963x:venom:blue:wan" "eth0"
- + ucidef_set_led_usbdev "usb2" "USB2" "pca963x:venom:blue:usb2" "1-1"
- + ucidef_set_led_usbdev "usb3" "USB3" "pca963x:venom:blue:usb3_1" "2-1"
- armada-xp-linksys-mamba)
- ucidef_set_led_netdev "wan" "WAN" "mamba:white:wan" "eth1"
- ucidef_set_led_usbdev "usb2" "USB2" "mamba:white:usb2" "1-1"
- --- a/target/linux/mvebu/base-files/etc/uci-defaults/02_network
- +++ b/target/linux/mvebu/base-files/etc/uci-defaults/02_network
- @@ -27,6 +27,9 @@ armada-385-linksys-rango)
- armada-385-linksys-shelby)
- ucidef_set_interfaces_lan_wan "eth1" "eth0"
- ;;
- +armada-385-linksys-venom)
- + ucidef_set_interfaces_lan_wan "eth1" "eth0"
- + ;;
- armada-xp-linksys-mamba)
- ucidef_set_interfaces_lan_wan "eth0" "eth1"
- ucidef_add_switch "switch0" "1" "1"
- --- a/target/linux/mvebu/base-files/etc/uci-defaults/03_wireless
- +++ b/target/linux/mvebu/base-files/etc/uci-defaults/03_wireless
- @@ -10,7 +10,7 @@
- board=$(mvebu_board_name)
- case "$board" in
- -armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba)
- +armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-385-linksys-venom|armada-xp-linksys-mamba)
- SKU=$(strings /dev/mtd3|sed -ne 's/^cert_region=//p')
- case "$SKU" in
- AP)
- --- a/target/linux/mvebu/base-files/etc/init.d/linksys_recovery
- +++ b/target/linux/mvebu/base-files/etc/init.d/linksys_recovery
- @@ -7,7 +7,7 @@ boot() {
- . /lib/mvebu.sh
- case $(mvebu_board_name) in
- - armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
- + armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-385-linksys-venom|armada-xp-linksys-mamba)
- # make sure auto_recovery in uboot is always on
- AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`"
- if [ "$AUTO_RECOVERY_ENA" != "yes" ] ; then
- --- a/target/linux/mvebu/base-files/lib/mvebu.sh
- +++ b/target/linux/mvebu/base-files/lib/mvebu.sh
- @@ -46,6 +46,9 @@ mvebu_board_detect() {
- *"Linksys WRT3200ACM")
- name="armada-385-linksys-rango"
- ;;
- + *"Linksys WRT32X")
- + name="armada-385-linksys-venom"
- + ;;
- *"Marvell Armada 385 Access Point Development Board")
- name="armada-385-db-ap"
- ;;
- --- a/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac
- +++ b/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac
- @@ -15,7 +15,7 @@ preinit_set_mac_address() {
- ifconfig eth0 hw ether $mac 2>/dev/null
- ifconfig eth1 hw ether $mac_wan 2>/dev/null
- ;;
- - armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby)
- + armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-385-linksys-venom)
- mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
- mac_wan=$(macaddr_setbit_la "$mac")
- ifconfig eth1 hw ether $mac 2>/dev/null
- --- a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg
- +++ b/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg
- @@ -8,7 +8,7 @@ preinit_mount_syscfg() {
- . /lib/mvebu.sh
- case $(mvebu_board_name) in
- - armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
- + armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-385-linksys-venom|armada-xp-linksys-mamba)
- needs_recovery=0
- syscfg_part=$(grep syscfg /proc/mtd |cut -c4)
- ubiattach -m $syscfg_part || needs_recovery=1
- --- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
- +++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
- @@ -55,7 +55,7 @@ platform_do_upgrade_linksys() {
- nand_upgrade_tar "$1"
- }
- - [ "$magic_long" = "27051956" ] && {
- + [ "$magic_long" = "27051956" -o "$magic_long" = "0000a0e1" ] && {
- # check firmwares' rootfs types
- local target_mtd=$(find_mtd_part $part_label)
- local oldroot="$(linksys_get_root_magic $target_mtd)"
- --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh
- +++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
- @@ -20,6 +20,13 @@ platform_check_image() {
- }
- return 0;
- ;;
- + armada-385-linksys-venom)
- + [ "$magic_long" != "0000a0e1" -a "$magic_long" != "73797375" ] && {
- + echo "Invalid image type."
- + return 1
- + }
- + return 0;
- + ;;
- esac
- echo "Sysupgrade is not yet supported on $board."
- @@ -30,7 +37,7 @@ platform_do_upgrade() {
- local board=$(mvebu_board_name)
- case "$board" in
- - armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
- + armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-385-linksys-venom|armada-xp-linksys-mamba)
- platform_do_upgrade_linksys "$ARGV"
- ;;
- *)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement