From 0f0d742ae35523d300667c7a39874fd4fcfdde89 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 17 Mar 2017 16:17:42 +0100 Subject: [PATCH] lantiq: move lantiq_board_detect() to 03_preinit_board.sh It is only used there Signed-off-by: Felix Fietkau (cherry picked from commit aa95d6cd20f7e08420562b9747c197c2eac1d2e2) --- target/linux/lantiq/base-files/lib/functions/lantiq.sh | 10 ---------- .../lantiq/base-files/lib/preinit/03_preinit_board.sh | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq.sh b/target/linux/lantiq/base-files/lib/functions/lantiq.sh index 630832e512..89f194b39e 100644 --- a/target/linux/lantiq/base-files/lib/functions/lantiq.sh +++ b/target/linux/lantiq/base-files/lib/functions/lantiq.sh @@ -1,15 +1,5 @@ #!/bin/sh -lantiq_board_detect() { - name=`grep "^machine" /proc/cpuinfo | sed "s/machine.*: \(.*\)/\1/g" | sed "s/\(.*\) - .*/\1/g"` - model=`grep "^machine" /proc/cpuinfo | sed "s/machine.*: \(.*\)/\1/g" | sed "s/.* - \(.*\)/\1/g"` - [ -z "$name" ] && name="unknown" - [ -z "$model" ] && model="unknown" - [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" - echo $name > /tmp/sysinfo/board_name - echo $model > /tmp/sysinfo/model -} - lantiq_board_model() { local model diff --git a/target/linux/lantiq/base-files/lib/preinit/03_preinit_board.sh b/target/linux/lantiq/base-files/lib/preinit/03_preinit_board.sh index 6d4bd67af5..aef946036e 100755 --- a/target/linux/lantiq/base-files/lib/preinit/03_preinit_board.sh +++ b/target/linux/lantiq/base-files/lib/preinit/03_preinit_board.sh @@ -1,5 +1,15 @@ #!/bin/sh +lantiq_board_detect() { + name=`grep "^machine" /proc/cpuinfo | sed "s/machine.*: \(.*\)/\1/g" | sed "s/\(.*\) - .*/\1/g"` + model=`grep "^machine" /proc/cpuinfo | sed "s/machine.*: \(.*\)/\1/g" | sed "s/.* - \(.*\)/\1/g"` + [ -z "$name" ] && name="unknown" + [ -z "$model" ] && model="unknown" + [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" + echo $name > /tmp/sysinfo/board_name + echo $model > /tmp/sysinfo/model +} + do_lantiq() { . /lib/functions/lantiq.sh -- 2.25.1