aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rwxr-xr-xtarget/linux/ipq806x/base-files/etc/board.d/01_leds54
-rwxr-xr-xtarget/linux/ipq806x/base-files/etc/board.d/02_network22
-rw-r--r--target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata36
-rw-r--r--target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac14
-rwxr-xr-xtarget/linux/ipq806x/base-files/etc/init.d/linksys_recovery2
-rw-r--r--target/linux/ipq806x/base-files/lib/ipq806x.sh64
-rw-r--r--target/linux/ipq806x/base-files/lib/preinit/01_preinit_do_ipq806x.sh12
-rw-r--r--target/linux/ipq806x/base-files/lib/upgrade/platform.sh22
-rw-r--r--target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh2
-rw-r--r--target/linux/ipq806x/image/Makefile12
10 files changed, 87 insertions, 153 deletions
diff --git a/target/linux/ipq806x/base-files/etc/board.d/01_leds b/target/linux/ipq806x/base-files/etc/board.d/01_leds
index f9ec88bb34..f0b087f6f6 100755
--- a/target/linux/ipq806x/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq806x/base-files/etc/board.d/01_leds
@@ -11,37 +11,37 @@ board=$(board_name)
boardname="${board##*,}"
case "$board" in
-c2600)
- ucidef_set_led_usbport "usb1" "USB 1" "${board}:white:usb_2" "usb1-port1" "usb2-port1"
- ucidef_set_led_usbport "usb2" "USB 2" "${board}:white:usb_4" "usb3-port1" "usb4-port1"
- ucidef_set_led_switch "wan" "wan" "${board}:white:wan" "switch0" "0x20"
- ucidef_set_led_switch "lan" "lan" "${board}:white:lan" "switch0" "0x1e"
+tplink,c2600)
+ ucidef_set_led_usbport "usb1" "USB 1" "${boardname}:white:usb_2" "usb1-port1" "usb2-port1"
+ ucidef_set_led_usbport "usb2" "USB 2" "${boardname}:white:usb_4" "usb3-port1" "usb4-port1"
+ ucidef_set_led_switch "wan" "wan" "${boardname}:white:wan" "switch0" "0x20"
+ ucidef_set_led_switch "lan" "lan" "${boardname}:white:lan" "switch0" "0x1e"
;;
-d7800 |\
-r7500 |\
-r7500v2 |\
-r7800)
- ucidef_set_led_usbport "usb1" "USB 1" "${board}:white:usb1" "usb1-port1" "usb2-port1"
- ucidef_set_led_usbport "usb2" "USB 2" "${board}:white:usb2" "usb3-port1" "usb4-port1"
- ucidef_set_led_netdev "wan" "WAN" "${board}:white:wan" "eth0"
- ucidef_set_led_ide "esata" "eSATA" "${board}:white:esata"
+netgear,d7800 |\
+netgear,r7500 |\
+netgear,r7500v2 |\
+netgear,r7800)
+ ucidef_set_led_usbport "usb1" "USB 1" "${boardname}:white:usb1" "usb1-port1" "usb2-port1"
+ ucidef_set_led_usbport "usb2" "USB 2" "${boardname}:white:usb2" "usb3-port1" "usb4-port1"
+ ucidef_set_led_netdev "wan" "WAN" "${boardname}:white:wan" "eth0"
+ ucidef_set_led_ide "esata" "eSATA" "${boardname}:white:esata"
;;
-fritz4040)
- ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt" "phy1tpt"
- ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth1"
- ucidef_set_led_switch "lan" "LAN" "${board}:green:lan" "switch0" "0x1e"
+avm,fritzbox-4040)
+ ucidef_set_led_wlan "wlan" "WLAN" "fritz4040:green:wlan" "phy0tpt" "phy1tpt"
+ ucidef_set_led_netdev "wan" "WAN" "fritz4040:green:wan" "eth1"
+ ucidef_set_led_switch "lan" "LAN" "fritz4040:green:lan" "switch0" "0x1e"
;;
-nbg6817)
- ucidef_set_led_wlan "wlan2g" "WLAN2G" "$board:amber:wifi2g" "phy1tpt"
- ucidef_set_led_wlan "wlan5g" "WLAN5G" "$board:amber:wifi5g" "phy0tpt"
- ucidef_set_led_netdev "wan" "WAN" "$board:white:internet" "eth1"
+zyxel,nbg6817)
+ ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:amber:wifi2g" "phy1tpt"
+ ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:amber:wifi5g" "phy0tpt"
+ ucidef_set_led_netdev "wan" "WAN" "${boardname}:white:internet" "eth1"
;;
-vr2600v)
- ucidef_set_led_usbport "usb" "USB" "${board}:white:usb" "usb1-port1" "usb2-port1" "usb3-port1" "usb4-port1"
- ucidef_set_led_switch "lan" "lan" "${board}:white:lan" "switch0" "0x1e"
- ucidef_set_led_wlan "wlan2g" "WLAN2G" "${board}:white:wlan2g" "phy0tpt"
- ucidef_set_led_wlan "wlan5g" "WLAN5G" "${board}:white:wlan5g" "phy1tpt"
- ucidef_set_led_switch "wan" "wan" "${board}:white:wan" "switch0" "0x20"
+tplink,vr2600v)
+ ucidef_set_led_usbport "usb" "USB" "${boardname}:white:usb" "usb1-port1" "usb2-port1" "usb3-port1" "usb4-port1"
+ ucidef_set_led_switch "lan" "lan" "${boardname}:white:lan" "switch0" "0x1e"
+ ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:white:wlan2g" "phy0tpt"
+ ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:white:wlan5g" "phy1tpt"
+ ucidef_set_led_switch "wan" "wan" "${boardname}:white:wan" "switch0" "0x20"
;;
*)
;;
diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
index ad357b7363..8854b9c67d 100755
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -12,25 +12,25 @@ board_config_update
board=$(board_name)
case "$board" in
-ap148 |\
-d7800 |\
-r7500 |\
-r7500v2 |\
-r7800 |\
-vr2600v)
+netgear,d7800 |\
+netgear,r7500 |\
+netgear,r7500v2 |\
+netgear,r7800 |\
+qcom,ipq8064-ap148 |\
+tplink,vr2600v)
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "6@eth1" "5:wan" "0@eth0"
;;
-c2600)
+tplink,c2600)
ucidef_add_switch "switch0" \
"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" "0@eth0"
;;
-db149)
+qcom,ipq8064-db149)
ucidef_set_interface_lan "eth1 eth2 eth3"
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "6u@eth1" "5:wan" "0u@eth0"
;;
-ea8500)
+linksys,ea8500)
hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
ucidef_add_switch "switch0" \
@@ -38,12 +38,12 @@ ea8500)
ucidef_set_interface_macaddr "lan" "$hw_mac_addr"
ucidef_set_interface_macaddr "wan" "$hw_mac_addr"
;;
-fritz4040)
+avm,fritzbox-4040)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
;;
-nbg6817)
+zyxel,nbg6817)
hw_mac_addr=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "6@eth1" "5:wan" "0@eth0"
diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 4c5b55bc53..dc74df87cc 100644
--- a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -47,20 +47,20 @@ board=$(board_name)
case "$FIRMWARE" in
"ath10k/pre-cal-ahb-a000000.wifi.bin")
case "$board" in
- ap-dk01.1-c1)
+ qcom,ap-dk01.1-c1)
ath10kcal_extract "ART" 4096 12064
;;
- fritz4040)
+ avm,fritzbox-4040)
/usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config")
;;
esac
;;
"ath10k/pre-cal-ahb-a800000.wifi.bin")
case "$board" in
- ap-dk01.1-c1)
+ qcom,ap-dk01.1-c1)
ath10kcal_extract "ART" 20480 12064
;;
- fritz4040)
+ avm,fritzbox-4040)
/usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config")
;;
esac
@@ -68,46 +68,46 @@ case "$FIRMWARE" in
"ath10k/pre-cal-pci-0000:01:00.0.bin")
case $board in
- c2600)
+ tplink,c2600)
ath10kcal_extract "radio" 4096 12064
# ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 8) -1)
;;
- d7800 |\
- r7500v2 |\
- r7800)
+ netgear,d7800 |\
+ netgear,r7500v2 |\
+ netgear,r7800)
ath10kcal_extract "art" 4096 12064
;;
- ea8500)
+ linksys,ea8500)
hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
ath10kcal_extract "art" 4096 12064
;;
- nbg6817)
+ zyxel,nbg6817)
ath10kcal_extract "0:ART" 4096 12064
;;
- vr2600v)
+ tplink,vr2600v)
ath10kcal_extract "ART" 4096 12064
;;
esac
;;
"ath10k/pre-cal-pci-0001:01:00.0.bin")
case $board in
- c2600)
+ tplink,c2600)
ath10kcal_extract "radio" 20480 12064
# ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 8) -2)
;;
- d7800 |\
- r7500v2 |\
- r7800)
+ netgear,d7800 |\
+ netgear,r7500v2 |\
+ netgear,r7800)
ath10kcal_extract "art" 20480 12064
;;
- ea8500)
+ linksys,ea8500)
hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
ath10kcal_extract "art" 20480 12064
;;
- nbg6817)
+ zyxel,nbg6817)
ath10kcal_extract "0:ART" 20480 12064
;;
- vr2600v)
+ tplink,vr2600v)
ath10kcal_extract "ART" 20480 12064
;;
esac
diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
index 7884f5117a..207711063c 100644
--- a/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+++ b/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
@@ -12,21 +12,21 @@ PHYNBR=${DEVPATH##*/phy}
board=$(board_name)
case "$board" in
- c2600)
+ tplink,c2600)
echo $(macaddr_add $(mtd_get_mac_binary default-mac 8) $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress
;;
- d7800 |\
- r7500v2 |\
- r7800)
+ netgear,d7800 |\
+ netgear,r7500v2 |\
+ netgear,r7800)
echo $(macaddr_add $(mtd_get_mac_binary art 6) $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress
;;
- ea8500)
+ linksys,ea8500)
echo $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress
;;
- nbg6817)
+ zyxel,nbg6817)
echo $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) $((1 - $PHYNBR)) ) > /sys${DEVPATH}/macaddress
;;
- vr2600v)
+ tplink,vr2600v)
echo $(macaddr_add $(mtd_get_mac_binary default-mac 0) $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress
;;
*)
diff --git a/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery b/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery
index 4d94f1f767..6b4b38ec7b 100755
--- a/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery
+++ b/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery
@@ -6,7 +6,7 @@ boot() {
. /lib/functions.sh
case $(board_name) in
- ea8500)
+ linksys,ea8500)
# make sure auto_recovery in uboot is always on
AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`"
if [ "$AUTO_RECOVERY_ENA" != "yes" ] ; then
diff --git a/target/linux/ipq806x/base-files/lib/ipq806x.sh b/target/linux/ipq806x/base-files/lib/ipq806x.sh
deleted file mode 100644
index c4d2c8f258..0000000000
--- a/target/linux/ipq806x/base-files/lib/ipq806x.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2014 The Linux Foundation. All rights reserved.
-# Copyright (C) 2011 OpenWrt.org
-#
-
-IPQ806X_BOARD_NAME=
-IPQ806X_MODEL=
-
-ipq806x_board_detect() {
- local machine
- local name
-
- machine=$(cat /proc/device-tree/model)
-
- case "$machine" in
- *"AP-DK01.1-C1")
- name="ap-dk01.1-c1"
- ;;
- *"AP148")
- name="ap148"
- ;;
- *"4040")
- name="fritz4040"
- ;;
- *"C2600")
- name="c2600"
- ;;
- *"D7800")
- name="d7800"
- ;;
- *"DB149")
- name="db149"
- ;;
- *"NBG6817")
- name="nbg6817"
- ;;
- *"R7500")
- name="r7500"
- ;;
- *"R7500v2")
- name="r7500v2"
- ;;
- *"Linksys EA8500"*)
- name="ea8500"
- ;;
- *"R7800")
- name="r7800"
- ;;
- *"VR2600v")
- name="vr2600v"
- ;;
- esac
-
- [ -z "$name" ] && name="unknown"
-
- [ -z "$IPQ806X_BOARD_NAME" ] && IPQ806X_BOARD_NAME="$name"
- [ -z "$IPQ806X_MODEL" ] && IPQ806X_MODEL="$machine"
-
- [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
-
- echo "$IPQ806X_BOARD_NAME" > /tmp/sysinfo/board_name
- echo "$IPQ806X_MODEL" > /tmp/sysinfo/model
-}
diff --git a/target/linux/ipq806x/base-files/lib/preinit/01_preinit_do_ipq806x.sh b/target/linux/ipq806x/base-files/lib/preinit/01_preinit_do_ipq806x.sh
deleted file mode 100644
index 785f1ebb8b..0000000000
--- a/target/linux/ipq806x/base-files/lib/preinit/01_preinit_do_ipq806x.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2014 The Linux Foundation. All rights reserved.
-#
-
-do_ipq806x() {
- . /lib/ipq806x.sh
-
- ipq806x_board_detect
-}
-
-boot_hook_add preinit_main do_ipq806x
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
index 7d8b178339..dc88c9ed09 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
@@ -10,24 +10,24 @@ platform_check_image() {
platform_do_upgrade() {
case "$(board_name)" in
- ap148 |\
- ap-dk04.1-c1 |\
- d7800 |\
- nbg6817 |\
- r7500 |\
- r7500v2 |\
- r7800)
+ netgear,d7800 |\
+ netgear,r7500 |\
+ netgear,r7500v2 |\
+ netgear,r7800 |\
+ qcom,ap-dk04.1-c1 |\
+ qcom,ipq8064-ap148 |\
+ zyxel,nbg6817)
nand_do_upgrade "$ARGV"
;;
- c2600)
+ tplink,c2600)
PART_NAME="os-image:rootfs"
MTD_CONFIG_ARGS="-s 0x200000"
default_do_upgrade "$ARGV"
;;
- ea8500)
+ linksys,ea8500)
platform_do_upgrade_linksys "$ARGV"
;;
- vr2600v)
+ tplink,vr2600v)
PART_NAME="kernel:rootfs"
MTD_CONFIG_ARGS="-s 0x200000"
default_do_upgrade "$ARGV"
@@ -40,7 +40,7 @@ platform_do_upgrade() {
platform_nand_pre_upgrade() {
case "$(board_name)" in
- nbg6817)
+ zyxel,nbg6817)
zyxel_do_upgrade "$1"
;;
esac
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh b/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
index 7d0ab97356..466d8c616c 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
@@ -74,7 +74,7 @@ zyxel_do_upgrade() {
[ -b "${rootfs}" ] || return 1
case "$board" in
- nbg6817)
+ zyxel,nbg6817)
case "$rootfs" in
"/dev/mmcblk0p5")
kernel=mmcblk0p4
diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index afd79439d8..f28f4a3b7a 100644
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -29,7 +29,7 @@ define Device/Default
KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs
KERNEL_PREFIX := $$(IMAGE_PREFIX)
KERNEL_LOADADDR = 0x42208000
- SUPPORTED_DEVICES = $$(BOARD_NAME)
+ SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
IMAGE/sysupgrade.tar = sysupgrade-tar | append-metadata
endef
@@ -106,6 +106,7 @@ define Device/qcom_ipq8064-ap148
BLOCKSIZE := 128k
PAGESIZE := 2048
BOARD_NAME := ap148
+ SUPPORTED_DEVICES += ap148
DEVICE_TITLE := Qualcomm AP148
DEVICE_PACKAGES := ath10k-firmware-qca99x0
endef
@@ -118,6 +119,7 @@ define Device/qcom_ipq8064-ap148-legacy
BLOCKSIZE := 128k
PAGESIZE := 2048
BOARD_NAME := ap148
+ SUPPORTED_DEVICES := qcom,ipq8064-ap148 ap148
DEVICE_TITLE := Qualcomm AP148 (legacy)
DEVICE_PACKAGES := ath10k-firmware-qca99x0
endef
@@ -129,6 +131,7 @@ define Device/tplink_c2600
BLOCKSIZE := 128k
PAGESIZE := 2048
BOARD_NAME := c2600
+ SUPPORTED_DEVICES += c2600
TPLINK_BOARD_ID := C2600
DEVICE_TITLE := TP-Link Archer C2600
DEVICE_PACKAGES := ath10k-firmware-qca99x0
@@ -144,6 +147,7 @@ define Device/netgear_d7800
BLOCKSIZE := 128k
PAGESIZE := 2048
BOARD_NAME := d7800
+ SUPPORTED_DEVICES += d7800
DEVICE_TITLE := Netgear Nighthawk X4 D7800
DEVICE_PACKAGES := ath10k-firmware-qca99x0
endef
@@ -169,6 +173,7 @@ define Device/linksys_ea8500
KERNEL = kernel-bin | append-dtb | uImage none | append-uImage-fakeroot-hdr
PROFILES += $$(DEVICE_NAME)
BOARD_NAME := ea8500
+ SUPPORTED_DEVICES += ea8500
UBINIZE_OPTS := -E 5
IMAGES := factory.bin sysupgrade.tar
IMAGE/factory.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-ubi
@@ -201,6 +206,7 @@ define Device/netgear_r7500
BLOCKSIZE := 128k
PAGESIZE := 2048
BOARD_NAME := r7500
+ SUPPORTED_DEVICES += r7500
DEVICE_TITLE := Netgear Nighthawk X4 R7500
DEVICE_PACKAGES := ath10k-firmware-qca988x
endef
@@ -215,6 +221,7 @@ define Device/netgear_r7500v2
BLOCKSIZE := 128k
PAGESIZE := 2048
BOARD_NAME := r7500v2
+ SUPPORTED_DEVICES += r7500v2
DEVICE_TITLE := Netgear Nighthawk X4 R7500v2
DEVICE_PACKAGES := ath10k-firmware-qca99x0 ath10k-firmware-qca988x
endef
@@ -229,6 +236,7 @@ define Device/netgear_r7800
BLOCKSIZE := 128k
PAGESIZE := 2048
BOARD_NAME := r7800
+ SUPPORTED_DEVICES += r7800
DEVICE_TITLE := Netgear Nighthawk X4S R7800
DEVICE_PACKAGES := ath10k-firmware-qca9984
endef
@@ -239,6 +247,7 @@ define Device/zyxel_nbg6817
KERNEL_SIZE := 4096k
BLOCKSIZE := 64k
BOARD_NAME := nbg6817
+ SUPPORTED_DEVICES += nbg6817
DEVICE_TITLE := ZyXEL NBG6817
DEVICE_PACKAGES := ath10k-firmware-qca9984 e2fsprogs kmod-fs-ext4 losetup
$(call Device/ZyXELImage)
@@ -256,6 +265,7 @@ define Device/tplink_vr2600v
BLOCKSIZE := 128k
PAGESIZE := 2048
BOARD_NAME := vr2600v
+ SUPPORTED_DEVICES += vr2600v
DEVICE_TITLE := TP-Link Archer VR2600v
DEVICE_PACKAGES := ath10k-firmware-qca99x0
IMAGES := sysupgrade.bin