domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lantiq: remove lantiq_board_name, use the generic function instead

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 7e798dab56)
This commit is contained in:
Felix Fietkau
2017-03-17 16:21:30 +01:00
committed by Jo-Philipp Wich
parent 0f0d742ae3
commit 8be5b12ea1
7 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package/boot/uboot-envtools/files/lantiq
View File

@@ -7,11 +7,10 @@
touch /etc/config/ubootenv touch /etc/config/ubootenv
. /lib/functions/lantiq.sh
. /lib/uboot-envtools.sh . /lib/uboot-envtools.sh
. /lib/functions.sh . /lib/functions.sh
board=$(lantiq_board_name) board=$(board_name)
case "$board" in case "$board" in
BTHOMEHUBV2B) BTHOMEHUBV2B)

2
target/linux/lantiq/base-files/etc/board.d/01_leds
View File

@@ -32,7 +32,7 @@ led_internet="$(lantiq_get_dt_led internet)"
ucidef_set_led_netdev "internet" "internet" "$led_internet" "$interface" ucidef_set_led_netdev "internet" "internet" "$led_internet" "$interface"
} }
board=$(lantiq_board_name) board=$(board_name)
case "$board" in case "$board" in
ARV4525PW) ARV4525PW)

2
target/linux/lantiq/base-files/etc/board.d/02_network
View File

@@ -18,7 +18,7 @@ lan_mac=""
wan_mac="" wan_mac=""
interface_wan="" interface_wan=""
board=$(lantiq_board_name) board=$(board_name)
case "$board" in case "$board" in
ACMP252|GIGASX76X) ACMP252|GIGASX76X)

3
target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View File

@@ -5,7 +5,6 @@
. /lib/functions.sh . /lib/functions.sh
. /lib/functions/system.sh . /lib/functions/system.sh
. /lib/functions/lantiq.sh
. /lib/upgrade/nand.sh . /lib/upgrade/nand.sh
ath10k_caldata_die() { ath10k_caldata_die() {
@@ -37,7 +36,7 @@ ath10k_caldata_set_macaddr() {
case "$FIRMWARE" in case "$FIRMWARE" in
"ath10k/cal-pci-0000:02:00.0.bin") "ath10k/cal-pci-0000:02:00.0.bin")
board=$(lantiq_board_name) board=$(board_name)
case $board in case $board in
BTHOMEHUBV5A) BTHOMEHUBV5A)
ath10k_caldata_extract_ubi "caldata" 20480 2116 ath10k_caldata_extract_ubi "caldata" 20480 2116

3
target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
View File

@@ -5,7 +5,6 @@
. /lib/functions.sh . /lib/functions.sh
. /lib/functions/system.sh . /lib/functions/system.sh
. /lib/functions/lantiq.sh
. /lib/upgrade/nand.sh . /lib/upgrade/nand.sh
# xor multiple hex values of the same length # xor multiple hex values of the same length
@@ -114,7 +113,7 @@ case "$FIRMWARE" in
"ath9k-eeprom-pci-0000:00:0e.0.bin" | \ "ath9k-eeprom-pci-0000:00:0e.0.bin" | \
"ath9k-eeprom-pci-0000:01:00.0.bin" | \ "ath9k-eeprom-pci-0000:01:00.0.bin" | \
"ath9k-eeprom-pci-0000:02:00.0.bin") "ath9k-eeprom-pci-0000:02:00.0.bin")
board=$(lantiq_board_name) board=$(board_name)
case "$board" in case "$board" in
ARV7518PW) ARV7518PW)

9
target/linux/lantiq/base-files/lib/functions/lantiq.sh
View File

@@ -9,15 +9,6 @@ lantiq_board_model() {
echo "$model" echo "$model"
} }
lantiq_board_name() {
local name
[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
[ -z "$name" ] && name="unknown"
echo "$name"
}
lantiq_get_dt_led() { lantiq_get_dt_led() {
local label local label
local ledpath local ledpath

4
target/linux/lantiq/base-files/lib/upgrade/platform.sh
View File

@@ -1,5 +1,3 @@
. /lib/functions/lantiq.sh
PART_NAME=firmware PART_NAME=firmware
REQUIRE_IMAGE_METADATA=1 REQUIRE_IMAGE_METADATA=1
@@ -8,7 +6,7 @@ platform_check_image() {
} }
platform_pre_upgrade() { platform_pre_upgrade() {
local board=$(lantiq_board_name) local board=$(board_name)
case "$board" in case "$board" in
BTHOMEHUBV2B|BTHOMEHUBV3A|BTHOMEHUBV5A|P2812HNUF* ) BTHOMEHUBV2B|BTHOMEHUBV3A|BTHOMEHUBV5A|P2812HNUF* )