diff options
| author | Luis Araneda <luaraneda@gmail.com> | 2018-01-05 10:00:11 -0300 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-01-13 07:33:03 +0100 |
| commit | 33f09cf15178cf7e05cbe816e1cb492bcae89836 (patch) | |
| tree | 0352a8efc7c27647d3856f46fec2b9b1b6f79df2 /target/linux/ipq806x/base-files/lib | |
| parent | 3cbdae242161db64ffe039a042afb7e0349cb2e3 (diff) | |
| download | upstream-33f09cf15178cf7e05cbe816e1cb492bcae89836.tar.gz upstream-33f09cf15178cf7e05cbe816e1cb492bcae89836.tar.bz2 upstream-33f09cf15178cf7e05cbe816e1cb492bcae89836.zip | |
ipq806x: convert to dt-based board-detection
Use the generic board detection method:
- Board name: First compatible string from the device tree
- Board model: Model property from the device tree
Change occurrences of board name in userspace by the compatible
string, and removed target specific board detection script
Replace the definition of SUPPORTED_DEVICES in Device/Default
to extract the dt compatible string from each device definition.
Additionally, for devices supported by lede-17.01, append
the value of BOARD_NAME to SUPPORTED_DEVICES in the device
definition.
Signed-off-by: Luis Araneda <luaraneda@gmail.com>
Diffstat (limited to 'target/linux/ipq806x/base-files/lib')
4 files changed, 12 insertions, 88 deletions
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 |