diff --git a/package/base-files/files/lib/functions/migrations.sh b/package/base-files/files/lib/functions/migrations.sh new file mode 100644 index 0000000000..b180a0242f --- /dev/null +++ b/package/base-files/files/lib/functions/migrations.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +. /lib/functions.sh + +migrate_led_sysfs() { + local cfg="$1"; shift + local tuples="$@" + local sysfs + local name + + config_get sysfs ${cfg} sysfs + config_get name ${cfg} name + + [ -z "${sysfs}" ] && return + + for tuple in ${tuples}; do + local old=${tuple%=*} + local new=${tuple#*=} + local new_sysfs + + new_sysfs=$(echo ${sysfs} | sed "s/${old}/${new}/") + + [ "${new_sysfs}" = "${sysfs}" ] && continue + + uci set system.${cfg}.sysfs="${new_sysfs}" + + logger -t led-migration "sysfs option of LED \"${name}\" updated to ${new_sysfs}" + done; +} + +migrate_leds() { + config_load system + config_foreach migrate_led_sysfs led "$@" +} + +migrations_apply() { + local realm="$1" + [ -n "$(uci changes ${realm})" ] && uci -q commit ${realm} +} diff --git a/target/linux/lantiq/ase/base-files/etc/board.d/01_leds b/target/linux/lantiq/ase/base-files/etc/board.d/01_leds new file mode 100755 index 0000000000..6a8de7d7a5 --- /dev/null +++ b/target/linux/lantiq/ase/base-files/etc/board.d/01_leds @@ -0,0 +1,32 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/leds.sh +. /lib/functions/uci-defaults.sh + +board_config_update + +led_dsl="$(get_dt_led dsl)" +[ -n "$led_dsl" ] && { + led_internet="$(get_dt_led internet)" + if [ -n "$led_internet" ]; then + ucidef_set_led_default "dsl" "dsl" "$led_dsl" "0" + ucidef_set_led_netdev "internet" "internet" "$led_internet" "pppoe-wan" + else + ucidef_set_led_netdev "dsl" "dsl" "$led_dsl" "dsl0" + fi +} + +board=$(board_name) + +case "$board" in +allnet,all0333cj) + ucidef_set_led_netdev "lan" "lan" "all0333cj:green:lan" "eth0.1" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/ase/base-files/etc/board.d/02_network b/target/linux/lantiq/ase/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..0bda3e4763 --- /dev/null +++ b/target/linux/lantiq/ase/base-files/etc/board.d/02_network @@ -0,0 +1,56 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh +. /lib/functions/system.sh +. /lib/functions/lantiq.sh + +lantiq_setup_interfaces() +{ + local board="$1" + + case "$board" in + *) + ucidef_set_interface_lan 'eth0' + ;; + esac +} + +lantiq_setup_dsl() +{ + local board="$1" + local annex="b" + + case "$board" in + esac + + lantiq_setup_dsl_helper "$annex" +} + +lantiq_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + + case "$board" in + allnet,all0333cj) + lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ;; + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" +} + +board_config_update +board=$(board_name) +lantiq_setup_interfaces $board +lantiq_setup_dsl $board +lantiq_setup_macs $board +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/ase/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/ase/base-files/lib/upgrade/platform.sh new file mode 100644 index 0000000000..d088601bb0 --- /dev/null +++ b/target/linux/lantiq/ase/base-files/lib/upgrade/platform.sh @@ -0,0 +1,10 @@ +PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 + +platform_check_image() { + return 0 +} + +platform_do_upgrade() { + default_do_upgrade "$1" +} diff --git a/target/linux/lantiq/ase/config-4.19 b/target/linux/lantiq/ase/config-4.19 index cf27a148b7..0c211847d2 100644 --- a/target/linux/lantiq/ase/config-4.19 +++ b/target/linux/lantiq/ase/config-4.19 @@ -5,7 +5,6 @@ CONFIG_CPU_MIPSR1=y CONFIG_CRC16=y CONFIG_CRYPTO_ACOMP2=y CONFIG_CRYPTO_DEFLATE=y -CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIRMWARE_MEMMAP=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network deleted file mode 100755 index a6a9e4d29d..0000000000 --- a/target/linux/lantiq/base-files/etc/board.d/02_network +++ /dev/null @@ -1,268 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2011-2015 OpenWrt.org -# - -. /lib/functions/uci-defaults.sh -. /lib/functions/system.sh -. /lib/functions/lantiq.sh - -board_config_update - -vpi=1 -vci=32 -annex="a" -tone="av" -xfer_mode="" -encaps="llc" -payload="bridged" -lan_mac="" -wan_mac="" -interface_wan="dsl0" - -board=$(board_name) - -case "$board" in -audiocodes,mp-252) - ucidef_add_switch "switch0" \ - "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" - ;; - -allnet,all0333cj) - annex="b" - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_set_interface_lan 'eth0' - ;; - -arcadyan,arv4510pw) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan:4" "2:lan:2" "1:lan:3" "3:lan:1" "5t@eth0" - ;; - -arcadyan,arv4519pw|arcadyan,arv7510pw22|arcadyan,arv7518pw) - ucidef_add_switch "switch0" \ - "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" - ;; - -arcadyan,arv4520pw) - annex="b" - ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" - ;; - -arcadyan,arv4525pw|arcadyan,arv452cqw|arcadyan,arv7525pw|arcadyan,arv752dpw) - annex="b" - ucidef_set_interface_lan 'eth0' - ;; - -arcadyan,arv7506pw11) - annex="b" - wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2) - ucidef_add_switch "switch0" \ - "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" - ;; - -arcadyan,arv7519pw) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 1) - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0" - ;; - -arcadyan,arv7519rw22) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 22)" 1) - ucidef_add_switch "switch0" \ - "0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0" - ;; - -arcadyan,arv752dpw22|arcadyan,arv8539pw22) - annex="b" - ucidef_add_switch "switch0" \ - "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" - ;; - -alphanetworks,asl56026) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(mtd_get_mac_ascii uboot_env wanmac) - ucidef_add_switch "switch0"\ - "2:lan" "3:lan" "6t@eth0" - ;; - -bt,homehub-v2b) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "1:lan" "2:lan" "3:lan" "4:lan" "5t@eth0" - ;; - -bt,homehub-v3a) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_set_interface_lan 'eth0' - ;; - -bt,homehub-v5a) - lan_mac=$(mtd_get_mac_binary_ubi caldata 4364) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" - ;; - -netgear,dgn1000b) - annex="b" - ucidef_set_interface_lan 'eth0' - ;; - -netgear,dgn3500|netgear,dgn3500b) - lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" - ;; - -netgear,dm200) - lan_mac=$(mtd_get_mac_binary ART 0) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_set_interface_lan 'eth0' - ;; - -lantiq,easy80920-nand|lantiq,easy80920-nor) - lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" - ;; - -avm,fritz3370-rev2-hynix|\ -avm,fritz3370-rev2-micron) - annex="b" - lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) - wan_mac=$(macaddr_add "$lan_mac" 3) - ucidef_add_switch "switch0" \ - "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" - ;; - -avm,fritz7312|\ -avm,fritz7320) - annex="b" - wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 2705)" 1) - ucidef_set_interface_lan 'eth0' - ;; - -avm,fritz7360sl) - annex="b" - wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 2705)" 1) - ucidef_add_switch "switch0" \ - "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" - ;; - -avm,fritz7362sl) - annex="b" - lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) - wan_mac=$(fritz_tffs -n macdsl -i $(find_mtd_part "tffs (1)")) - ucidef_add_switch "switch0" \ - "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" - ;; - -avm,fritz7412) - tffsdev=$(find_mtd_chardev "nand-tffs") - annex="b" - lan_mac=$(/usr/bin/fritz_tffs_nand -d $tffsdev -n maca -o) - wan_mac=$(/usr/bin/fritz_tffs_nand -d $tffsdev -n macdsl -o) - ucidef_set_interface_lan 'eth0' - ;; - -siemens,gigaset-sx76x) - annex="b" - ucidef_add_switch "switch0" \ - "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" - ;; - -zte,h201l) - annex="b" - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0" - ;; - -zyxel,p-2601hn) - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "3:lan" "5t@eth0" - ;; - -zyxel,p-2812hnu-f1|zyxel,p-2812hnu-f3) - lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "0:lan" "1:lan" "2:lan" "4:lan" "5:wan" "6t@eth0" - ;; - -tplink,tdw8970|tplink,tdw8980) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 61696)" 1) - ucidef_add_switch "switch0" \ - "0:lan:2" "2:lan:3" "4:lan:4" "5:lan:1" "6t@eth0" - ;; - -arcadyan,vg3503j) - lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) - wan_mac=$(macaddr_add "$lan_mac" 1) - ucidef_add_switch "switch0" \ - "2:lan:2" "4:lan:1" "6t@eth0" - ;; - -tplink,vr200|tplink,vr200v) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 61696)" 1) - ucidef_add_switch "switch0" \ - "0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0" - ;; - -arcadyan,vgv7510kw22-nor|arcadyan,vgv7510kw22-brn) - annex="b" - wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2) - ucidef_add_switch "switch0" \ - "2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "0:wan:5" "6t@eth0" - ;; - -arcadyan,vgv7519-nor|arcadyan,vgv7519-brn) - wan_mac=$(mtd_get_mac_binary board_config 22) - ucidef_add_switch "switch0" \ - "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" - ;; - -buffalo,wbmr-hp-g300h) - ucidef_add_switch "switch0" \ - "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" - ;; - -buffalo,wbmr-300hpd) - lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr) - wan_mac="$lan_mac" - ucidef_add_switch "switch0" \ - "5:lan:2" "2:lan:3" "3:lan:4" "4:wan:1" "6t@eth0" - ;; - -*) - ucidef_set_interface_lan 'eth0' - ;; - -esac - -ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ - ucidef_add_atm_bridge "$vpi" "$vci" "$encaps" "$payload" "dsl" - -if lantiq_is_vdsl_system; then - ucidef_add_vdsl_modem "$annex" "$tone" "$xfer_mode" -else - ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" -fi - -ucidef_set_interface_wan "$interface_wan" "pppoe" - -[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" -[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" - -board_config_flush - -exit 0 - diff --git a/target/linux/lantiq/base-files/etc/hotplug.d/dsl/pppoa.sh b/target/linux/lantiq/base-files/etc/hotplug.d/dsl/pppoa.sh index b9a3313c83..4506737672 100755 --- a/target/linux/lantiq/base-files/etc/hotplug.d/dsl/pppoa.sh +++ b/target/linux/lantiq/base-files/etc/hotplug.d/dsl/pppoa.sh @@ -8,7 +8,7 @@ include /lib/network scan_interfaces -interfaces=`ubus list network.interface.\* | cut -d"." -f3` +interfaces=$(ubus list network.interface.\* | cut -d"." -f3) for ifc in $interfaces; do json_load "$(ifstatus $ifc)" diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration b/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration index dc594e35e9..b1e7be6bd2 100644 --- a/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration +++ b/target/linux/lantiq/base-files/etc/uci-defaults/01_led_migration @@ -3,37 +3,7 @@ # Copyright (C) 2013 OpenWrt.org # -LED_OPTIONS_CHANGED=0 - -. /lib/functions.sh - -do_led_update_sysfs() -{ - local cfg=$1; shift - local tuples="$@" - local sysfs - local name - - config_get sysfs $cfg sysfs - config_get name $cfg name - - [ -z "$sysfs" ] && return - - for tuple in $tuples; do - local old=${tuple%=*} - local new=${tuple#*=} - local new_sysfs - - new_sysfs=$(echo ${sysfs} | sed "s/${old}/${new}/") - - [ "$new_sysfs" = "$sysfs" ] && continue - - uci set system.${cfg}.sysfs="${new_sysfs}" - LED_OPTIONS_CHANGED=1 - - logger -t led-migration "sysfs option of LED \"${name}\" updated to ${new_sysfs}" - done; -} +. /lib/functions/migrations.sh do_internet_led_rename() { @@ -45,38 +15,29 @@ do_internet_led_rename() uci rename system.led_internet=led_dsl uci set system.led_dsl.name=dsl - LED_OPTIONS_CHANGED=1 logger -t led-migration "internet led renamed to dsl" } -migrate_leds() -{ - config_load system - config_foreach do_led_update_sysfs led "$@" -} - case "$(board_name)" in +alphanetworks,asl56026|\ arcadyan,arv452cqw|\ arcadyan,arv7510pw22|\ arcadyan,arv7519rw22|\ arcadyan,arv752dpw|\ arcadyan,arv752dpw22|\ -alphanetworks,asl56026|\ +arcadyan,vg3503j|\ +avm,fritz7360sl|\ bt,homehub-v2b|\ bt,homehub-v3a|\ -bt,homehub-v5a|\ -avm,fritz7360sl|\ -arcadyan,vg3503j) +bt,homehub-v5a) do_internet_led_rename ;; netgear,dgn3500|\ netgear,dgn3500b) migrate_leds "dgn3500:blue:wireless=dgn3500:green:wireless" ;; -*) - ;; esac -[ "$LED_OPTIONS_CHANGED" = "1" ] && uci commit system +migrations_apply system exit 0 diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface b/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface index 3b0313d1aa..dd57ca6d39 100644 --- a/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface +++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_migrate_xdsl_iface @@ -1,7 +1,6 @@ #!/bin/sh . /lib/functions.sh -. /lib/functions/lantiq.sh IFNAME_CHANGED=0 diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq.sh b/target/linux/lantiq/base-files/lib/functions/lantiq.sh index 62c7a6b662..e88e638285 100644 --- a/target/linux/lantiq/base-files/lib/functions/lantiq.sh +++ b/target/linux/lantiq/base-files/lib/functions/lantiq.sh @@ -1,5 +1,18 @@ -#!/bin/sh - lantiq_is_vdsl_system() { grep -qE "system type.*: (VR9|xRX200)" /proc/cpuinfo } + +lantiq_setup_dsl_helper() { + local annex="$1" + + ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \ + ucidef_add_atm_bridge "1" "32" "llc" "bridged" "dsl" + + if lantiq_is_vdsl_system; then + ucidef_add_vdsl_modem "$annex" "av" + else + ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" + fi + + ucidef_set_interface_wan "dsl0" "pppoe" +} diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh index 8665240da4..11b02fc4aa 100755 --- a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh +++ b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh @@ -290,8 +290,8 @@ xtse() { annex_s="$annex_s M," fi - annex_s=`echo ${annex_s:1}` - annex_s=`echo ${annex_s%?}` + annex_s=${annex_s:1} + annex_s=${annex_s%?} # Evaluate Line Mode (according to G.997.1, 7.3.1.1.1) @@ -346,8 +346,8 @@ xtse() { line_mode_s="$line_mode_s G.993.1 (VDSL)," fi - line_mode_s=`echo ${line_mode_s:1}` - line_mode_s=`echo ${line_mode_s%?}` + line_mode_s=${line_mode_s:1} + line_mode_s=${line_mode_s%?} xtse_s="${xtse1}, ${xtse2}, ${xtse3}, ${xtse4}, ${xtse5}, ${xtse6}, ${xtse7}, ${xtse8}" @@ -451,7 +451,8 @@ latency_delay() { errors() { local lsctg local dpctg - local ccsg + local fecsf + local fecsn local esf local esn local sesf @@ -468,16 +469,15 @@ errors() { local hecf local hecn - local fecn - local fecf - lsctg=$(dsl_cmd pmlsctg 1) + fecsf=$(dsl_val "$lsctg" nFECS) esf=$(dsl_val "$lsctg" nES) sesf=$(dsl_val "$lsctg" nSES) lossf=$(dsl_val "$lsctg" nLOSS) uasf=$(dsl_val "$lsctg" nUAS) lsctg=$(dsl_cmd pmlsctg 0) + fecsn=$(dsl_val "$lsctg" nFECS) esn=$(dsl_val "$lsctg" nES) sesn=$(dsl_val "$lsctg" nSES) lossn=$(dsl_val "$lsctg" nLOSS) @@ -493,15 +493,9 @@ errors() { crc_pn=$(dsl_val "$dpctg" nCRC_P) crcp_pn=$(dsl_val "$dpctg" nCRCP_P) - ccsg=$(dsl_cmd pmccsg 0 1 0) - fecf=$(dsl_val "$ccsg" nFEC) - - ccsg=$(dsl_cmd pmccsg 0 0 0) - fecn=$(dsl_val "$ccsg" nFEC) - if [ "$action" = "lucistat" ]; then - echo "dsl.errors_fec_near=${fecn:-nil}" - echo "dsl.errors_fec_far=${fecf:-nil}" + echo "dsl.errors_fecs_near=${fecsn:-nil}" + echo "dsl.errors_fecs_far=${fecsf:-nil}" echo "dsl.errors_es_near=${esn:-nil}" echo "dsl.errors_es_far=${esf:-nil}" echo "dsl.errors_ses_near=${sesn:-nil}" @@ -517,7 +511,7 @@ errors() { echo "dsl.errors_crcp_p_near=${crcp_pn:-nil}" echo "dsl.errors_crcp_p_far=${crcp_pf:-nil}" else - echo "Forward Error Correction Seconds (FECS): Near: ${fecn} / Far: ${fecf}" + echo "Forward Error Correction Seconds (FECS): Near: ${fecsn} / Far: ${fecsf}" echo "Errored seconds (ES): Near: ${esn} / Far: ${esf}" echo "Severely Errored Seconds (SES): Near: ${sesn} / Far: ${sesf}" echo "Loss of Signal Seconds (LOSS): Near: ${lossn} / Far: ${lossf}" @@ -734,7 +728,7 @@ profile() { fi } -status() { +dslstat() { vendor chipset xtse @@ -750,6 +744,6 @@ status() { lucistat() { echo "local dsl={}" - status + dslstat echo "return dsl" } diff --git a/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq b/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq index 7ed0fabcf7..4f7dc6673c 100644 --- a/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq +++ b/target/linux/lantiq/base-files/lib/preinit/05_set_preinit_iface_lantiq @@ -1,7 +1,5 @@ #!/bin/sh -. /lib/functions/lantiq.sh - set_preinit_iface() { ifname=eth0 } diff --git a/target/linux/lantiq/falcon/base-files/etc/board.d/02_network b/target/linux/lantiq/falcon/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..7998efc2a0 --- /dev/null +++ b/target/linux/lantiq/falcon/base-files/etc/board.d/02_network @@ -0,0 +1,52 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh +. /lib/functions/system.sh +. /lib/functions/lantiq.sh + +lantiq_setup_interfaces() +{ + local board="$1" + + case "$board" in + *) + ucidef_set_interface_lan 'eth0' + ;; + esac +} + +lantiq_setup_dsl() +{ + local board="$1" + local annex="a" + + case "$board" in + esac + + lantiq_setup_dsl_helper "$annex" +} + +lantiq_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + + case "$board" in + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" +} + +board_config_update +board=$(board_name) +lantiq_setup_interfaces $board +lantiq_setup_dsl $board +lantiq_setup_macs $board +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/falcon/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/falcon/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..d088601bb0 --- /dev/null +++ b/target/linux/lantiq/falcon/base-files/lib/upgrade/platform.sh @@ -0,0 +1,10 @@ +PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 + +platform_check_image() { + return 0 +} + +platform_do_upgrade() { + default_do_upgrade "$1" +} diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse.dtsi similarity index 84% rename from target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse.dtsi index feb4cd529a..496150b7a7 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse.dtsi @@ -133,6 +133,8 @@ "spi_frm"; #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>, <&spi_cs4_pins>; status = "disabled"; }; @@ -148,6 +150,40 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe100b10 0xa0>; + + asc_pins: asc-pins { + mux { + lantiq,groups = "asc"; + lantiq,function = "asc"; + }; + }; + + mdio_pins: mdio { + mux { + lantiq,groups = "mdio"; + lantiq,function = "mdio"; + }; + }; + + spi_pins: spi { + mux-0 { + lantiq,groups = "spi_di"; + lantiq,function = "spi"; + }; + mux-1 { + lantiq,groups = "spi_do", "spi_clk"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; + + spi_cs4_pins: spi-cs4 { + mux { + lantiq,groups = "spi_cs4"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; }; asc1: serial@e100c00 { @@ -155,6 +191,8 @@ reg = <0xe100c00 0x400>; interrupt-parent = <&icu0>; interrupts = <72 74 75>; + pinctrl-0 = <&asc_pins>; + pinctrl-names = "default"; }; mei@e116000 { @@ -198,6 +236,8 @@ reg = <0xe180000 0x40000>; interrupt-parent = <&icu0>; interrupts = <105 109>; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts index ef57b2f06b..c5dd1600f4 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts @@ -61,10 +61,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - asc { - lantiq,groups = "asc"; - lantiq,function = "asc"; - }; keys_in { lantiq,pins = "io0",/* "io25", */"io29"; lantiq,pull = <2>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts similarity index 87% rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts index b4eee73b73..943b00f898 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts @@ -86,28 +86,12 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - asc { - lantiq,groups = "asc"; - lantiq,function = "asc"; - }; keys_in { lantiq,pins = "io0",/* "io25", */"io29"; lantiq,pull = <2>; lantiq,open-drain = <1>; }; }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs1"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &gsw { @@ -117,8 +101,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; flash@1 { compatible = "jedec,spi-nor"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9.dtsi similarity index 66% rename from target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9.dtsi index 37b44aecdd..12af82b8ce 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9.dtsi @@ -160,6 +160,8 @@ "spi_frm"; #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>, <&spi_cs4_pins>; status = "disabled"; }; @@ -168,6 +170,149 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe100b10 0xa0>; + + mdio_pins: mdio { + mux { + lantiq,groups = "mdio"; + lantiq,function = "mdio"; + }; + }; + + nand_pins: nand { + mux-0 { + lantiq,groups = "nand cle", "nand ale", + "nand rd"; + lantiq,function = "ebu"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + mux-1 { + lantiq,groups = "nand rdy"; + lantiq,function = "ebu"; + lantiq,output = <0>; + lantiq,pull = <2>; + }; + }; + + nand_cs1_pins: nand-cs1 { + mux { + lantiq,groups = "nand cs1"; + lantiq,function = "ebu"; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + + pci_gnt1_pins: pci-gnt1 { + mux { + lantiq,groups = "gnt1"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + + pci_gnt2_pins: pci-gnt2 { + mux { + lantiq,groups = "gnt2"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + + pci_gnt3_pins: pci-gnt3 { + mux { + lantiq,groups = "gnt3"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + + pci_gnt4_pins: pci-gnt4 { + mux { + lantiq,groups = "gnt4"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + + pci_req1_pins: pci-req1 { + mux { + lantiq,groups = "req1"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + }; + + pci_req2_pins: pci-req2 { + mux { + lantiq,groups = "req2"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + }; + + pci_req3_pins: pci-req3 { + mux { + lantiq,groups = "req3"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + }; + + pci_req4_pins: pci-req4 { + mux { + lantiq,groups = "req4"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + }; + + spi_pins: spi { + mux-0 { + lantiq,groups = "spi_di"; + lantiq,function = "spi"; + }; + mux-1 { + lantiq,groups = "spi_do", "spi_clk"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; + + spi_cs4_pins: spi-cs4 { + mux { + lantiq,groups = "spi_cs4"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; + + stp_pins: stp { + mux { + lantiq,groups = "stp"; + lantiq,function = "stp"; + lantiq,pull = <0>; + lantiq,open-drain = <0>; + lantiq,output = <1>; + }; + }; }; stp: stp@e100bb0 { @@ -175,6 +320,10 @@ compatible = "lantiq,gpio-stp-xway"; gpio-controller; reg = <0xe100bb0 0x40>; + + pinctrl-0 = <&stp_pins>; + pinctrl-names = "default"; + status = "disabled"; }; @@ -238,6 +387,8 @@ interrupt-parent = <&icu0>; interrupts = <73 72>; mac-address = [ 00 11 22 33 44 55 ]; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; }; ppe@e234000 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts similarity index 87% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts index 811f78f934..0f635127f8 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts @@ -18,8 +18,7 @@ led-running = &power; led-upgrade = &power; - led-internet = &info_green; - led-dsl = &power; + led-dsl = &info_green; led-wifi = &wlan; }; @@ -76,21 +75,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - pci { - lantiq,groups = "gnt1", "req1", "req2", "req4", "gnt2", "gnt3", "gnt4"; - lantiq,function = "pci"; - }; - pci-in { - lantiq,groups = "req1", "req2", "req4"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci-out { - lantiq,groups = "gnt1", "gnt2", "gnt3", "gnt4"; - lantiq,output = <1>; - lantiq,pull = <0>; - }; ar8030-intr { lantiq,groups = "exin3"; lantiq,function = "exin"; @@ -124,6 +108,7 @@ phy0: ethernet-phy@0 { reg = <0>; reset-gpios = <&gpio 34 GPIO_ACTIVE_LOW>; + max-speed = <100>; }; }; }; @@ -167,6 +152,13 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>, + <&pci_gnt3_pins>, <&pci_gnt4_pins>, + <&pci_req1_pins>, <&pci_req2_pins>, + <&pci_req4_pins>; + pinctrl-names = "default"; + req-mask = <0xf>; gpio-reset = <&gpio 21 GPIO_ACTIVE_LOW>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts similarity index 81% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts index 40348b1d59..424b778bb4 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts @@ -18,8 +18,7 @@ led-running = &power; led-upgrade = &power; - led-internet = &info_green; - led-dsl = &power; + led-dsl = &info_green; led-wifi = &wlan; }; @@ -74,29 +73,6 @@ }; }; -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - pci { - lantiq,groups = "gnt1", "req1", "req2", "req3", "req4", "gnt2", "gnt3", "gnt4"; - lantiq,function = "pci"; - }; - pci-in { - lantiq,groups = "req1", "req2", "req3", "req4"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci-out { - lantiq,groups = "gnt1", "gnt2", "gnt3", "gnt4"; - lantiq,output = <1>; - lantiq,pull = <0>; - }; - }; -}; - &gsw { phy-mode = "mii"; mtd-mac-address = <&ath9k_cal 0xa91>; @@ -142,6 +118,12 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>, + <&pci_gnt3_pins>, <&pci_gnt4_pins>, + <&pci_req1_pins>, <&pci_req2_pins>, + <&pci_req3_pins>, <&pci_req4_pins>; + req-mask = <0xf>; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts similarity index 86% rename from target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts index 823a158fbf..044ae2b417 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts @@ -109,35 +109,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - nand_out { - lantiq,groups = "nand cle", "nand ale"; - lantiq,function = "ebu"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - nand_cs1 { - lantiq,groups = "nand cs1"; - lantiq,function = "ebu"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - pci_rst { lantiq,pins = "io21"; lantiq,output = <1>; @@ -158,6 +129,9 @@ reg = <1 0x0 0x2000000 >; req-mask = <0x1>; /* PCI request lines to mask during NAND access */ + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -195,6 +169,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; wifi@7000 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/WBMR.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts similarity index 75% rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts index 98a2ebd98e..cbc99fe620 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "DGN3500.dtsi" +#include "ar9_netgear_dgn3500.dtsi" / { compatible = "netgear,dgn3500", "lantiq,xway", "lantiq,ar9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi similarity index 85% rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi index 4a20dcefd3..a3dbbbdfad 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi @@ -115,33 +115,6 @@ lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1", "req1"; - lantiq,function = "pci"; - }; - pci-in { - lantiq,groups = "req1"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci-out { - lantiq,groups = "gnt1"; - lantiq,output = <1>; - lantiq,pull = <0>; - }; - }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; }; }; @@ -151,6 +124,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; wifi@168c,0029 { @@ -163,9 +140,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500B.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts similarity index 75% rename from target/linux/lantiq/files/arch/mips/boot/dts/DGN3500B.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts index d1d788cc7d..b69613e48f 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500B.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "DGN3500.dtsi" +#include "ar9_netgear_dgn3500.dtsi" / { compatible = "netgear,dgn3500b", "lantiq,xway", "lantiq,ar9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/H201L.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/H201L.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts similarity index 88% rename from target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts index 62e5e70169..79896c6478 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts @@ -103,30 +103,10 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; exin { lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - }; - conf_out { - lantiq,pins = "io4", "io5", "io6"; - lantiq,open-drain; - lantiq,pull = <0>; - }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; }; usb_vbus: regulator-usb-vbus { @@ -177,6 +157,11 @@ }; }; +&pci0 { + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; +}; + &stp { status = "okay"; lantiq,shadow = <0xfff>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube.dtsi similarity index 76% rename from target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube.dtsi index cadfb80750..ae8c1c045a 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube.dtsi @@ -144,6 +144,10 @@ compatible = "lantiq,gpio-stp-xway"; gpio-controller; reg = <0xe100bb0 0x40>; + + pinctrl-0 = <&stp_pins>; + pinctrl-names = "default"; + lantiq,shadow = <0xfff>; lantiq,groups = <0x3>; status = "disabled"; @@ -162,6 +166,82 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe100b10 0xa0>; + + nand_pins: nand { + mux-0 { + lantiq,groups = "nand cle", "nand ale", + "nand rd"; + lantiq,function = "ebu"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + mux-1 { + lantiq,groups = "nand rdy"; + lantiq,function = "ebu"; + lantiq,output = <0>; + lantiq,pull = <2>; + }; + }; + + nand_cs1_pins: nand-cs1 { + mux { + lantiq,groups = "nand cs1"; + lantiq,function = "ebu"; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + + pci_gnt1_pins: pci-gnt1 { + mux { + lantiq,groups = "gnt1"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + + pci_gnt2_pins: pci-gnt2 { + mux { + lantiq,groups = "gnt2"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + + pci_req1_pins: pci-req1 { + mux { + lantiq,groups = "req1"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + }; + + pci_req2_pins: pci-req2 { + mux { + lantiq,groups = "req2"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + }; + + stp_pins: stp { + mux { + lantiq,groups = "stp"; + lantiq,function = "stp"; + lantiq,pull = <0>; + lantiq,open-drain = <0>; + lantiq,output = <1>; + }; + }; }; asc1: serial@e100c00 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts similarity index 90% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts index e15eb66b04..19a44d5f6d 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts @@ -131,29 +131,11 @@ lantiq,open-drain = <0>; lantiq,output = <1>; }; - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; exin { lantiq,groups = "exin1", "exin2"; lantiq,function = "exin"; lantiq,output = <0>; }; - pci_in { - lantiq,groups = "req1", "req2"; - lantiq,function = "pci"; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1", "gnt2"; - lantiq,function = "pci"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; @@ -211,6 +193,11 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>, + <&pci_req1_pins>, <&pci_req2_pins>; + pinctrl-names = "default"; + lantiq,external-clock; interrupt-map = < 0x6000 0 0 1 &icu0 135 diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts similarity index 71% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts index 34f868f484..ff34068005 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "ARV4518PWR01.dtsi" +#include "danube_arcadyan_arv4518pwr01.dtsi" / { compatible = "arcadyan,arv4518pwr01", "lantiq,xway", "lantiq,danube"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi similarity index 92% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi index f5dec312f8..dcae06d894 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi @@ -119,19 +119,6 @@ lantiq,groups = "ebu cs1"; lantiq,function = "ebu"; }; - pci_in { - lantiq,groups = "req1", "req2"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1", "gnt2"; - lantiq,function = "pci"; - lantiq,pull = <0>; - lantiq,output = <1>; - }; }; }; @@ -189,6 +176,11 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_gnt2_pins>, + <&pci_req1_pins>, <&pci_req2_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; req-mask = <0xf>; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01A.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts similarity index 78% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01A.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts index 9617398bbc..b261a2fa91 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01A.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "ARV4518PWR01.dtsi" +#include "danube_arcadyan_arv4518pwr01.dtsi" / { compatible = "arcadyan,arv4518pwr01a", "lantiq,xway", "lantiq,danube"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts similarity index 94% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts index 95944d9cfc..b59477cb19 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts @@ -135,18 +135,6 @@ lantiq,groups = "ebu cs1"; lantiq,function = "ebu"; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; @@ -210,6 +198,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + lantiq,external-clock; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts similarity index 91% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts index d55613a02b..cceb42164e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts @@ -80,18 +80,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -149,6 +137,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts similarity index 94% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts index 4ff0f67ca3..eecff4bb0b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts @@ -147,18 +147,6 @@ lantiq,groups = "ebu cs1"; lantiq,function = "ebu"; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <0>; @@ -228,6 +216,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + lantiq,external-clock; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts index c0bca84031..9e4216033b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts @@ -91,11 +91,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - pci { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -149,6 +144,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + lantiq,external-clock; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts similarity index 93% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts index 5c4a41e957..e5fd05fe40 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts @@ -86,18 +86,6 @@ lantiq,pull = <2>; lantiq,output = <0>; }; - pci_in { - lantiq,groups = "req1", "req2"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -173,6 +161,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>, <&pci_req2_pins>; + pinctrl-names = "default"; + lantiq,external-clock; interrupt-map = < 0x7000 0 0 1 &icu0 30 diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts similarity index 94% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts index 458fd65495..ae0d27a042 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts @@ -116,19 +116,6 @@ lantiq,groups = "ebu cs1"; lantiq,function = "ebu"; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,pull = <0>; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -215,6 +202,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; lantiq,external-clock; req-mask = <0xf>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts similarity index 93% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts index e9c418e482..34b541af92 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts @@ -131,19 +131,6 @@ lantiq,groups = "ebu cs1"; lantiq,function = "ebu"; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,pull = <0>; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -200,6 +187,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + lantiq,external-clock; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; req-mask = <0xf>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts index bcdc2249fd..d673c9b204 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts @@ -83,10 +83,6 @@ lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1", "req1"; - lantiq,function = "pci"; - }; }; }; @@ -134,6 +130,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + interrupt-map = <0x7000 0 0 1 &icu0 135 1>; wifi@0,0 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts similarity index 94% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts index dbec1eb6a1..069b1b1ed6 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts @@ -123,18 +123,6 @@ lantiq,pull = <2>; lantiq,output = <0>; }; - pci_in { - lantiq,groups = "req2", "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -220,6 +208,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>, <&pci_req2_pins>; + pinctrl-names = "default"; + lantiq,external-clock; gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; interrupt-map = <0x7000 0 0 1 &icu0 135>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts similarity index 95% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts index de996d10cc..ec90a2bef9 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts @@ -151,18 +151,6 @@ lantiq,pull = <2>; lantiq,output = <0>; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,open-drain = <1>; @@ -235,6 +223,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + lantiq,external-clock; interrupt-map = < 0x7000 0 0 1 &icu0 30 diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts similarity index 92% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts index 00131f929c..4bf44a10e1 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts @@ -95,18 +95,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - lantiq,output = <0>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - }; pci_rst { lantiq,pins = "io21"; lantiq,pull = <2>; @@ -163,6 +151,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; wifi@168c,0029 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts similarity index 95% rename from target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts index 7942535943..67b0f9631f 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts @@ -37,10 +37,6 @@ lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1", "req1"; - lantiq,function = "pci"; - }; }; }; @@ -96,6 +92,9 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; }; &usb_phy { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts similarity index 88% rename from target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts index 2b3afb2295..40886feec4 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts @@ -108,37 +108,10 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - nand_out { - lantiq,groups = "nand cle", "nand ale"; - lantiq,function = "ebu"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - nand_cs1 { - lantiq,groups = "nand cs1"; - lantiq,function = "ebu"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; exin { lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci_in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci_out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; pci_rst { lantiq,pins = "io21"; @@ -209,6 +182,9 @@ reg = <1 0x0 0x2000000 >; req-mask = <0x1>; /* PCI request lines to mask during NAND access */ + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -235,6 +211,10 @@ &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; wifi@168c,0027 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts similarity index 80% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts index ba7f302c2e..1afc74900e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts @@ -21,23 +21,10 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; exin { lantiq,groups = "exin1"; lantiq,function = "exin"; }; - pci { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - }; - conf_out { - lantiq,pins = "io4", "io5", "io6"; /* stp */ - lantiq,open-drain; - lantiq,pull = <0>; - }; }; }; @@ -78,3 +65,8 @@ }; }; }; + +&pci0 { + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; +}; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts similarity index 91% rename from target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts index a9a5cbae2f..0072f7e2b1 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts @@ -52,18 +52,6 @@ }; }; -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; - }; -}; - &gpios { status = "okay"; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/falcon.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/falcon.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts similarity index 98% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts index 12c448c2e6..22ce8caced 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts @@ -2,7 +2,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon FTTDP8 Reference Board"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts index 3f29d319cd..fa331450bf 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts @@ -2,7 +2,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon FTTdp G.FAST Reference Board"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts similarity index 91% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts index 2155f0cb1d..2107da5435 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts @@ -1,7 +1,6 @@ /dts-v1/; -#include "falcon.dtsi" -#include "EASY98000-base.dtsi" +#include "falcon_lantiq_easy98000.dtsi" / { model = "Lantiq Falcon (NAND)"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts similarity index 91% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts index 3cb00343f5..56d0fe0bc3 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts @@ -1,7 +1,6 @@ /dts-v1/; -#include "falcon.dtsi" -#include "EASY98000-base.dtsi" +#include "falcon_lantiq_easy98000.dtsi" / { model = "Lantiq Falcon (NOR)"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000SFLASH.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts similarity index 67% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000SFLASH.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts index bbe524e94e..8c931746ed 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000SFLASH.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts @@ -1,8 +1,7 @@ /dts-v1/; -#include "falcon.dtsi" -#include "EASY98000-base.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_lantiq_easy98000.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon (SFLASH)"; @@ -13,4 +12,3 @@ spi1 = &spi; }; }; - diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi similarity index 98% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi index fa8c0b4b06..5821c51def 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi @@ -1,7 +1,8 @@ - #include #include +#include "falcon.dtsi" + / { compatible = "lantiq,easy98000", "lantiq,falcon"; @@ -107,4 +108,3 @@ reg = <0x51>; }; }; - diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts index 571e23454a..773a490019 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts @@ -3,7 +3,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon Reference Board V1.8"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts index 7a3ef418d0..397764aac4 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts @@ -3,7 +3,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon Reference Board"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts index 7eb40bde24..aa63268149 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts @@ -3,7 +3,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon HGU Reference Board"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts index df941cdb67..f1ecebec3b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts @@ -1,7 +1,7 @@ /dts-v1/; #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon SFP Stick with SyncE"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE1588.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE1588.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts index a3abc6e707..98421174d3 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98035SYNCE1588.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts @@ -1,7 +1,7 @@ /dts-v1/; #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon SFP Stick with SyncE/1588"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts index c5da8b564f..130d49ebd7 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts @@ -3,7 +3,7 @@ #include #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon / Vinax MDU Board"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-SFP.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/FALCON-SFP.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts index 8d45de4ebe..880c4edca8 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-SFP.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts @@ -1,7 +1,7 @@ /dts-v1/; #include "falcon.dtsi" -#include "falcon-sflash-16M.dtsi" +#include "falcon_sflash-16m.dtsi" / { model = "Lantiq Falcon SFP Stick"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/falcon-sflash-16M.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi similarity index 100% rename from target/linux/lantiq/files/arch/mips/boot/dts/falcon-sflash-16M.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_sflash-16m.dtsi diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9.dtsi similarity index 71% rename from target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9.dtsi index e8b87dbcc7..35b1f180a5 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9.dtsi @@ -202,6 +202,8 @@ "spi_frm"; #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi_pins>, <&spi_cs4_pins>; status = "disabled"; }; @@ -210,6 +212,149 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe100b10 0xa0>; + + gphy0_led0_pins: gphy0-led0 { + mux { + lantiq,groups = "gphy0 led0"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + }; + + gphy0_led1_pins: gphy0-led1 { + mux { + lantiq,groups = "gphy0 led1"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + }; + + gphy0_led2_pins: gphy0-led2 { + mux { + lantiq,groups = "gphy0 led2"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + }; + + gphy1_led0_pins: gphy1-led0 { + mux { + lantiq,groups = "gphy1 led0"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + }; + + gphy1_led1_pins: gphy1-led1 { + mux { + lantiq,groups = "gphy1 led1"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + }; + + gphy1_led2_pins: gphy1-led2 { + mux { + lantiq,groups = "gphy1 led2"; + lantiq,function = "gphy"; + lantiq,open-drain = <0>; + lantiq,pull = <2>; + lantiq,output = <1>; + }; + }; + + mdio_pins: mdio { + mux { + lantiq,groups = "mdio"; + lantiq,function = "mdio"; + }; + }; + + nand_pins: nand { + mux-0 { + lantiq,groups = "nand cle", "nand ale", + "nand rd"; + lantiq,function = "ebu"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + mux-1 { + lantiq,groups = "nand rdy"; + lantiq,function = "ebu"; + lantiq,output = <0>; + lantiq,pull = <2>; + }; + }; + + nand_cs1_pins: nand-cs1 { + mux { + lantiq,groups = "nand cs1"; + lantiq,function = "ebu"; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + + pci_gnt1_pins: pci-gnt1 { + mux { + lantiq,groups = "gnt1"; + lantiq,function = "pci"; + lantiq,output = <1>; + lantiq,open-drain = <0>; + lantiq,pull = <0>; + }; + }; + + pci_req1_pins: pci-req1 { + mux { + lantiq,groups = "req1"; + lantiq,function = "pci"; + lantiq,output = <0>; + lantiq,open-drain = <1>; + lantiq,pull = <2>; + }; + }; + + spi_pins: spi { + mux-0 { + lantiq,groups = "spi_di"; + lantiq,function = "spi"; + }; + mux-1 { + lantiq,groups = "spi_do", "spi_clk"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; + + spi_cs4_pins: spi-cs4 { + mux { + lantiq,groups = "spi_cs4"; + lantiq,function = "spi"; + lantiq,output = <1>; + }; + }; + + stp_pins: stp { + mux { + lantiq,groups = "stp"; + lantiq,function = "stp"; + lantiq,pull = <0>; + lantiq,open-drain = <0>; + lantiq,output = <1>; + }; + }; }; stp: stp@e100bb0 { @@ -219,6 +364,9 @@ #gpio-cells = <2>; gpio-controller; + pinctrl-0 = <&stp_pins>; + pinctrl-names = "default"; + lantiq,shadow = <0xffffff>; lantiq,groups = <0x7>; lantiq,dsl = <0x0>; @@ -285,6 +433,8 @@ resets = <&reset0 21 16>, <&reset0 8 8>; reset-names = "switch", "ppe"; lantiq,phys = <&gphy0>, <&gphy1>; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; }; mei@e116000 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts similarity index 93% rename from target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts index 1c7f03c355..3d10f582b0 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts @@ -119,18 +119,6 @@ lantiq,gphy-mode = ; }; -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - }; -}; - &localbus { flash@0 { compatible = "lantiq,nor"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts similarity index 98% rename from target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts index f245fe370b..d6c521cfe7 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts @@ -177,10 +177,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pcie-rst { lantiq,pins = "io21"; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts similarity index 86% rename from target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts index 2d52176430..e074147d66 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts @@ -57,6 +57,10 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, + <&gphy0_led0_pins>, <&gphy0_led1_pins>, <&gphy0_led2_pins>, + <&gphy1_led0_pins>, <&gphy1_led1_pins>, <&gphy1_led2_pins>; + interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -110,27 +114,6 @@ lantiq,gphy-mode = ; }; -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - gphy-leds { - lantiq,groups = "gphy0 led0", "gphy0 led1", - "gphy0 led2", "gphy1 led0", - "gphy1 led1", "gphy1 led2"; - lantiq,function = "gphy"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; - }; -}; - &localbus { flash@0 { compatible = "lantiq,nor"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts index 5a33121d72..9f6f405a09 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VGV7510KW22.dtsi" +#include "vr9_arcadyan_vgv7510kw22.dtsi" / { compatible = "arcadyan,vgv7510kw22-brn", "arcadyan,vgv7510kw22", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts similarity index 92% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts index 2accffaed7..613ff3782c 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VGV7510KW22.dtsi" +#include "vr9_arcadyan_vgv7510kw22.dtsi" / { compatible = "arcadyan,vgv7510kw22-nor", "arcadyan,vgv7510kw22", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi similarity index 93% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi index f10a9dd8e6..017e473a04 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi @@ -107,6 +107,11 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, + <&gphy0_led0_pins>, + <&gphy1_led0_pins>, <&gphy1_led1_pins>; + pinctrl-names = "default"; + lan: interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -186,21 +191,9 @@ &gpio { pinctrl-names = "default"; - pinctrl-0 = <&state_default>; + pinctrl-0 = <&state_default>, <&gphy0_led1_pins>; state_default: pinmux { - gphy-leds { - lantiq,groups = "gphy0 led0", "gphy0 led1", - "gphy1 led0", "gphy1 led1"; - lantiq,function = "gphy"; - lantiq,open-drain = <0>; - lantiq,pull = <2>; - lantiq,output = <1>; - }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pci-rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts index c51a44bb3d..051de0c23e 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VGV7519.dtsi" +#include "vr9_arcadyan_vgv7519.dtsi" / { compatible = "arcadyan,vgv7519-brn", "arcadyan,vgv7519", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts similarity index 92% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts index aa6a96156f..2121fbf41d 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VGV7519.dtsi" +#include "vr9_arcadyan_vgv7519.dtsi" / { compatible = "arcadyan,vgv7519-nor", "arcadyan,vgv7519", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi similarity index 93% rename from target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi index 0b3e72d3ab..e82407d7c3 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi @@ -127,6 +127,9 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, <&gphy0_led1_pins>, <&gphy1_led0_pins>; + pinctrl-names = "default"; + lan: interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -209,30 +212,12 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,open-drain = <0>; - lantiq,output = <1>; - lantiq,pull = <0>; - }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pci-rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; lantiq,pull = <0>; lantiq,output = <1>; }; - gphy-leds { - lantiq,groups = "gphy0 led1", "gphy1 led0"; - lantiq,function = "gphy"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - lantiq,output = <1>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts similarity index 84% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts index c70f124db5..1aea98260a 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "FRITZ3370-REV2.dtsi" +#include "vr9_avm_fritz3370-rev2.dtsi" / { compatible = "avm,fritz3370-rev2-hynix", "avm,fritz3370-rev2", "lantiq,xway", "lantiq,vr9"; @@ -13,6 +13,9 @@ bank-width = <2>; reg = <1 0x0 0x2000000>; + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + nand-ecc-mode = "soft"; nand-ecc-strength = <3>; nand-ecc-step-size = <256>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts similarity index 83% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts index 3aaea4cb6d..a19d168159 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "FRITZ3370-REV2.dtsi" +#include "vr9_avm_fritz3370-rev2.dtsi" / { compatible = "avm,fritz3370-rev2-micron", "avm,fritz3370-rev2", "lantiq,xway", "lantiq,vr9"; @@ -13,6 +13,9 @@ bank-width = <2>; reg = <1 0x0 0x2000000>; + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + nand-ecc-mode = "on-die"; partitions { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi similarity index 89% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi index f23d2d2cf5..bac27c3649 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi @@ -15,7 +15,7 @@ led-boot = &power_green; led-failsafe = &power_red; led-running = &power_green; - led-upgrade = &power_green; + led-upgrade = &power_red; led-dsl = &dsl; led-internet = &info_green; @@ -193,18 +193,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - - nand { - lantiq,groups = "nand cle", "nand ale", - "nand rd", "nand cs1", "nand rdy"; - lantiq,function = "ebu"; - lantiq,pull = <1>; - }; - phy-rst { lantiq,pins = "io37", "io44"; lantiq,pull = <0>; @@ -218,20 +206,6 @@ lantiq,output = <1>; }; }; - - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &pcie0 { @@ -255,9 +229,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts similarity index 97% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts index 0fbe6396a8..012300ec57 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "FRITZ736X.dtsi" +#include "vr9_avm_fritz736x.dtsi" #include #include diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts similarity index 78% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts index cca79c926e..a061a482da 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "FRITZ736X.dtsi" +#include "vr9_avm_fritz736x.dtsi" #include #include @@ -35,29 +35,7 @@ label = "fritz7362sl:green:dect"; }; -&gpio { - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; -}; - &state_default { - nand { - lantiq,groups = "nand ale", "nand cle", - "nand cs1", "nand rd", "nand rdy"; - lantiq,function = "ebu"; - }; - pcie-rst { lantiq,pins = "io21"; lantiq,open-drain = <1>; @@ -67,8 +45,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; flash@4 { #address-cells = <1>; @@ -103,6 +79,10 @@ lantiq,cs1 = <1>; bank-width = <1>; reg = <1 0x0 0x2000000>; + + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + nand-ecc-mode = "on-die"; partitions { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi similarity index 96% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi index 82546a3572..1553d2f7f4 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/dts-v1/; #include "vr9.dtsi" @@ -17,7 +16,8 @@ led-boot = &power_green; led-failsafe = &power_red; led-running = &power_green; - led-upgrade = &power_green; + led-upgrade = &power_red; + led-dsl = &info_green; led-wifi = &wifi; }; @@ -155,11 +155,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - phy-rst { lantiq,pins = "io37", "io44"; lantiq,pull = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts similarity index 88% rename from target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts index baf3d69fb5..43216d66be 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts @@ -11,13 +11,14 @@ model = "AVM FRITZ!Box 7412"; chosen { - bootargs = "console=ttyLTQ0,115200 mem=126M vpe1_load_addr=0x87e00000 vpe1_mem=2M maxvpes=1 maxtcs=1 nosmp"; + bootargs = "console=ttyLTQ0,115200"; }; aliases { led-boot = &power_green; led-failsafe = &power_red; led-running = &power_green; + led-upgrade = &power_red; led-dsl = &info; led-wifi = &wifi; @@ -34,13 +35,13 @@ wps { label = "wps"; - gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 1 GPIO_ACTIVE_LOW>; linux,code = ; }; dect { label = "dect"; - gpios = <&gpio 2 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; linux,code = ; }; }; @@ -88,6 +89,9 @@ reg = <0 0x0 0x2000000>; lantiq,cs = <1>; + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -166,25 +170,11 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pcie-rst { lantiq,pins = "io11"; lantiq,open-drain = <1>; lantiq,output = <1>; }; - nand-mux { - lantiq,groups = "nand cle", "nand ale", - "nand rd", "nand cs1", - "nand rdy"; - lantiq,function = "ebu"; - }; - nand-pins { - lantiq,pins = "io13", "io24", "io49"; - lantiq,pull = <1>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts similarity index 93% rename from target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts index c105f0a9ae..f6a2d9f6a7 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts @@ -197,10 +197,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; pci_rst { lantiq,pins = "io21"; lantiq,output = <1>; @@ -218,19 +214,6 @@ lantiq,open-drain = <0>; lantiq,output = <1>; }; - nand_out { - lantiq,groups = "nand cle", "nand ale"; - lantiq,function = "ebu"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - nand_cs1 { - lantiq,groups = "nand cs1"; - lantiq,function = "ebu"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; }; }; @@ -240,6 +223,10 @@ lantiq,cs = <1>; bank-width = <2>; reg = <0x1 0x0 0x2000000>; + + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + nand-on-flash-bbt; nand-ecc-strength = <3>; nand-ecc-step-size = <256>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts similarity index 93% rename from target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts index 48f6dc71a1..4631ad4ffe 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts @@ -225,10 +225,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; phy-rst { lantiq,pins = "io42"; lantiq,pull = <0>; @@ -241,26 +237,11 @@ lantiq,output = <1>; }; }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts similarity index 92% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts index f687edf54d..585521459b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts @@ -1,7 +1,7 @@ /dts-v1/; -#include "EASY80920.dtsi" +#include "vr9_lantiq_easy80920.dtsi" / { compatible = "lantiq,easy80920-nand", "lantiq,easy80920", "lantiq,xway", "lantiq,vr9"; @@ -19,6 +19,9 @@ bank-width = <2>; reg = <0 0x0 0x2000000>; + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts similarity index 94% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts index 6ed6c5d427..c204c5e093 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "EASY80920.dtsi" +#include "vr9_lantiq_easy80920.dtsi" / { compatible = "lantiq,easy80920-nor", "lantiq,easy80920", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi similarity index 86% rename from target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi index b7ccb4ed57..4fbc1ac496 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi @@ -189,27 +189,8 @@ lantiq,groups = "exin3"; lantiq,function = "exin"; }; - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; - nand { - lantiq,groups = "nand cle", "nand ale", - "nand rd", "nand rdy"; - lantiq,function = "ebu"; - }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - pci { - lantiq,groups = "gnt1", "req1"; - lantiq,function = "pci"; - }; conf_out { - lantiq,pins = "io24", "io13", "io49", /* nand cle, ale and rd */ - "io4", "io5", "io6", /* stp */ - "io21", + lantiq,pins = "io21", "io33"; lantiq,open-drain; lantiq,pull = <0>; @@ -221,29 +202,13 @@ lantiq,output = <1>; }; conf_in { - lantiq,pins = "io39", /* exin3 */ - "io48"; /* nand rdy */ + lantiq,pins = "io39"; /* exin3 */ lantiq,pull = <2>; }; }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &spi { - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - status = "okay"; flash@4 { @@ -288,6 +253,11 @@ }; }; +&pci0 { + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; +}; + &stp { status = "okay"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts similarity index 86% rename from target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts index 4796123c20..cdba656e49 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts @@ -118,30 +118,6 @@ lantiq,gphy-mode = ; }; -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - }; - - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; -}; - &pcie0 { status = "disabled"; }; @@ -149,9 +125,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8970.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts similarity index 78% rename from target/linux/lantiq/files/arch/mips/boot/dts/TDW8970.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts index 25eb3dac67..9b3055983a 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8970.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "TDW89X0.dtsi" +#include "vr9_tplink_tdw89x0.dtsi" / { compatible = "tplink,tdw8970", "tplink,tdw89x0", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8980.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts similarity index 94% rename from target/linux/lantiq/files/arch/mips/boot/dts/TDW8980.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts index 76875e735d..725aa759d2 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW8980.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "TDW89X0.dtsi" +#include "vr9_tplink_tdw89x0.dtsi" / { compatible = "tplink,tdw8980", "tplink,tdw89x0", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi similarity index 90% rename from target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi index 1a7d90a5bf..eabbc0257f 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi @@ -103,6 +103,9 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, <&gphy0_led1_pins>, <&gphy1_led1_pins>; + pinctrl-names = "default"; + lan: interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -175,17 +178,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - gphy-leds { - lantiq,groups = "gphy0 led1", "gphy1 led1"; - lantiq,function = "gphy"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; phy-rst { lantiq,pins = "io42"; lantiq,pull = <0>; @@ -198,18 +190,6 @@ lantiq,output = <1>; }; }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; - }; - }; }; &pcie0 { @@ -236,9 +216,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts similarity index 98% rename from target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts index 8724e37b47..98f2282579 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VR200.dtsi" +#include "vr9_tplink_vr200.dtsi" / { compatible = "tplink,vr200", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi similarity index 86% rename from target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi index 3c04785314..77b4f0defb 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi @@ -23,6 +23,9 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, <&gphy0_led1_pins>, <&gphy1_led1_pins>; + pinctrl-names = "default"; + lan: interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -95,17 +98,6 @@ pinctrl-0 = <&state_default>; state_default: pinmux { - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - gphy-leds { - lantiq,groups = "gphy0 led1", "gphy1 led1"; - lantiq,function = "gphy"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; phy-rst { lantiq,pins = "io42"; lantiq,pull = <0>; @@ -118,16 +110,23 @@ lantiq,output = <1>; }; }; - pins_spi_default: pins_spi_default { - spi_in { - lantiq,groups = "spi_di"; - lantiq,function = "spi"; - }; - spi_out { - lantiq,groups = "spi_do", "spi_clk", - "spi_cs4"; - lantiq,function = "spi"; - lantiq,output = <1>; +}; + +&pcie0 { + pcie@0 { + reg = <0 0 0 0 0>; + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + device_type = "pci"; + + wifi@0,0 { + reg = <0 0 0 0 0>; + mediatek,mtd-eeprom = <&radio 0x0000>; + big-endian; + ieee80211-freq-limit = <5000000 6000000>; + mtd-mac-address = <&romfile 0xf100>; + mtd-mac-address-increment = <2>; }; }; }; @@ -140,9 +139,6 @@ &spi { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pins_spi_default>; - flash@4 { compatible = "jedec,spi-nor"; reg = <4>; @@ -189,7 +185,7 @@ read-only; }; - partition@ff0000 { + radio: partition@ff0000 { reg = <0xff0000 0x10000>; label = "radio"; read-only; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts similarity index 98% rename from target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts index 34805bb9f0..2e25a72a83 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "VR200.dtsi" +#include "vr9_tplink_vr200.dtsi" / { compatible = "tplink,vr200v", "lantiq,xway", "lantiq,vr9"; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts similarity index 90% rename from target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts index 3159a5a244..4d7aac325b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "P2812HNUFX.dtsi" +#include "vr9_zyxel_p-2812hnu-fx.dtsi" / { compatible = "zyxel,p-2812hnu-f1", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9"; @@ -30,6 +30,9 @@ bank-width = <2>; reg = <0 0x0 0x2000000>; + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts similarity index 89% rename from target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts index f6e8fd8c83..7da1533809 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include "P2812HNUFX.dtsi" +#include "vr9_zyxel_p-2812hnu-fx.dtsi" / { compatible = "zyxel,p-2812hnu-f3", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9"; @@ -21,6 +21,9 @@ bank-width = <2>; reg = <0 0x0 0x800000>; + pinctrl-0 = <&nand_pins>, <&nand_cs1_pins>; + pinctrl-names = "default"; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi similarity index 82% rename from target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi rename to target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi index 9956a5b89f..5f8392ca44 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi @@ -111,6 +111,11 @@ }; ð0 { + pinctrl-0 = <&mdio_pins>, + <&gphy0_led0_pins>, <&gphy0_led2_pins>, + <&gphy1_led1_pins>, <&gphy1_led2_pins>; + pinctrl-names = "default"; + lan: interface@0 { compatible = "lantiq,xrx200-pdi"; #address-cells = <1>; @@ -196,39 +201,6 @@ lantiq,groups = "exin3"; lantiq,function = "exin"; }; - mdio { - lantiq,groups = "mdio"; - lantiq,function = "mdio"; - }; - gphy-leds { - lantiq,groups = "gphy0 led1", "gphy1 led1", - "gphy0 led2", "gphy1 led2"; - lantiq,function = "gphy"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - lantiq,pull = <2>; - lantiq,open-drain = <0>; - lantiq,output = <1>; - }; - pci-in { - lantiq,groups = "req1"; - lantiq,function = "pci"; - lantiq,output = <0>; - lantiq,open-drain = <1>; - lantiq,pull = <2>; - }; - pci-out { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; pci_rst { lantiq,pins = "io21"; lantiq,output = <1>; @@ -246,24 +218,15 @@ lantiq,open-drain = <0>; lantiq,output = <1>; }; - nand_out { - lantiq,groups = "nand cle", "nand ale"; - lantiq,function = "ebu"; - lantiq,output = <1>; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; - nand_cs1 { - lantiq,groups = "nand cs1"; - lantiq,function = "ebu"; - lantiq,open-drain = <0>; - lantiq,pull = <0>; - }; }; }; &pci0 { status = "okay"; + + pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>; + pinctrl-names = "default"; + gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts deleted file mode 100644 index 4f101151d1..0000000000 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts +++ /dev/null @@ -1,86 +0,0 @@ -/dts-v1/; - -#include "ar9.dtsi" - -/ { - compatible = "lantiq,easy50810", "lantiq,xway", "lantiq,ar9"; - model = "Lantiq EASY50810"; - - chosen { - bootargs = "console=ttyLTQ0,115200"; - }; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x2000000>; - }; -}; - -&gpio { - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinmux { - stp { - lantiq,groups = "stp"; - lantiq,function = "stp"; - }; - exin { - lantiq,groups = "exin1"; - lantiq,function = "exin"; - }; - pci { - lantiq,groups = "gnt1"; - lantiq,function = "pci"; - }; - conf_out { - lantiq,pins = "io4", "io5", "io6"; /* stp */ - lantiq,open-drain; - lantiq,pull = <0>; - }; - }; -}; - -&gsw { - phy-mode = "rmii"; -}; - -&localbus { - flash@0 { - compatible = "lantiq,nor"; - bank-width = <2>; - reg = <0 0x0 0x2000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "uboot"; - reg = <0x00000 0x10000>; /* 64 KB */ - }; - - partition@10000 { - label = "uboot_env"; - reg = <0x10000 0x10000>; /* 64 KB */ - }; - - partition@20000 { - label = "firmware"; - reg = <0x20000 0x3d0000>; - }; - - partition@400000 { - label = "rootfs"; - reg = <0x400000 0x400000>; - }; - }; - }; -}; - -&stp { - status = "okay"; - lantiq,shadow = <0xfff>; - lantiq,groups = <0x3>; -}; diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile index 2352cb6b5e..d0fef7c115 100644 --- a/target/linux/lantiq/image/Makefile +++ b/target/linux/lantiq/image/Makefile @@ -15,9 +15,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk ifeq ($(SUBTARGET),xway) - UBIFS_OPTS := -m 512 -e 15872 -c 1959 + UBIFS_OPTS := -m 512 -e 15872 -c 1959 else - UBIFS_OPTS := -m 2048 -e 126KiB -c 4096 + UBIFS_OPTS := -m 2048 -e 126KiB -c 4096 endif define Build/append-avm-fakeroot @@ -29,12 +29,12 @@ define Build/dgn3500-sercom-footer endef define Build/mkbrncmdline - mkbrncmdline -i $@ -o $@.new BRN-BOOT - mv $@.new $@ + mkbrncmdline -i $@ -o $@.new BRN-BOOT + mv $@.new $@ endef define Build/mkbrnimg - mkbrnimg -s $(SIGNATURE) -m $(MAGIC) -p $(CRC32_POLY) -o $@ $(IMAGE_KERNEL) $(IMAGE_ROOTFS) + mkbrnimg -s $(SIGNATURE) -m $(MAGIC) -p $(CRC32_POLY) -o $@ $(IMAGE_KERNEL) $(IMAGE_ROOTFS) endef define Build/fullimage @@ -52,6 +52,9 @@ define Build/fullimage rm $@.tmp endef +DEVICE_VARS += IMAGE_SIZE SIGNATURE MAGIC CRC32_POLY +DTS_DIR := $(DTS_DIR)/lantiq + # Shared device definition: applies to every defined device define Device/Default PROFILES = Default @@ -61,11 +64,12 @@ define Device/Default KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma FILESYSTEMS := squashfs IMAGE_SIZE := + SOC := $(DEFAULT_SOC) + DEVICE_DTS = $$(SOC)_$(1) SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) endef -DEVICE_VARS += IMAGE_SIZE define Device/NAND/xway BLOCKSIZE := 16k @@ -91,15 +95,15 @@ define Device/lantiqBrnImage IMAGES := factory.bin IMAGE/factory.bin := mkbrnimg | check-size $$$$(IMAGE_SIZE) endef -DEVICE_VARS += SIGNATURE MAGIC CRC32_POLY define Device/lantiqFullImage KERNEL := kernel-bin | append-dtb | lzma | uImage lzma | pad-offset 4 0 IMAGES := sysupgrade.bin fullimage.bin - IMAGE/fullimage.bin := fullimage | check-size $$$$(IMAGE_SIZE) + IMAGE/fullimage.bin := fullimage | check-size endef define Device/AVM + DEVICE_VENDOR := AVM KERNEL := kernel-bin | append-dtb | lzma | eva-image KERNEL_INITRAMFS := $$(KERNEL) IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-avm-fakeroot | \ @@ -107,742 +111,29 @@ define Device/AVM endef ifeq ($(SUBTARGET),ase) - -define Device/allnet_all0333cj - IMAGE_SIZE := 3700k - DEVICE_DTS := ALL0333CJ - DEVICE_TITLE := Allnet ALL0333CJ - DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ - kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ - ltq-adsl-app ppp-mod-pppoe -endef -TARGET_DEVICES += allnet_all0333cj - -define Device/netgear_dgn1000b - IMAGE_SIZE := 6000k - DEVICE_DTS := DGN1000B - DEVICE_TITLE := Netgear DGN1000B - DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ - kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ - ltq-adsl-app ppp-mod-pppoe - SUPPORTED_DEVICES += DGN1000B -endef -TARGET_DEVICES += netgear_dgn1000b - +DEFAULT_SOC := amazonse +include amazonse.mk endif ifeq ($(SUBTARGET),xway_legacy) - -define Device/arcadyan_arv4520pw - IMAGE_SIZE := 3648k - DEVICE_DTS := ARV4520PW - DEVICE_TITLE := Easybox 800, WAV-281 - ARV4520PW - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-rt61-pci wpad-mini - SUPPORTED_DEVICES += ARV4520PW -endef -TARGET_DEVICES += arcadyan_arv4520pw - -define Device/arcadyan_arv4525pw - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4525PW - DEVICE_TITLE := Speedport W502V Typ A - ARV4525PW - DEVICE_PACKAGES := kmod-ath5k wpad-mini \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa -swconfig - SUPPORTED_DEVICES += ARV4525PW -endef -TARGET_DEVICES += arcadyan_arv4525pw - -define Device/arcadyan_arv452cqw - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV452CQW - DEVICE_TITLE := Easybox 801 - ARV452CQW - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ath5k wpad-mini \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa - SUPPORTED_DEVICES += ARV452CQW -endef -TARGET_DEVICES += arcadyan_arv452cqw - -define Device/arcadyan_arv4518pwr01 - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4518PWR01 - DEVICE_TITLE := ARV4518PWR01 - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath5k wpad-mini - SUPPORTED_DEVICES += ARV4518PWR01 -endef -TARGET_DEVICES += arcadyan_arv4518pwr01 - -define Device/arcadyan_arv4518pwr01a - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4518PWR01A - DEVICE_TITLE := ARV4518PWR01A - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath5k wpad-basic - SUPPORTED_DEVICES += ARV4518PWR01A -endef -TARGET_DEVICES += arcadyan_arv4518pwr01a - +DEFAULT_SOC := danube +include xway_legacy.mk endif ifeq ($(SUBTARGET),xway) - -# Danube - -define Device/bt_homehub-v2b - $(Device/NAND) - BOARD_NAME := BTHOMEHUBV2B - DEVICE_DTS := BTHOMEHUBV2B - DEVICE_TITLE := BT Home Hub 2B - DEVICE_PACKAGES := kmod-usb-dwc2 \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - kmod-ltq-deu-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic - SUPPORTED_DEVICES += BTHOMEHUBV2B -endef -TARGET_DEVICES += bt_homehub-v2b - -define Device/lantiq_easy50712 - DEVICE_DTS := EASY50712 - IMAGE_SIZE := 3776k - DEVICE_TITLE := Lantiq Danube - EASY50712 -endef -TARGET_DEVICES += lantiq_easy50712 - -define Device/audiocodes_mp-252 - IMAGE_SIZE := 14848k - DEVICE_DTS := ACMP252 - DEVICE_TITLE := AudioCodes MediaPack MP-252 - DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ - kmod-rt2800-pci \ - ltq-adsl-app ppp-mod-pppoa \ - wpad-basic - SUPPORTED_DEVICES += ACMP252 -endef -TARGET_DEVICES += audiocodes_mp-252 - -define Device/arcadyan_arv4510pw - IMAGE_SIZE := 15616k - DEVICE_DTS := ARV4510PW - DEVICE_TITLE := Wippies, Elisa - ARV4510PW - DEVICE_PACKAGES := kmod-usb-ledtrig-usbport kmod-usb2-pci kmod-usb-uhci \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci kmod-ath5k wpad-basic - SUPPORTED_DEVICES += ARV4510PW -endef -TARGET_DEVICES += arcadyan_arv4510pw - -define Device/arcadyan_arv7525pw - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4510PW - DEVICE_TITLE := Speedport W303V Typ A - ARV7525PW - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa -swconfig - SUPPORTED_DEVICES += ARV4510PW -endef -TARGET_DEVICES += arcadyan_arv7525pw - -define Device/arcadyan_arv4519pw - IMAGE_SIZE := 3776k - DEVICE_DTS := ARV4519PW - DEVICE_TITLE := Vodafone, Pirelli - ARV4519PW - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa - SUPPORTED_DEVICES += ARV4519PW -endef -TARGET_DEVICES += arcadyan_arv4519pw - -define Device/arcadyan_arv7506pw11 - IMAGE_SIZE := 7808k - DEVICE_DTS := ARV7506PW11 - DEVICE_TITLE := Alice/O2 IAD 4421 - ARV7506PW11 - DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-rt2800-pci wpad-basic - SUPPORTED_DEVICES += ARV7506PW11 -endef -TARGET_DEVICES += arcadyan_arv7506pw11 - -define Device/arcadyan_arv7510pw22 - IMAGE_SIZE := 31232k - DEVICE_DTS := ARV7510PW22 - DEVICE_TITLE := Astoria - ARV7510PW22 - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci wpad-basic \ - kmod-usb-uhci kmod-usb2 kmod-usb2-pci - SUPPORTED_DEVICES += ARV7510PW22 -endef -TARGET_DEVICES += arcadyan_arv7510pw22 - -define Device/arcadyan_arv7518pw - IMAGE_SIZE := 7872k - DEVICE_DTS := ARV7518PW - DEVICE_TITLE := Astoria - ARV7518PW - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic - SUPPORTED_DEVICES += ARV7518PW -endef -TARGET_DEVICES += arcadyan_arv7518pw - -define Device/arcadyan_arv7519pw - IMAGE_SIZE := 15488k - DEVICE_DTS := ARV7519PW - DEVICE_TITLE := Astoria - ARV7519PW - DEVICE_PACKAGES := kmod-usb-dwc2 \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-rt2800-pci wpad-basic - SUPPORTED_DEVICES += ARV7519PW -endef -TARGET_DEVICES += arcadyan_arv7519pw - -define Device/arcadyan_arv752dpw - IMAGE_SIZE := 7872k - DEVICE_DTS := ARV752DPW - DEVICE_TITLE := Easybox 802 - ARV752DPW - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci wpad-basic - SUPPORTED_DEVICES += ARV752DPW -endef -TARGET_DEVICES += arcadyan_arv752dpw - -define Device/arcadyan_arv752dpw22 - IMAGE_SIZE := 7616k - DEVICE_DTS := ARV752DPW22 - DEVICE_TITLE := Easybox 803 - ARV752DPW22 - DEVICE_PACKAGES := kmod-usb2-pci kmod-usb-uhci kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-tapi kmod-ltq-vmmc \ - kmod-rt2800-pci wpad-basic - SUPPORTED_DEVICES += ARV752DPW22 -endef -TARGET_DEVICES += arcadyan_arv752dpw22 - -define Device/arcadyan_arv8539pw22 - IMAGE_SIZE := 7616k - DEVICE_DTS := ARV8539PW22 - DEVICE_TITLE := Speedport W504V Typ A - ARV8539PW22 - DEVICE_PACKAGES := kmod-usb-dwc2 \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic - SUPPORTED_DEVICES += ARV8539PW22 -endef -TARGET_DEVICES += arcadyan_arv8539pw22 - -define Device/siemens_gigaset-sx76x - IMAGE_SIZE := 7680k - DEVICE_DTS := GIGASX76X - DEVICE_TITLE := Gigaset sx76x - DEVICE_PACKAGES := kmod-usb-dwc2 \ - kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ - kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ - ltq-adsl-app ppp-mod-pppoe \ - kmod-ath5k wpad-basic - SUPPORTED_DEVICES += GIGASX76X -endef -TARGET_DEVICES += siemens_gigaset-sx76x - - -# AR9 - -define Device/bt_homehub-v3a - $(Device/NAND) - BOARD_NAME := BTHOMEHUBV3A - DEVICE_DTS := BTHOMEHUBV3A - DEVICE_TITLE := BT Home Hub 3A - DEVICE_PACKAGES := kmod-usb-dwc2 \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ - kmod-ltq-deu-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic \ - uboot-envtools - SUPPORTED_DEVICES += BTHOMEHUBV3A -endef -TARGET_DEVICES += bt_homehub-v3a - -DGN3500_KERNEL_OFFSET_HEX=0x50000 -DGN3500_KERNEL_OFFSET_DEC=327680 -define Device/netgear_dgn3500 - DEVICE_DTS := DGN3500 - IMAGE_SIZE := 16000k - IMAGES := \ - sysupgrade-na.bin sysupgrade.bin \ - factory-na.img factory.img - IMAGE/sysupgrade-na.bin := \ - append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "NA" | \ - pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.bin := \ - append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "WW" | \ - pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory-na.img := \ - pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ - dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "NA" | pad-rootfs | \ - check-size 16320k | pad-to 16384k - IMAGE/factory.img := \ - pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ - dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "WW" | pad-rootfs | \ - check-size 16320k | pad-to 16384k - DEVICE_TITLE := Netgear DGN3500 - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ath9k kmod-owl-loader wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 - SUPPORTED_DEVICES += DGN3500 -endef -TARGET_DEVICES += netgear_dgn3500 - -define Device/netgear_dgn3500b - DEVICE_DTS := DGN3500B - IMAGE_SIZE := 16000k - IMAGES += factory.img - IMAGE/sysupgrade.bin := \ - append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "DE" | \ - pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img := \ - pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ - dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" | pad-rootfs | \ - check-size 16320k | pad-to 16384k - DEVICE_TITLE := Netgear DGN3500B - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ath9k kmod-owl-loader wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 - SUPPORTED_DEVICES += DGN3500B -endef -TARGET_DEVICES += netgear_dgn3500b - -define Device/buffalo_wbmr-hp-g300h-a - IMAGE_SIZE := 31488k - DEVICE_DTS := WBMR - DEVICE_TITLE := Buffalo WBMR-HP-G300H (A) - WBMR - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic - SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h -endef -TARGET_DEVICES += buffalo_wbmr-hp-g300h-a - -define Device/buffalo_wbmr-hp-g300h-b - IMAGE_SIZE := 31488k - DEVICE_DTS := WBMR - DEVICE_TITLE := Buffalo WBMR-HP-G300H (B) - WBMR - DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ath9k kmod-owl-loader wpad-basic - SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h -endef -TARGET_DEVICES += buffalo_wbmr-hp-g300h-b - -define Device/avm_fritz7312 - $(Device/AVM) - DEVICE_DTS := FRITZ7312 - IMAGE_SIZE := 15744k - DEVICE_TITLE := AVM FRITZ!Box 7312 - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 -swconfig -endef -TARGET_DEVICES += avm_fritz7312 - -define Device/avm_fritz7320 - $(Device/AVM) - DEVICE_DTS := FRITZ7320 - IMAGE_SIZE := 15744k - DEVICE_TITLE := AVM FRITZ!Box 7320 - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 kmod-usb-dwc2 -swconfig - SUPPORTED_DEVICES += FRITZ7320 -endef -TARGET_DEVICES += avm_fritz7320 - -define Device/zte_h201l - IMAGE_SIZE := 7808k - DEVICE_DTS := H201L - DEVICE_TITLE := ZTE H201L - H201L - DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoe \ - kmod-ltq-deu-ar9 kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ - kmod-ltq-tapi kmod-ltq-vmmc - SUPPORTED_DEVICES += H201L -endef -TARGET_DEVICES += zte_h201l - -define Device/zyxel_p-2601hn - IMAGE_SIZE := 15616k - DEVICE_DTS := P2601HNFX - DEVICE_TITLE := ZyXEL P-2601HN-Fx - DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic \ - kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ - kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ - ltq-adsl-app ppp-mod-pppoe \ - kmod-ltq-deu-ar9 kmod-usb-dwc2 - SUPPORTED_DEVICES += P2601HNFX -endef -TARGET_DEVICES += zyxel_p-2601hn - - +include danube.mk +include ar9.mk endif - ifeq ($(SUBTARGET),xrx200) - -# VR9 - -define Device/zyxel_p-2812hnu-f1 - $(Device/NAND) - BOARD_NAME := P2812HNUF1 - DEVICE_DTS := P2812HNUF1 - DEVICE_TITLE := ZyXEL P-2812HNU-F1 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport - KERNEL_SIZE := 3072k - SUPPORTED_DEVICES += P2812HNUF1 -endef -TARGET_DEVICES += zyxel_p-2812hnu-f1 - -define Device/zyxel_p-2812hnu-f3 - $(Device/NAND) - BOARD_NAME := P2812HNUF3 - DEVICE_DTS := P2812HNUF3 - DEVICE_TITLE := ZyXEL P-2812HNU-F3 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 - SUPPORTED_DEVICES += P2812HNUF3 -endef -TARGET_DEVICES += zyxel_p-2812hnu-f3 - -define Device/arcadyan_arv7519rw22 - IMAGE_SIZE := 31232k - DEVICE_DTS := ARV7519RW22 - DEVICE_TITLE := Livebox Astoria ARV7519RW22 - DEVICE_PACKAGES := kmod-usb-dwc2 - SUPPORTED_DEVICES += ARV7519RW22 -endef -TARGET_DEVICES += arcadyan_arv7519rw22 - -define Device/alphanetworks_asl56026 - DEVICE_DTS := ASL56026 - IMAGE_SIZE := 7488k - DEVICE_TITLE := BT OpenReach - ECI VDSL Modem V-2FUb/I -endef -TARGET_DEVICES += alphanetworks_asl56026 - -define Device/bt_homehub-v5a - $(Device/NAND) - BOARD_NAME := BTHOMEHUBV5A - DEVICE_DTS := BTHOMEHUBV5A - DEVICE_TITLE := BT Home Hub 5A - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \ - kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2 - SUPPORTED_DEVICES += BTHOMEHUBV5A -endef -TARGET_DEVICES += bt_homehub-v5a - -define Device/netgear_dm200 - DEVICE_DTS := DM200 - IMAGES := sysupgrade.bin factory.img - IMAGE/sysupgrade.bin := append-kernel | \ - pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ - pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ - append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img := $$(IMAGE/sysupgrade.bin) | netgear-dni - IMAGE_SIZE := 7872k - DEVICE_TITLE := Netgear DM200 - NETGEAR_BOARD_ID := DM200 - NETGEAR_HW_ID := 29765233+8+0+64+0+0 -endef -DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID -TARGET_DEVICES += netgear_dm200 - -define Device/lantiq_easy80920-nand - $(Device/lantiqFullImage) - DEVICE_DTS := EASY80920NAND - IMAGE_SIZE := 64512k - DEVICE_TITLE := Lantiq VR9 - EASY80920NAND - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport -endef -TARGET_DEVICES += lantiq_easy80920-nand - -define Device/lantiq_easy80920-nor - DEVICE_DTS := EASY80920NOR - IMAGE_SIZE := 7936k - DEVICE_TITLE := Lantiq VR9 - EASY80920NOR - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport -endef -TARGET_DEVICES += lantiq_easy80920-nor - -define Device/avm_fritz3370 - $(Device/AVM) - $(Device/NAND) - DEVICE_DTS := FRITZ3370 - DEVICE_TITLE := AVM FRITZ!Box 3370 Rev. 2 - KERNEL_SIZE := 4096k - UBINIZE_OPTS := -E 5 - IMAGES += eva-kernel.bin eva-filesystem.bin - IMAGE/eva-kernel.bin := append-kernel - IMAGE/eva-filesystem.bin := append-ubi - DEVICE_PACKAGES := kmod-ath9k wpad-basic kmod-usb-dwc2 fritz-tffs -endef - -define Device/avm_fritz3370-rev2-hynix - $(Device/avm_fritz3370) - DEVICE_DTS := FRITZ3370-REV2-HYNIX - DEVICE_TITLE := AVM FRITZ!Box 3370 Rev. 2 (Hynix NAND) -endef -TARGET_DEVICES += avm_fritz3370-rev2-hynix - -define Device/avm_fritz3370-rev2-micron - $(Device/avm_fritz3370) - DEVICE_DTS := FRITZ3370-REV2-MICRON - DEVICE_TITLE := AVM FRITZ!Box 3370 Rev. 2 (Micron NAND) -endef -TARGET_DEVICES += avm_fritz3370-rev2-micron - -define Device/avm_fritz7360sl - $(Device/AVM) - IMAGE_SIZE := 15744k - DEVICE_DTS := FRITZ7360SL - DEVICE_TITLE := AVM FRITZ!Box 7360 SL - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 - SUPPORTED_DEVICES += FRITZ7360SL -endef -TARGET_DEVICES += avm_fritz7360sl - -define Device/avm_fritz7412 - $(Device/AVM) - $(Device/NAND) - BOARD_NAME := FRITZ7412 - DEVICE_DTS := FRITZ7412 - KERNEL_SIZE := 4096k - IMAGE_SIZE := 49152k - DEVICE_TITLE := AVM FRITZ!Box 7412 - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-ltq-tapi kmod-ltq-vmmc fritz-tffs-nand fritz-caldata -endef -TARGET_DEVICES += avm_fritz7412 - -define Device/avm_fritz7362sl - $(Device/AVM) - $(Device/NAND) - KERNEL_SIZE := 4096k - IMAGE_SIZE := 49152k - DEVICE_DTS := FRITZ7362SL - DEVICE_TITLE := AVM FRITZ!Box 7362 SL - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 fritz-tffs -endef -TARGET_DEVICES += avm_fritz7362sl - -define Device/arcadyan_vg3503j - IMAGE_SIZE := 8000k - DEVICE_DTS := VG3503J - DEVICE_TITLE := BT OpenReach - ECI VDSL Modem V-2FUb/R - SUPPORTED_DEVICES += VG3503J -endef -TARGET_DEVICES += arcadyan_vg3503j - +DEFAULT_SOC := vr9 include tp-link.mk - -define Device/buffalo_wbmr-300hpd - IMAGE_SIZE := 15616k - DEVICE_DTS := WBMR300 - DEVICE_TITLE := Buffalo WBMR-300HPD - DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2 - SUPPORTED_DEVICES += WBMR300 -endef -TARGET_DEVICES += buffalo_wbmr-300hpd - -define Device/arcadyan_vgv7510kw22-nor - IMAGE_SIZE := 15232k - DEVICE_DTS := VGV7510KW22NOR - DEVICE_TITLE := o2 Box 6431 / Arcadyan VGV7510KW22 (NOR) - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc - SUPPORTED_DEVICES += VGV7510KW22NOR -endef -TARGET_DEVICES += arcadyan_vgv7510kw22-nor - -define Device/arcadyan_vgv7510kw22-brn - $(Device/lantiqBrnImage) - IMAGE_SIZE := 7168k - DEVICE_DTS := VGV7510KW22BRN - SIGNATURE := BRNDA6431 - MAGIC := 0x12345678 - CRC32_POLY := 0x04c11db7 - DEVICE_TITLE := o2 Box 6431 / Arcadyan VGV7510KW22 (BRN) - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc - SUPPORTED_DEVICES += VGV7510KW22BRN -endef -TARGET_DEVICES += arcadyan_vgv7510kw22-brn - -define Device/arcadyan_vgv7519-nor - IMAGE_SIZE := 15360k - DEVICE_DTS := VGV7519NOR - DEVICE_TITLE := Experiabox 8 VGV7519 - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc - SUPPORTED_DEVICES += VGV7519NOR -endef -TARGET_DEVICES += arcadyan_vgv7519-nor - -define Device/arcadyan_vgv7519-brn - $(Device/lantiqBrnImage) - IMAGE_SIZE := 7168k - DEVICE_DTS := VGV7519BRN - SIGNATURE := 5D00008000 - MAGIC := 0x12345678 - CRC32_POLY := 0x2083b8ed - DEVICE_TITLE := Experiabox 8 VGV7519 (BRN) - DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc - SUPPORTED_DEVICES += VGV7519BRN -endef -TARGET_DEVICES += arcadyan_vgv7519-brn - +include vr9.mk endif - ifeq ($(SUBTARGET),falcon) - -define Device/lantiq_easy98000-nor - IMAGE_SIZE := 3904k - DEVICE_DTS := EASY98000NOR - DEVICE_TITLE := EASY98000 - Lantiq Falcon Eval Board NOR - DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 -endef -TARGET_DEVICES += lantiq_easy98000-nor - -define Device/lantiq_easy98000-nand - IMAGE_SIZE := 3904k - DEVICE_DTS := EASY98000NAND - DEVICE_TITLE := EASY98000 - Lantiq Falcon Eval Board NAND - DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 -endef -TARGET_DEVICES += lantiq_easy98000-nand - -define Device/lantiq_easy98000-sflash - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98000SFLASH - DEVICE_TITLE := EASY98000 - Lantiq Falcon Eval Board SFLASH - DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 -endef -TARGET_DEVICES += lantiq_easy98000-sflash - -define Device/lantiq_falcon-mdu - IMAGE_SIZE := 7424k - DEVICE_DTS := FALCON-MDU - DEVICE_TITLE := MDU - Lantiq Falcon / VINAXdp MDU Board -endef -TARGET_DEVICES += lantiq_falcon-mdu - -define Device/lantiq_easy88388 - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY88388 - DEVICE_TITLE := EASY88388 - Lantiq Falcon FTTDP8 Reference Board -endef -TARGET_DEVICES += lantiq_easy88388 - -define Device/lantiq_easy88444 - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY88444 - DEVICE_TITLE := EASY88444 - Lantiq Falcon FTTdp G.FAST Reference Board -endef -TARGET_DEVICES += lantiq_easy88444 - -define Device/lantiq_falcon-sfp - IMAGE_SIZE := 7424k - DEVICE_DTS := FALCON-SFP - DEVICE_TITLE := SFP - Lantiq Falcon SFP Stick -endef -TARGET_DEVICES += lantiq_falcon-sfp - -define Device/lantiq_easy98035synce - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98035SYNCE - DEVICE_TITLE := EASY98035SYNCE - Lantiq Falcon SFP Stick with Synchronous Ethernet -endef -TARGET_DEVICES += lantiq_easy98035synce - -define Device/lantiq_easy98035synce1588 - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98035SYNCE1588 - DEVICE_TITLE := EASY98035SYNCE1588 - Lantiq Falcon SFP Stick with SyncE and IEEE1588 -endef -TARGET_DEVICES += lantiq_easy98035synce1588 - -define Device/lantiq_easy98020 - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98020 - DEVICE_TITLE := EASY98020 - Lantiq Falcon SFU Reference Board -endef -TARGET_DEVICES += lantiq_easy98020 - -define Device/lantiq_easy98020-v18 - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98020V18 - DEVICE_TITLE := EASY98020V18 - Lantiq Falcon SFU Reference Board V1.8 -endef -TARGET_DEVICES += lantiq_easy98020-v18 - -define Device/lantiq_easy98021 - IMAGE_SIZE := 7424k - DEVICE_DTS := EASY98021 - DEVICE_TITLE := EASY98021 - Lantiq Falcon HGU Reference Board -endef -TARGET_DEVICES += lantiq_easy98021 - +DEFAULT_SOC := falcon +include falcon.mk endif $(eval $(call BuildImage)) diff --git a/target/linux/lantiq/image/amazonse.mk b/target/linux/lantiq/image/amazonse.mk new file mode 100644 index 0000000000..4a23a68e40 --- /dev/null +++ b/target/linux/lantiq/image/amazonse.mk @@ -0,0 +1,20 @@ +define Device/allnet_all0333cj + DEVICE_VENDOR := Allnet + DEVICE_MODEL := ALL0333CJ + IMAGE_SIZE := 3700k + DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ + kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ + ltq-adsl-app ppp-mod-pppoe +endef +TARGET_DEVICES += allnet_all0333cj + +define Device/netgear_dgn1000b + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := DGN1000B + IMAGE_SIZE := 6000k + DEVICE_PACKAGES := kmod-ltq-adsl-ase kmod-ltq-adsl-ase-mei \ + kmod-ltq-adsl-ase-fw-b kmod-ltq-atm-ase \ + ltq-adsl-app ppp-mod-pppoe + SUPPORTED_DEVICES += DGN1000B +endef +TARGET_DEVICES += netgear_dgn1000b diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk new file mode 100644 index 0000000000..73e2ab89b2 --- /dev/null +++ b/target/linux/lantiq/image/ar9.mk @@ -0,0 +1,165 @@ +define Device/avm_fritz7312 + $(Device/AVM) + DEVICE_MODEL := FRITZ!Box 7312 + SOC := ar9 + IMAGE_SIZE := 15744k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-deu-ar9 -swconfig +endef +TARGET_DEVICES += avm_fritz7312 + +define Device/avm_fritz7320 + $(Device/AVM) + DEVICE_MODEL := FRITZ!Box 7320 + DEVICE_ALT0_VENDOR := 1&1 + DEVICE_ALT0_MODEL := HomeServer + SOC := ar9 + IMAGE_SIZE := 15744k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-deu-ar9 kmod-usb-dwc2 -swconfig + SUPPORTED_DEVICES += FRITZ7320 +endef +TARGET_DEVICES += avm_fritz7320 + +define Device/bt_homehub-v3a + $(Device/NAND) + DEVICE_VENDOR := British Telecom + DEVICE_MODEL := Home Hub 3 + DEVICE_VARIANT := Type A + BOARD_NAME := BTHOMEHUBV3A + SOC := ar9 + DEVICE_PACKAGES := kmod-usb-dwc2 \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ + kmod-ltq-deu-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic \ + uboot-envtools + SUPPORTED_DEVICES += BTHOMEHUBV3A +endef +TARGET_DEVICES += bt_homehub-v3a + +define Device/buffalo_wbmr-hp-g300h-a + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := WBMR-HP-G300H + DEVICE_VARIANT := A + IMAGE_SIZE := 31488k + SOC := ar9 + DEVICE_DTS := ar9_buffalo_wbmr-hp-g300h + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic + SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h +endef +TARGET_DEVICES += buffalo_wbmr-hp-g300h-a + +define Device/buffalo_wbmr-hp-g300h-b + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := WBMR-HP-G300H + DEVICE_VARIANT := B + IMAGE_SIZE := 31488k + SOC := ar9 + DEVICE_DTS := ar9_buffalo_wbmr-hp-g300h + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic + SUPPORTED_DEVICES := WBMR buffalo,wbmr-hp-g300h +endef +TARGET_DEVICES += buffalo_wbmr-hp-g300h-b + +DGN3500_KERNEL_OFFSET_HEX=0x50000 +DGN3500_KERNEL_OFFSET_DEC=327680 +define Device/netgear_dgn3500 + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := DGN3500 + SOC := ar9 + IMAGE_SIZE := 16000k + IMAGES := \ + sysupgrade-na.bin sysupgrade.bin \ + factory-na.img factory.img + IMAGE/sysupgrade-na.bin := \ + append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "NA" | \ + pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := \ + append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "WW" | \ + pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory-na.img := \ + pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ + dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "NA" | pad-rootfs | \ + check-size 16320k | pad-to 16384k + IMAGE/factory.img := \ + pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ + dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "WW" | pad-rootfs | \ + check-size 16320k | pad-to 16384k + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ath9k kmod-owl-loader wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-deu-ar9 + SUPPORTED_DEVICES += DGN3500 +endef +TARGET_DEVICES += netgear_dgn3500 + +define Device/netgear_dgn3500b + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := DGN3500B + SOC := ar9 + IMAGE_SIZE := 16000k + IMAGES += factory.img + IMAGE/sysupgrade.bin := \ + append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "DE" | \ + pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img := \ + pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \ + dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" | pad-rootfs | \ + check-size 16320k | pad-to 16384k + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ath9k kmod-owl-loader wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-deu-ar9 + SUPPORTED_DEVICES += DGN3500B +endef +TARGET_DEVICES += netgear_dgn3500b + +define Device/zte_h201l + DEVICE_VENDOR := ZTE + DEVICE_MODEL := H201L + IMAGE_SIZE := 7808k + SOC := ar9 + DEVICE_PACKAGES := kmod-ath9k-htc wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoe \ + kmod-ltq-deu-ar9 kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-tapi kmod-ltq-vmmc + SUPPORTED_DEVICES += H201L +endef +TARGET_DEVICES += zte_h201l + +define Device/zyxel_p-2601hn + DEVICE_VENDOR := ZyXEL + DEVICE_MODEL := P-2601HN + DEVICE_VARIANT := F1/F3 + IMAGE_SIZE := 15616k + SOC := ar9 + DEVICE_PACKAGES := kmod-rt2800-usb wpad-basic \ + kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ + kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ + ltq-adsl-app ppp-mod-pppoe \ + kmod-ltq-deu-ar9 kmod-usb-dwc2 + SUPPORTED_DEVICES += P2601HNFX +endef +TARGET_DEVICES += zyxel_p-2601hn diff --git a/target/linux/lantiq/image/danube.mk b/target/linux/lantiq/image/danube.mk new file mode 100644 index 0000000000..2fb5ea061f --- /dev/null +++ b/target/linux/lantiq/image/danube.mk @@ -0,0 +1,219 @@ +define Device/arcadyan_arv4510pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4510PW + DEVICE_ALT0_VENDOR := Wippies + DEVICE_ALT0_MODEL := BeWan iBox v1.0 + IMAGE_SIZE := 15616k + SOC := danube + DEVICE_PACKAGES := kmod-usb-ledtrig-usbport kmod-usb2-pci kmod-usb-uhci \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-tapi kmod-ltq-vmmc \ + kmod-rt2800-pci kmod-ath5k wpad-basic + SUPPORTED_DEVICES += ARV4510PW +endef +TARGET_DEVICES += arcadyan_arv4510pw + +define Device/arcadyan_arv4519pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4519PW + DEVICE_ALT0_VENDOR := Vodafone + DEVICE_ALT0_MODEL := NetFasteR IAD 2 + DEVICE_ALT1_VENDOR := Pirelli + DEVICE_ALT1_MODEL := P.RG A4201G + IMAGE_SIZE := 3776k + SOC := danube + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa + SUPPORTED_DEVICES += ARV4519PW +endef +TARGET_DEVICES += arcadyan_arv4519pw + +define Device/arcadyan_arv7506pw11 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7506PW11 + DEVICE_ALT0_VENDOR := Alice/O2 + DEVICE_ALT0_MODEL := IAD 4421 + IMAGE_SIZE := 7808k + SOC := danube + DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-rt2800-pci wpad-basic + SUPPORTED_DEVICES += ARV7506PW11 +endef +TARGET_DEVICES += arcadyan_arv7506pw11 + +define Device/arcadyan_arv7510pw22 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7510PW22 + DEVICE_ALT0_VENDOR := Astoria Networks + DEVICE_ALT0_MODEL := ARV7510PW22 + IMAGE_SIZE := 31232k + SOC := danube + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-tapi kmod-ltq-vmmc \ + kmod-rt2800-pci wpad-basic \ + kmod-usb-uhci kmod-usb2 kmod-usb2-pci + SUPPORTED_DEVICES += ARV7510PW22 +endef +TARGET_DEVICES += arcadyan_arv7510pw22 + +define Device/arcadyan_arv7518pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7518PW + DEVICE_ALT0_VENDOR := Astoria Networks + DEVICE_ALT0_MODEL := ARV7518PW + IMAGE_SIZE := 7872k + SOC := danube + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic + SUPPORTED_DEVICES += ARV7518PW +endef +TARGET_DEVICES += arcadyan_arv7518pw + +define Device/arcadyan_arv7519pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7519PW + DEVICE_ALT0_VENDOR := Astoria Networks + DEVICE_ALT0_MODEL := ARV7519PW + IMAGE_SIZE := 15488k + SOC := danube + DEVICE_PACKAGES := kmod-usb-dwc2 \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-rt2800-pci wpad-basic + SUPPORTED_DEVICES += ARV7519PW +endef +TARGET_DEVICES += arcadyan_arv7519pw + +define Device/arcadyan_arv7525pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7525PW + DEVICE_ALT0_VENDOR := Telekom + DEVICE_ALT0_MODEL := Speedport W303V + DEVICE_ALT0_VARIANT := Typ A + IMAGE_SIZE := 3776k + SOC := danube + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa -swconfig + SUPPORTED_DEVICES += ARV4510PW +endef +TARGET_DEVICES += arcadyan_arv7525pw + +define Device/arcadyan_arv752dpw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV752DPW + DEVICE_ALT0_VENDOR := Vodafone + DEVICE_ALT0_MODEL := Easybox 802 + IMAGE_SIZE := 7872k + SOC := danube + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-tapi kmod-ltq-vmmc \ + kmod-rt2800-pci wpad-basic + SUPPORTED_DEVICES += ARV752DPW +endef +TARGET_DEVICES += arcadyan_arv752dpw + +define Device/arcadyan_arv752dpw22 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV752DPW22 + DEVICE_ALT0_VENDOR := Vodafone + DEVICE_ALT0_MODEL := Easybox 803 + IMAGE_SIZE := 7616k + SOC := danube + DEVICE_PACKAGES := kmod-usb2-pci kmod-usb-uhci kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ltq-tapi kmod-ltq-vmmc \ + kmod-rt2800-pci wpad-basic + SUPPORTED_DEVICES += ARV752DPW22 +endef +TARGET_DEVICES += arcadyan_arv752dpw22 + +define Device/arcadyan_arv8539pw22 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV8539PW22 + DEVICE_ALT0_VENDOR := Telekom + DEVICE_ALT0_MODEL := Speedport W504V Typ A + IMAGE_SIZE := 7616k + SOC := danube + DEVICE_PACKAGES := kmod-usb-dwc2 \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic + SUPPORTED_DEVICES += ARV8539PW22 +endef +TARGET_DEVICES += arcadyan_arv8539pw22 + +define Device/audiocodes_mp-252 + DEVICE_VENDOR := AudioCodes + DEVICE_MODEL := MediaPack MP-252 + IMAGE_SIZE := 14848k + SOC := danube + DEVICE_PACKAGES := kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + kmod-ltq-tapi kmod-ltq-vmmc \ + kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ + kmod-rt2800-pci \ + ltq-adsl-app ppp-mod-pppoa \ + wpad-basic + SUPPORTED_DEVICES += ACMP252 +endef +TARGET_DEVICES += audiocodes_mp-252 + +define Device/bt_homehub-v2b + $(Device/NAND) + DEVICE_VENDOR := British Telecom + DEVICE_MODEL := Home Hub 2 + DEVICE_VARIANT := Type B + BOARD_NAME := BTHOMEHUBV2B + SOC := danube + DEVICE_PACKAGES := kmod-usb-dwc2 \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + kmod-ltq-deu-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath9k kmod-owl-loader wpad-basic + SUPPORTED_DEVICES += BTHOMEHUBV2B +endef +TARGET_DEVICES += bt_homehub-v2b + +define Device/lantiq_easy50712 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Danube (EASY50712) + SOC := danube + IMAGE_SIZE := 3776k +endef +TARGET_DEVICES += lantiq_easy50712 + +define Device/siemens_gigaset-sx76x + DEVICE_VENDOR := Siemens + DEVICE_MODEL := Gigaset sx76x + IMAGE_SIZE := 7680k + SOC := danube + DEVICE_PACKAGES := kmod-usb-dwc2 \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoe \ + kmod-ath5k wpad-basic + SUPPORTED_DEVICES += GIGASX76X +endef +TARGET_DEVICES += siemens_gigaset-sx76x diff --git a/target/linux/lantiq/image/falcon.mk b/target/linux/lantiq/image/falcon.mk new file mode 100644 index 0000000000..a5490f6e68 --- /dev/null +++ b/target/linux/lantiq/image/falcon.mk @@ -0,0 +1,93 @@ +define Device/lantiq_easy88388 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := EASY88388 Falcon FTTDP8 Reference Board + IMAGE_SIZE := 7424k +endef +TARGET_DEVICES += lantiq_easy88388 + +define Device/lantiq_easy88444 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := EASY88444 Falcon FTTdp G.FAST Reference Board + IMAGE_SIZE := 7424k +endef +TARGET_DEVICES += lantiq_easy88444 + +define Device/lantiq_easy98020 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon SFU Reference Board (EASY98020) + DEVICE_VARIANT := v1.0-v1.7 + IMAGE_SIZE := 7424k +endef +TARGET_DEVICES += lantiq_easy98020 + +define Device/lantiq_easy98020-v18 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon SFU Reference Board (EASY98020) + DEVICE_VARIANT := v1.8 + IMAGE_SIZE := 7424k +endef +TARGET_DEVICES += lantiq_easy98020-v18 + +define Device/lantiq_easy98021 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon HGU Reference Board (EASY98021) + IMAGE_SIZE := 7424k +endef +TARGET_DEVICES += lantiq_easy98021 + +define Device/lantiq_easy98035synce + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE) + DEVICE_VARIANT := with Synchronous Ethernet + IMAGE_SIZE := 7424k +endef +TARGET_DEVICES += lantiq_easy98035synce + +define Device/lantiq_easy98035synce1588 + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon SFP Stick (EASY98035SYNCE1588) + DEVICE_VARIANT := with SyncE and IEEE1588 + IMAGE_SIZE := 7424k +endef +TARGET_DEVICES += lantiq_easy98035synce1588 + +define Device/lantiq_easy98000-nand + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := EASY98000 Falcon Eval Board + DEVICE_VARIANT := NAND + IMAGE_SIZE := 3904k + DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 +endef +TARGET_DEVICES += lantiq_easy98000-nand + +define Device/lantiq_easy98000-nor + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := EASY98000 Falcon Eval Board + DEVICE_VARIANT := NOR + IMAGE_SIZE := 3904k + DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 +endef +TARGET_DEVICES += lantiq_easy98000-nor + +define Device/lantiq_easy98000-sflash + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := EASY98000 Falcon Eval Board + DEVICE_VARIANT := SFLASH + IMAGE_SIZE := 7424k + DEVICE_PACKAGES := kmod-dm9000 kmod-i2c-lantiq kmod-eeprom-at24 +endef +TARGET_DEVICES += lantiq_easy98000-sflash + +define Device/lantiq_falcon-mdu + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon / VINAXdp MDU Board + IMAGE_SIZE := 7424k +endef +TARGET_DEVICES += lantiq_falcon-mdu + +define Device/lantiq_falcon-sfp + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := Falcon SFP Stick + IMAGE_SIZE := 7424k +endef +TARGET_DEVICES += lantiq_falcon-sfp diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk index bec9eafbd1..acbc32b46a 100644 --- a/target/linux/lantiq/image/tp-link.mk +++ b/target/linux/lantiq/image/tp-link.mk @@ -1,6 +1,7 @@ DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLINK_HVERSION define Device/lantiqTpLink + DEVICE_VENDOR := TP-Link TPLINK_HWREVADD := 0 TPLINK_HVERSION := 2 KERNEL := kernel-bin | append-dtb | lzma @@ -13,12 +14,12 @@ endef define Device/tplink_tdw8970 $(Device/lantiqTpLink) - DEVICE_DTS := TDW8970 + DEVICE_MODEL := TD-W8970 + DEVICE_VARIANT := v1 TPLINK_FLASHLAYOUT := 8Mltq TPLINK_HWID := 0x89700001 TPLINK_HWREV := 1 IMAGE_SIZE := 7680k - DEVICE_TITLE := TP-LINK TD-W8970 DEVICE_PACKAGES:= kmod-ath9k wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += TDW8970 endef @@ -26,12 +27,12 @@ TARGET_DEVICES += tplink_tdw8970 define Device/tplink_tdw8980 $(Device/lantiqTpLink) - DEVICE_DTS := TDW8980 + DEVICE_MODEL := TD-W8980 + DEVICE_VARIANT := v1 TPLINK_FLASHLAYOUT := 8Mltq TPLINK_HWID := 0x89800001 TPLINK_HWREV := 14 IMAGE_SIZE := 7680k - DEVICE_TITLE := TP-LINK TD-W8980 DEVICE_PACKAGES:= kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += TDW8980 endef @@ -39,26 +40,26 @@ TARGET_DEVICES += tplink_tdw8980 define Device/tplink_vr200 $(Device/lantiqTpLink) - DEVICE_DTS := VR200 + DEVICE_MODEL := Archer VR200 + DEVICE_VARIANT := v1 TPLINK_FLASHLAYOUT := 16Mltq TPLINK_HWID := 0x63e64801 TPLINK_HWREV := 0x53 IMAGE_SIZE := 15808k - DEVICE_TITLE := TP-LINK Archer VR200 - DEVICE_PACKAGES:= kmod-usb-dwc2 kmod-usb-ledtrig-usbport + DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += VR200 endef TARGET_DEVICES += tplink_vr200 define Device/tplink_vr200v $(Device/lantiqTpLink) - DEVICE_DTS := VR200v + DEVICE_MODEL := Archer VR200v + DEVICE_VARIANT := v1 TPLINK_FLASHLAYOUT := 16Mltq TPLINK_HWID := 0x73b70801 TPLINK_HWREV := 0x2f IMAGE_SIZE := 15808k - DEVICE_TITLE := TP-LINK Archer VR200v - DEVICE_PACKAGES:= kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc + DEVICE_PACKAGES:= kmod-mt76x0e wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-ltq-tapi kmod-ltq-vmmc SUPPORTED_DEVICES += VR200v endef TARGET_DEVICES += tplink_vr200v diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk new file mode 100644 index 0000000000..167c57c7c4 --- /dev/null +++ b/target/linux/lantiq/image/vr9.mk @@ -0,0 +1,227 @@ +DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID + +define Device/alphanetworks_asl56026 + DEVICE_VENDOR := Alpha + DEVICE_MODEL := ASL56026 + DEVICE_ALT0_VENDOR := BT Openreach + DEVICE_ALT0_MODEL := ECI VDSL Modem V-2FUb/I + IMAGE_SIZE := 7488k +endef +TARGET_DEVICES += alphanetworks_asl56026 + +define Device/arcadyan_arv7519rw22 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV7519RW22 + DEVICE_ALT0_VENDOR := Orange + DEVICE_ALT0_MODEL := Livebox + DEVICE_ALT0_VARIANT := 2.1 + DEVICE_ALT1_VENDOR := Astoria Networks + DEVICE_ALT1_MODEL := ARV7519RW22 + IMAGE_SIZE := 31232k + DEVICE_PACKAGES := kmod-usb-dwc2 + SUPPORTED_DEVICES += ARV7519RW22 +endef +TARGET_DEVICES += arcadyan_arv7519rw22 + +define Device/arcadyan_vg3503j + DEVICE_VENDOR := BT Openreach + DEVICE_MODEL := ECI VDSL Modem V-2FUb/R + IMAGE_SIZE := 8000k + SUPPORTED_DEVICES += VG3503J +endef +TARGET_DEVICES += arcadyan_vg3503j + +define Device/arcadyan_vgv7510kw22-brn + $(Device/lantiqBrnImage) + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := VGV7510KW22 + DEVICE_VARIANT := BRN + DEVICE_ALT0_VENDOR := o2 + DEVICE_ALT0_MODEL := Box 6431 + DEVICE_ALT0_VARIANT := BRN + IMAGE_SIZE := 7168k + SIGNATURE := BRNDA6431 + MAGIC := 0x12345678 + CRC32_POLY := 0x04c11db7 + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + SUPPORTED_DEVICES += VGV7510KW22BRN +endef +TARGET_DEVICES += arcadyan_vgv7510kw22-brn + +define Device/arcadyan_vgv7510kw22-nor + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := VGV7510KW22 + DEVICE_VARIANT := NOR + DEVICE_ALT0_VENDOR := o2 + DEVICE_ALT0_MODEL := Box 6431 + DEVICE_ALT0_VARIANT := NOR + IMAGE_SIZE := 15232k + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + SUPPORTED_DEVICES += VGV7510KW22NOR +endef +TARGET_DEVICES += arcadyan_vgv7510kw22-nor + +define Device/arcadyan_vgv7519-brn + $(Device/lantiqBrnImage) + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := VGV7519 + DEVICE_VARIANT := BRN + DEVICE_ALT0_VENDOR := KPN + DEVICE_ALT0_MODEL := Experiabox 8 + DEVICE_ALT0_VARIANT := BRN + IMAGE_SIZE := 7168k + SIGNATURE := 5D00008000 + MAGIC := 0x12345678 + CRC32_POLY := 0x2083b8ed + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + SUPPORTED_DEVICES += VGV7519BRN +endef +TARGET_DEVICES += arcadyan_vgv7519-brn + +define Device/arcadyan_vgv7519-nor + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := VGV7519 + DEVICE_VARIANT := NOR + DEVICE_ALT0_VENDOR := KPN + DEVICE_ALT0_MODEL := Experiabox 8 + DEVICE_ALT0_VARIANT := NOR + IMAGE_SIZE := 15360k + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-ltq-tapi kmod-ltq-vmmc + SUPPORTED_DEVICES += VGV7519NOR +endef +TARGET_DEVICES += arcadyan_vgv7519-nor + +define Device/avm_fritz3370 + $(Device/AVM) + $(Device/NAND) + DEVICE_MODEL := FRITZ!Box 3370 + DEVICE_VARIANT := Rev. 2 + KERNEL_SIZE := 4096k + UBINIZE_OPTS := -E 5 + IMAGES += eva-kernel.bin eva-filesystem.bin + IMAGE/eva-kernel.bin := append-kernel + IMAGE/eva-filesystem.bin := append-ubi + DEVICE_PACKAGES := kmod-ath9k wpad-basic kmod-usb-dwc2 fritz-tffs +endef + +define Device/avm_fritz3370-rev2-hynix + $(Device/avm_fritz3370) + DEVICE_MODEL := FRITZ!Box 3370 + DEVICE_VARIANT := Rev. 2 (Hynix NAND) +endef +TARGET_DEVICES += avm_fritz3370-rev2-hynix + +define Device/avm_fritz3370-rev2-micron + $(Device/avm_fritz3370) + DEVICE_MODEL := FRITZ!Box 3370 + DEVICE_VARIANT := Rev. 2 (Micron NAND) +endef +TARGET_DEVICES += avm_fritz3370-rev2-micron + +define Device/avm_fritz7360sl + $(Device/AVM) + DEVICE_MODEL := FRITZ!Box 7360 SL + IMAGE_SIZE := 15744k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 + SUPPORTED_DEVICES += FRITZ7360SL +endef +TARGET_DEVICES += avm_fritz7360sl + +define Device/avm_fritz7362sl + $(Device/AVM) + $(Device/NAND) + DEVICE_MODEL := FRITZ!Box 7362 SL + KERNEL_SIZE := 4096k + IMAGE_SIZE := 49152k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 fritz-tffs +endef +TARGET_DEVICES += avm_fritz7362sl + +define Device/avm_fritz7412 + $(Device/AVM) + $(Device/NAND) + DEVICE_MODEL := FRITZ!Box 7412 + BOARD_NAME := FRITZ7412 + KERNEL_SIZE := 4096k + IMAGE_SIZE := 49152k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic fritz-tffs-nand fritz-caldata +endef +TARGET_DEVICES += avm_fritz7412 + +define Device/bt_homehub-v5a + $(Device/NAND) + DEVICE_VENDOR := British Telecom + DEVICE_MODEL := Home Hub 5 + DEVICE_VARIANT := Type A + BOARD_NAME := BTHOMEHUBV5A + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader \ + kmod-ath10k-ct ath10k-firmware-qca988x-ct wpad-basic kmod-usb-dwc2 + SUPPORTED_DEVICES += BTHOMEHUBV5A +endef +TARGET_DEVICES += bt_homehub-v5a + +define Device/buffalo_wbmr-300hpd + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := WBMR-300HPD + IMAGE_SIZE := 15616k + DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-usb-dwc2 + SUPPORTED_DEVICES += WBMR300 +endef +TARGET_DEVICES += buffalo_wbmr-300hpd + +define Device/lantiq_easy80920-nand + $(Device/lantiqFullImage) + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := VR9 EASY80920 + DEVICE_VARIANT := NAND + IMAGE_SIZE := 64512k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport +endef +TARGET_DEVICES += lantiq_easy80920-nand + +define Device/lantiq_easy80920-nor + DEVICE_VENDOR := Lantiq + DEVICE_MODEL := VR9 EASY80920 + DEVICE_VARIANT := NOR + IMAGE_SIZE := 7936k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport +endef +TARGET_DEVICES += lantiq_easy80920-nor + +define Device/netgear_dm200 + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := DM200 + IMAGES := sysupgrade.bin factory.img + IMAGE/sysupgrade.bin := append-kernel | \ + pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ + pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ + append-rootfs | pad-rootfs | append-metadata | check-size + IMAGE/factory.img := $$(IMAGE/sysupgrade.bin) | netgear-dni + IMAGE_SIZE := 7872k + NETGEAR_BOARD_ID := DM200 + NETGEAR_HW_ID := 29765233+8+0+64+0+0 +endef +TARGET_DEVICES += netgear_dm200 + +define Device/zyxel_p-2812hnu-f1 + $(Device/NAND) + DEVICE_VENDOR := ZyXEL + DEVICE_MODEL := P-2812HNU + DEVICE_VARIANT := F1 + BOARD_NAME := P2812HNUF1 + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 kmod-usb-ledtrig-usbport + KERNEL_SIZE := 3072k + SUPPORTED_DEVICES += P2812HNUF1 +endef +TARGET_DEVICES += zyxel_p-2812hnu-f1 + +define Device/zyxel_p-2812hnu-f3 + $(Device/NAND) + DEVICE_VENDOR := ZyXEL + DEVICE_MODEL := P-2812HNU + DEVICE_VARIANT := F3 + BOARD_NAME := P2812HNUF3 + DEVICE_PACKAGES := kmod-rt2800-pci wpad-basic kmod-usb-dwc2 + SUPPORTED_DEVICES += P2812HNUF3 +endef +TARGET_DEVICES += zyxel_p-2812hnu-f3 diff --git a/target/linux/lantiq/image/xway_legacy.mk b/target/linux/lantiq/image/xway_legacy.mk new file mode 100644 index 0000000000..52a29ab2f0 --- /dev/null +++ b/target/linux/lantiq/image/xway_legacy.mk @@ -0,0 +1,72 @@ +define Device/arcadyan_arv4518pwr01 + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4518PWR01 + IMAGE_SIZE := 3776k + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath5k wpad-mini + SUPPORTED_DEVICES += ARV4518PWR01 +endef +TARGET_DEVICES += arcadyan_arv4518pwr01 + +define Device/arcadyan_arv4518pwr01a + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4518PWR01A + IMAGE_SIZE := 3776k + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-ath5k wpad-basic + SUPPORTED_DEVICES += ARV4518PWR01A +endef +TARGET_DEVICES += arcadyan_arv4518pwr01a + +define Device/arcadyan_arv4520pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4520PW + DEVICE_ALT0_VENDOR := Vodafone + DEVICE_ALT0_MODEL := Easybox 800 + DEVICE_ALT1_VENDOR := Airties + DEVICE_ALT1_MODEL := WAV-281 + IMAGE_SIZE := 3648k + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa \ + kmod-rt61-pci wpad-mini + SUPPORTED_DEVICES += ARV4520PW +endef +TARGET_DEVICES += arcadyan_arv4520pw + +define Device/arcadyan_arv4525pw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV4525PW + DEVICE_ALT0_VENDOR := Telekom + DEVICE_ALT0_MODEL := Speedport W502V + DEVICE_ALT0_VARIANT := Typ A + IMAGE_SIZE := 3776k + DEVICE_PACKAGES := kmod-ath5k wpad-mini \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa -swconfig + SUPPORTED_DEVICES += ARV4525PW +endef +TARGET_DEVICES += arcadyan_arv4525pw + +define Device/arcadyan_arv452cqw + DEVICE_VENDOR := Arcadyan + DEVICE_MODEL := ARV452CQW + DEVICE_ALT0_VENDOR := Vodafone + DEVICE_ALT0_MODEL := Easybox 801 + IMAGE_SIZE := 3776k + DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport \ + kmod-ath5k wpad-mini \ + kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \ + kmod-ltq-adsl-danube-fw-b kmod-ltq-atm-danube \ + ltq-adsl-app ppp-mod-pppoa + SUPPORTED_DEVICES += ARV452CQW +endef +TARGET_DEVICES += arcadyan_arv452cqw diff --git a/target/linux/lantiq/patches-4.19/0023-NET-PHY-add-led-support-for-intel-xway.patch b/target/linux/lantiq/patches-4.19/0023-NET-PHY-add-led-support-for-intel-xway.patch index 60a6dbafdd..e5ba24c3e7 100644 --- a/target/linux/lantiq/patches-4.19/0023-NET-PHY-add-led-support-for-intel-xway.patch +++ b/target/linux/lantiq/patches-4.19/0023-NET-PHY-add-led-support-for-intel-xway.patch @@ -42,10 +42,10 @@ Signed-off-by: John Crispin + phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED1L, tmp); + + if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led2h", &tmp)) -+ phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED3H, tmp); ++ phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED2H, tmp); + + if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led2l", &tmp)) -+ phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED3L, tmp); ++ phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED2L, tmp); + + if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led3h", &tmp)) + phy_write_mmd(phydev, MDIO_MMD_VEND2, XWAY_MMD_LED3H, tmp); diff --git a/target/linux/lantiq/patches-4.19/0025-NET-MIPS-lantiq-adds-xrx200-net.patch b/target/linux/lantiq/patches-4.19/0025-NET-MIPS-lantiq-adds-xrx200-net.patch index b2de5ac510..4e5b55eb3e 100644 --- a/target/linux/lantiq/patches-4.19/0025-NET-MIPS-lantiq-adds-xrx200-net.patch +++ b/target/linux/lantiq/patches-4.19/0025-NET-MIPS-lantiq-adds-xrx200-net.patch @@ -209,7 +209,7 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net +}; --- /dev/null +++ b/drivers/net/ethernet/lantiq_xrx200.c -@@ -0,0 +1,1889 @@ +@@ -0,0 +1,1924 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published @@ -433,6 +433,7 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net +struct xrx200_hw { + struct clk *clk; + struct mii_bus *mii_bus; ++ u8 phy_addr[XRX200_MAX_PORT]; + + struct xrx200_chan chan[XRX200_MAX_DMA]; + u16 vlan_vid[XRX200_MAX_VLAN]; @@ -947,6 +948,34 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net + return 0; +} + ++static int xrx200sw_set_port_link(struct switch_dev *dev, int port, ++ struct switch_port_link *link) ++{ ++ if (port >= XRX200_MAX_PORT) ++ return -EINVAL; ++ ++ return switch_generic_set_link(dev, port, link); ++} ++ ++static int xrx200_mdio_wr(struct mii_bus *bus, int addr, int reg, u16 val); ++static int xrx200_mdio_rd(struct mii_bus *bus, int addr, int reg); ++ ++static int xrx200sw_phy_read16(struct switch_dev *dev, int addr, u8 reg, u16 *value) ++{ ++ struct xrx200_hw *hw = container_of(dev, struct xrx200_hw, swdev); ++ ++ *value = xrx200_mdio_rd(hw->mii_bus, hw->phy_addr[addr], reg); ++ ++ return 0; ++} ++ ++static int xrx200sw_phy_write16(struct switch_dev *dev, int addr, u8 reg, u16 value) ++{ ++ struct xrx200_hw *hw = container_of(dev, struct xrx200_hw, swdev); ++ ++ return xrx200_mdio_wr(hw->mii_bus, hw->phy_addr[addr], reg, value); ++} ++ +static int xrx200_set_port_attr(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) +{ + if (val->port_vlan >= XRX200_MAX_PORT) @@ -1043,7 +1072,10 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net + .get_port_pvid = xrx200sw_get_port_pvid, + .reset_switch = xrx200sw_reset_switch, + .get_port_link = xrx200sw_get_port_link, ++ .set_port_link = xrx200sw_set_port_link, +// .get_port_stats = xrx200sw_get_port_stats, //TODO ++ .phy_read16 = xrx200sw_phy_read16, ++ .phy_write16 = xrx200sw_phy_write16, +}; + +static int xrx200sw_init(struct xrx200_hw *hw) @@ -1897,6 +1929,9 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net + + /* store the port id in the hw struct so we can map ports -> devices */ + priv->hw->port_map[p->num] = priv->hw->num_devs; ++ ++ /* store the phy addr in the hw struct so we can map ports -> phys */ ++ priv->hw->phy_addr[p->num] = p->phy_addr; +} + +static const struct net_device_ops xrx200_netdev_ops = { diff --git a/target/linux/lantiq/base-files/etc/board.d/01_leds b/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds similarity index 80% rename from target/linux/lantiq/base-files/etc/board.d/01_leds rename to target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds index 4476a7eb43..b4d26d37ff 100755 --- a/target/linux/lantiq/base-files/etc/board.d/01_leds +++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds @@ -1,7 +1,6 @@ #!/bin/sh # # Copyright (C) 2011-2015 OpenWrt.org -# based on ar71xx # . /lib/functions/leds.sh @@ -32,38 +31,9 @@ led_dsl="$(get_dt_led dsl)" board=$(board_name) case "$board" in -allnet,all0333cj) - ucidef_set_led_netdev "lan" "lan" "all0333cj:green:lan" "eth0.1" - ;; -arcadyan,arv4525pw) - ucidef_set_led_netdev "wifi" "wifi" "arv4525pw:green:wlan" "wlan0" - ;; -arcadyan,arv7506pw11) - ucidef_set_led_wlan "wifi" "wifi" "arv7506pw11:green:wlan" "phy0radio" - ;; arcadyan,arv7519rw22) ucidef_set_led_netdev "lan" "lan" "arv7519rw22:green:lan" "eth0.1" ;; -arcadyan,arv752dpw22) - ucidef_set_led_wlan "wifi" "wifi" "arv752dpw22:red:wifi" "phy0radio" - ;; -bt,homehub-v5a) - ucidef_set_led_default "dimmed" "dimmed" "dimmed" "0" - ;; -netgear,dm200) - ucidef_set_led_netdev "lan" "lan" "dm200:green:lan" "eth0" - ;; -avm,fritz3370-rev2-hynix|\ -avm,fritz3370-rev2-micron) - ucidef_set_led_switch "lan" "LAN" "fritz3370:green:lan" "switch0" "0x17" - ;; -avm,fritz7320) - ucidef_set_led_netdev "wifi" "wifi" "fritz7320:green:wlan" "wlan0" - ;; -zyxel,p-2812hnu-f1|\ -zyxel,p-2812hnu-f3) - ucidef_set_led_wlan "wifi" "wifi" "p2812hnufx:green:wlan" "phy0radio" - ;; arcadyan,vgv7510kw22-nor|\ arcadyan,vgv7510kw22-brn) ucidef_set_led_wlan "wifi" "wifi" "vgv7510kw22:green:wlan" "phy0radio" @@ -72,6 +42,13 @@ arcadyan,vgv7519-nor|\ arcadyan,vgv7519-brn) ucidef_set_led_wlan "wifi" "wifi" "vgv7519:green:wireless" "phy0radio" ;; +avm,fritz3370-rev2-hynix|\ +avm,fritz3370-rev2-micron) + ucidef_set_led_switch "lan" "LAN" "fritz3370:green:lan" "switch0" "0x17" + ;; +bt,homehub-v5a) + ucidef_set_led_default "dimmed" "dimmed" "dimmed" "0" + ;; buffalo,wbmr-300hpd) ucidef_set_led_switch "lan1" "LAN1" "wbmr300:green:lan1" "switch0" "0x08" ucidef_set_led_switch "lan2" "LAN2" "wbmr300:green:lan2" "switch0" "0x04" @@ -79,7 +56,12 @@ buffalo,wbmr-300hpd) ucidef_set_led_switch "lan3" "LAN3" "wbmr300:green:lan3" "switch0" "0x20" ucidef_set_led_default "router" "router" "wbmr300:green:router" "1" ;; -*) +netgear,dm200) + ucidef_set_led_netdev "lan" "lan" "dm200:green:lan" "eth0" + ;; +zyxel,p-2812hnu-f1|\ +zyxel,p-2812hnu-f3) + ucidef_set_led_wlan "wifi" "wifi" "p2812hnufx:green:wlan" "phy0radio" ;; esac diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..f39898263d --- /dev/null +++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network @@ -0,0 +1,175 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh +. /lib/functions/system.sh +. /lib/functions/lantiq.sh + +lantiq_setup_interfaces() +{ + local board="$1" + + case "$board" in + alphanetworks,asl56026) + ucidef_add_switch "switch0" \ + "2:lan" "3:lan" "6t@eth0" + ;; + arcadyan,arv7519rw22) + ucidef_add_switch "switch0" \ + "0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0" + ;; + arcadyan,vg3503j) + ucidef_add_switch "switch0" \ + "2:lan:2" "4:lan:1" "6t@eth0" + ;; + arcadyan,vgv7510kw22-brn|\ + arcadyan,vgv7510kw22-nor) + ucidef_add_switch "switch0" \ + "2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "0:wan:5" "6t@eth0" + ;; + arcadyan,vgv7519-brn|\ + arcadyan,vgv7519-nor|\ + lantiq,easy80920-nand|\ + lantiq,easy80920-nor) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" + ;; + avm,fritz3370-rev2-hynix|\ + avm,fritz3370-rev2-micron|\ + avm,fritz7360sl|\ + avm,fritz7362sl) + ucidef_add_switch "switch0" \ + "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" + ;; + bt,homehub-v5a) + ucidef_add_switch "switch0" \ + "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0" + ;; + buffalo,wbmr-300hpd) + ucidef_add_switch "switch0" \ + "5:lan:2" "2:lan:3" "3:lan:4" "4:wan:1" "6t@eth0" + ;; + tplink,tdw8970|\ + tplink,tdw8980) + ucidef_add_switch "switch0" \ + "0:lan:2" "2:lan:3" "4:lan:4" "5:lan:1" "6t@eth0" + ;; + tplink,vr200|\ + tplink,vr200v) + ucidef_add_switch "switch0" \ + "0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0" + ;; + zyxel,p-2812hnu-f1|\ + zyxel,p-2812hnu-f3) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "4:lan" "5:wan" "6t@eth0" + ;; + *) + ucidef_set_interface_lan 'eth0' + ;; + esac +} + +lantiq_setup_dsl() +{ + local board="$1" + local annex="a" + + case "$board" in + arcadyan,vgv7510kw22-brn|\ + arcadyan,vgv7510kw22-nor|\ + avm,fritz3370-rev2-hynix|\ + avm,fritz3370-rev2-micron|\ + avm,fritz7360sl|\ + avm,fritz7362sl|\ + avm,fritz7412) + annex="b" + ;; + esac + + lantiq_setup_dsl_helper "$annex" +} + +lantiq_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + + case "$board" in + alphanetworks,asl56026) + lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) + wan_mac=$(mtd_get_mac_ascii uboot_env wanmac) + ;; + arcadyan,arv7519rw22) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0x16)" 1) + ;; + arcadyan,vg3503j|\ + lantiq,easy80920-nand|\ + lantiq,easy80920-nor|\ + zyxel,p-2812hnu-f1|\ + zyxel,p-2812hnu-f3) + lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ;; + arcadyan,vgv7510kw22-brn|\ + arcadyan,vgv7510kw22-nor) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 2) + ;; + arcadyan,vgv7519-brn|\ + arcadyan,vgv7519-nor) + wan_mac=$(mtd_get_mac_binary board_config 0x16) + ;; + avm,fritz3370-rev2-hynix|\ + avm,fritz3370-rev2-micron) + lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) + wan_mac=$(macaddr_add "$lan_mac" 3) + ;; + avm,fritz7360sl) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 0xa91)" 1) + ;; + avm,fritz7362sl) + lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) + wan_mac=$(fritz_tffs -n macdsl -i $(find_mtd_part "tffs (1)")) + ;; + avm,fritz7412) + tffsdev=$(find_mtd_chardev "nand-tffs") + lan_mac=$(/usr/bin/fritz_tffs_nand -d $tffsdev -n maca -o) + wan_mac=$(/usr/bin/fritz_tffs_nand -d $tffsdev -n macdsl -o) + ;; + bt,homehub-v5a) + lan_mac=$(mtd_get_mac_binary_ubi caldata 0x110c) + wan_mac=$(macaddr_add "$lan_mac" 1) + ;; + buffalo,wbmr-300hpd) + lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr) + wan_mac="$lan_mac" + ;; + netgear,dm200) + lan_mac=$(mtd_get_mac_binary ART 0x0) + wan_mac=$(macaddr_add "$lan_mac" 1) + ;; + tplink,tdw8970|\ + tplink,tdw8980) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 0xf100)" 1) + ;; + tplink,vr200|\ + tplink,vr200v) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 0xf100)" 1) + ;; + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" +} + +board_config_update +board=$(board_name) +lantiq_setup_interfaces $board +lantiq_setup_dsl $board +lantiq_setup_macs $board +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/11-ath10k-caldata similarity index 100% rename from target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata rename to target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/11-ath10k-caldata diff --git a/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom b/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom new file mode 100644 index 0000000000..cb91237400 --- /dev/null +++ b/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom @@ -0,0 +1,161 @@ +#!/bin/sh +# Based on ar71xx 10-ath9k-eeprom + +[ -e /lib/firmware/$FIRMWARE ] && exit 0 + +. /lib/functions.sh +. /lib/functions/system.sh +. /lib/upgrade/nand.sh + +# xor multiple hex values of the same length +xor() { + local val + local ret="0x$1" + local retlen=${#1} + + shift + while [ -n "$1" ]; do + val="0x$1" + ret=$((ret ^ val)) + shift + done + + printf "%0${retlen}x" "$ret" +} + +ath9k_eeprom_die() { + echo "ath9k eeprom: $*" + exit 1 +} + +ath9k_eeprom_extract_raw() { + local source=$1 + local offset=$2 + local swap=$3 + local size=4096 + local bs=1 + local conv= + + if [ $swap -gt 0 ]; then + bs=2 + conv="conv=swab" + size=$((size / bs)) + offset=$((offset / bs)) + fi + + dd if=$source of=/lib/firmware/$FIRMWARE bs=$bs skip=$offset count=$size $conv 2>/dev/null || \ + ath9k_eeprom_die "failed to extract from $mtd" +} + +ath9k_eeprom_extract_reverse() { + local part=$1 + local offset=$2 + local count=$3 + local mtd + local reversed + local caldata + + mtd=$(find_mtd_chardev "$part") + reversed=$(hexdump -v -s $offset -n $count -e '/1 "%02x "' $mtd) + + for byte in $reversed; do + caldata="\x${byte}${caldata}" + done + + printf "%b" "$caldata" > /lib/firmware/$FIRMWARE +} + +ath9k_eeprom_extract() { + local part=$1 + local offset=$2 + local swap=$3 + local mtd + + mtd=$(find_mtd_chardev $part) + [ -n "$mtd" ] || \ + ath9k_eeprom_die "no mtd device found for partition $part" + + ath9k_eeprom_extract_raw $mtd $offset $swap +} + +ath9k_ubi_eeprom_extract() { + local part=$1 + local offset=$2 + local swap=$3 + local ubidev=$(nand_find_ubi $CI_UBIPART) + local ubi + + ubi=$(nand_find_volume $ubidev $part) + [ -n "$ubi" ] || \ + ath9k_eeprom_die "no UBI volume found for $part" + + ath9k_eeprom_extract_raw /dev/$ubi $offset $swap +} + +ath9k_patch_fw_mac_crc() { + local mac=$1 + local mac_offset=$2 + local chksum_offset=$((mac_offset - 10)) + + ath9k_patch_fw_mac "${mac}" "${mac_offset}" "${chksum_offset}" +} + +ath9k_patch_fw_mac() { + local mac=$1 + local mac_offset=$2 + local chksum_offset=$3 + local xor_mac + local xor_fw_mac + local xor_fw_chksum + + [ -z "$mac" -o -z "$mac_offset" ] && return + + [ -n "$chksum_offset" ] && { + xor_mac=${mac//:/} + xor_mac="${xor_mac:0:4} ${xor_mac:4:4} ${xor_mac:8:4}" + + xor_fw_mac=$(hexdump -v -n 6 -s $mac_offset -e '/1 "%02x"' /lib/firmware/$FIRMWARE) + xor_fw_mac="${xor_fw_mac:0:4} ${xor_fw_mac:4:4} ${xor_fw_mac:8:4}" + + xor_fw_chksum=$(hexdump -v -n 2 -s $chksum_offset -e '/1 "%02x"' /lib/firmware/$FIRMWARE) + xor_fw_chksum=$(xor $xor_fw_chksum $xor_fw_mac $xor_mac) + + printf "%b" "\x${xor_fw_chksum:0:2}\x${xor_fw_chksum:2:2}" | \ + dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=$chksum_offset count=2 + } + + macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=$mac_offset count=6 +} + +case "$FIRMWARE" in + "ath9k-eeprom-pci-0000:00:0e.0.bin" | \ + "ath9k-eeprom-pci-0000:01:00.0.bin" | \ + "ath9k-eeprom-pci-0000:02:00.0.bin") + board=$(board_name) + + case "$board" in + avm,fritz3370-rev2-hynix|\ + avm,fritz3370-rev2-micron|\ + avm,fritz7362sl) + ath9k_eeprom_extract_reverse "urlader" 5441 1088 + ;; + avm,fritz7360sl) + ath9k_eeprom_extract "urlader" 2437 0 + ;; + avm,fritz7412) + /usr/bin/fritz_cal_extract -i 1 -s 0x1e000 -e 0x207 -l 4096 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader") + ;; + bt,homehub-v5a) + ath9k_ubi_eeprom_extract "caldata" 4096 0 + ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_binary_ubi caldata 4364) +2) 268 + ;; + tplink,tdw8970|\ + tplink,tdw8980) + ath9k_eeprom_extract "boardconfig" 135168 0 + ;; + *) + ath9k_eeprom_die "board $board is not supported yet" + ;; + esac + ;; +esac diff --git a/target/linux/lantiq/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/xrx200/base-files/lib/upgrade/platform.sh similarity index 91% rename from target/linux/lantiq/base-files/lib/upgrade/platform.sh rename to target/linux/lantiq/xrx200/base-files/lib/upgrade/platform.sh index c47ff78fb2..dcd797c30d 100755 --- a/target/linux/lantiq/base-files/lib/upgrade/platform.sh +++ b/target/linux/lantiq/xrx200/base-files/lib/upgrade/platform.sh @@ -13,8 +13,6 @@ platform_do_upgrade() { avm,fritz3370-rev2-micron|\ avm,fritz7362sl|\ avm,fritz7412|\ - bt,homehub-v2b|\ - bt,homehub-v3a|\ bt,homehub-v5a|\ zyxel,p-2812hnu-f1|\ zyxel,p-2812hnu-f3) diff --git a/target/linux/lantiq/xway/base-files/etc/board.d/01_leds b/target/linux/lantiq/xway/base-files/etc/board.d/01_leds new file mode 100755 index 0000000000..82a39f4648 --- /dev/null +++ b/target/linux/lantiq/xway/base-files/etc/board.d/01_leds @@ -0,0 +1,44 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/leds.sh +. /lib/functions/uci-defaults.sh + +board_config_update + +led_wifi="$(get_dt_led wifi)" +[ -n "$led_wifi" ] && ucidef_set_led_wlan "wifi" "wifi" "$led_wifi" "phy0tpt" + +led_usb="$(get_dt_led usb)" +[ -n "$led_usb" ] && ucidef_set_led_usbdev "usb" "usb" "$led_usb" "1-1" + +led_usb2="$(get_dt_led usb2)" +[ -n "$led_usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "$led_usb2" "2-1" + +led_dsl="$(get_dt_led dsl)" +[ -n "$led_dsl" ] && { + led_internet="$(get_dt_led internet)" + if [ -n "$led_internet" ]; then + ucidef_set_led_default "dsl" "dsl" "$led_dsl" "0" + ucidef_set_led_netdev "internet" "internet" "$led_internet" "pppoe-wan" + else + ucidef_set_led_netdev "dsl" "dsl" "$led_dsl" "dsl0" + fi +} + +board=$(board_name) + +case "$board" in +arcadyan,arv7506pw11) + ucidef_set_led_wlan "wifi" "wifi" "arv7506pw11:green:wlan" "phy0radio" + ;; +arcadyan,arv752dpw22) + ucidef_set_led_wlan "wifi" "wifi" "arv752dpw22:red:wifi" "phy0radio" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/xway/base-files/etc/board.d/02_network b/target/linux/lantiq/xway/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..89368d8bfb --- /dev/null +++ b/target/linux/lantiq/xway/base-files/etc/board.d/02_network @@ -0,0 +1,118 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh +. /lib/functions/system.sh +. /lib/functions/lantiq.sh + +lantiq_setup_interfaces() +{ + local board="$1" + + case "$board" in + arcadyan,arv4510pw) + ucidef_add_switch "switch0" \ + "0:lan:4" "2:lan:2" "1:lan:3" "3:lan:1" "5t@eth0" + ;; + arcadyan,arv4519pw|\ + arcadyan,arv7510pw22|\ + arcadyan,arv7518pw|\ + arcadyan,arv752dpw22|\ + arcadyan,arv8539pw22|\ + buffalo,wbmr-hp-g300h) + ucidef_add_switch "switch0" \ + "0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan" + ;; + arcadyan,arv7506pw11|\ + audiocodes,mp-252|\ + siemens,gigaset-sx76x) + ucidef_add_switch "switch0" \ + "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0" + ;; + arcadyan,arv7519pw|\ + zte,h201l) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0" + ;; + bt,homehub-v2b) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "5t@eth0" + ;; + netgear,dgn3500|\ + netgear,dgn3500b) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" + ;; + zyxel,p-2601hn) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "5t@eth0" + ;; + *) + ucidef_set_interface_lan 'eth0' + ;; + esac +} + +lantiq_setup_dsl() +{ + local board="$1" + local annex="a" + + case "$board" in + arcadyan,arv7506pw11|\ + arcadyan,arv7525pw|\ + arcadyan,arv752dpw|\ + arcadyan,arv752dpw22|\ + arcadyan,arv8539pw22|\ + avm,fritz7312|\ + avm,fritz7320|\ + siemens,gigaset-sx76x|\ + zte,h201l) + annex="b" + ;; + esac + + lantiq_setup_dsl_helper "$annex" +} + +lantiq_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + + case "$board" in + arcadyan,arv4510pw|\ + bt,homehub-v2b|\ + bt,homehub-v3a|\ + netgear,dgn3500|\ + netgear,dgn3500b) + lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ;; + arcadyan,arv7506pw11) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 2) + ;; + arcadyan,arv7519pw) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 0x16)" 1) + ;; + avm,fritz7312|\ + avm,fritz7320) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 0xa91)" 1) + ;; + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" +} + +board_config_update +board=$(board_name) +lantiq_setup_interfaces $board +lantiq_setup_dsl $board +lantiq_setup_macs $board +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom b/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom similarity index 86% rename from target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom rename to target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom index 6ae5e3cfe9..a5ffa918f5 100644 --- a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom +++ b/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom @@ -148,28 +148,13 @@ case "$FIRMWARE" in ath9k_eeprom_extract "art-copy" 0 1 ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_ascii uboot_env ethaddr) +2) 268 ;; - bt,homehub-v5a) - ath9k_ubi_eeprom_extract "caldata" 4096 0 - ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_binary_ubi caldata 4364) +2) 268 - ;; netgear,dgn3500|netgear,dgn3500b) ath9k_eeprom_extract "calibration" 61440 0 ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_ascii uboot-env ethaddr) +2) 524 ;; - avm,fritz3370-rev2-hynix|\ - avm,fritz3370-rev2-micron|\ - avm,fritz7362sl) - ath9k_eeprom_extract_reverse "urlader" 5441 1088 - ;; - avm,fritz7312|avm,fritz7320|avm,fritz7360sl) + avm,fritz7312|avm,fritz7320) ath9k_eeprom_extract "urlader" 2437 0 ;; - avm,fritz7412) - /usr/bin/fritz_cal_extract -i 1 -s 0x1e000 -e 0x207 -l 4096 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader") - ;; - tplink,tdw8970|tplink,tdw8980) - ath9k_eeprom_extract "boardconfig" 135168 0 - ;; *) ath9k_eeprom_die "board $board is not supported yet" ;; diff --git a/target/linux/lantiq/xway/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/xway/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..5ef0a0ddb9 --- /dev/null +++ b/target/linux/lantiq/xway/base-files/lib/upgrade/platform.sh @@ -0,0 +1,20 @@ +PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 + +platform_check_image() { + return 0 +} + +platform_do_upgrade() { + local board=$(board_name) + + case "$board" in + bt,homehub-v2b|\ + bt,homehub-v3a) + nand_do_upgrade $1 + ;; + *) + default_do_upgrade "$1" + ;; + esac +} diff --git a/target/linux/lantiq/xway/config-4.19 b/target/linux/lantiq/xway/config-4.19 index 64a6c55832..6075cec522 100644 --- a/target/linux/lantiq/xway/config-4.19 +++ b/target/linux/lantiq/xway/config-4.19 @@ -6,7 +6,6 @@ CONFIG_CRC16=y CONFIG_CRYPTO_ACOMP2=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y -CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_INPUT=y CONFIG_INPUT_EVDEV=y CONFIG_INPUT_POLLDEV=y @@ -26,9 +25,6 @@ CONFIG_MTD_UBI_BLOCK=y # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_NLS=y -CONFIG_OF_ADDRESS_PCI=y -CONFIG_OF_PCI=y -CONFIG_OF_PCI_IRQ=y CONFIG_PCI=y # CONFIG_PCIE_LANTIQ is not set CONFIG_PCI_DOMAINS=y diff --git a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds new file mode 100755 index 0000000000..4200dcb0c8 --- /dev/null +++ b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds @@ -0,0 +1,41 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/leds.sh +. /lib/functions/uci-defaults.sh + +board_config_update + +led_wifi="$(get_dt_led wifi)" +[ -n "$led_wifi" ] && ucidef_set_led_wlan "wifi" "wifi" "$led_wifi" "phy0tpt" + +led_usb="$(get_dt_led usb)" +[ -n "$led_usb" ] && ucidef_set_led_usbdev "usb" "usb" "$led_usb" "1-1" + +led_usb2="$(get_dt_led usb2)" +[ -n "$led_usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "$led_usb2" "2-1" + +led_dsl="$(get_dt_led dsl)" +[ -n "$led_dsl" ] && { + led_internet="$(get_dt_led internet)" + if [ -n "$led_internet" ]; then + ucidef_set_led_default "dsl" "dsl" "$led_dsl" "0" + ucidef_set_led_netdev "internet" "internet" "$led_internet" "pppoe-wan" + else + ucidef_set_led_netdev "dsl" "dsl" "$led_dsl" "dsl0" + fi +} + +board=$(board_name) + +case "$board" in +arcadyan,arv4525pw) + ucidef_set_led_netdev "wifi" "wifi" "arv4525pw:green:wlan" "wlan0" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..c29beb832d --- /dev/null +++ b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network @@ -0,0 +1,61 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh +. /lib/functions/system.sh +. /lib/functions/lantiq.sh + +lantiq_setup_interfaces() +{ + local board="$1" + + case "$board" in + arcadyan,arv4520pw) + ucidef_add_switch "switch0" \ + "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0" + ;; + *) + ucidef_set_interface_lan 'eth0' + ;; + esac +} + +lantiq_setup_dsl() +{ + local board="$1" + local annex="a" + + case "$board" in + arcadyan,arv4520pw|\ + arcadyan,arv4525pw|\ + arcadyan,arv452cqw) + annex="b" + ;; + esac + + lantiq_setup_dsl_helper "$annex" +} + +lantiq_setup_macs() +{ + local board="$1" + local lan_mac="" + local wan_mac="" + + case "$board" in + esac + + [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac" + [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac" +} + +board_config_update +board=$(board_name) +lantiq_setup_interfaces $board +lantiq_setup_dsl $board +lantiq_setup_macs $board +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/xway_legacy/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/xway_legacy/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000000..d088601bb0 --- /dev/null +++ b/target/linux/lantiq/xway_legacy/base-files/lib/upgrade/platform.sh @@ -0,0 +1,10 @@ +PART_NAME=firmware +REQUIRE_IMAGE_METADATA=1 + +platform_check_image() { + return 0 +} + +platform_do_upgrade() { + default_do_upgrade "$1" +} diff --git a/target/linux/lantiq/xway_legacy/config-4.19 b/target/linux/lantiq/xway_legacy/config-4.19 index feb82c5fcf..c4042f147f 100644 --- a/target/linux/lantiq/xway_legacy/config-4.19 +++ b/target/linux/lantiq/xway_legacy/config-4.19 @@ -5,7 +5,6 @@ CONFIG_CRC16=y CONFIG_CRYPTO_ACOMP2=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y -CONFIG_FIRMWARE_IN_KERNEL=y # CONFIG_GPIO_SYSFS is not set # CONFIG_HW_RANDOM is not set CONFIG_INPUT=y @@ -18,9 +17,6 @@ CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y # CONFIG_MTD_PHYSMAP_OF is not set CONFIG_NLS=y -CONFIG_OF_ADDRESS_PCI=y -CONFIG_OF_PCI=y -CONFIG_OF_PCI_IRQ=y CONFIG_PCI=y # CONFIG_PCIE_LANTIQ is not set CONFIG_PCI_DOMAINS=y