[source] treewide: do board detection during preinit
LEDE Commits
lede-commits at lists.infradead.org
Sat Jul 15 14:14:14 PDT 2017
mkresin pushed a commit to source.git, branch master:
https://git.lede-project.org/78cf5eed6edaa38561e9c9c3ff14a36c1eedfadd
commit 78cf5eed6edaa38561e9c9c3ff14a36c1eedfadd
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Fri Apr 7 18:01:17 2017 +0200
treewide: do board detection during preinit
Do the board detection during preinit to unify it across all targets.
Signed-off-by: Mathias Kresin <dev at kresin.me>
---
.../brcm47xx/base-files/lib/preinit/01_sysinfo | 12 ++++++
target/linux/cns3xxx/base-files/lib/cns3xxx.sh | 27 +++++++++---
.../cns3xxx/base-files/lib/preinit/01_sysinfo | 9 ++++
target/linux/imx6/base-files/lib/imx6.sh | 1 -
.../linux/imx6/base-files/lib/preinit/01_sysinfo | 9 ++++
target/linux/ixp4xx/base-files/lib/ixp4xx.sh | 50 +++++++++++++++-------
.../linux/ixp4xx/base-files/lib/preinit/01_sysinfo | 9 ++++
target/linux/kirkwood/base-files/lib/kirkwood.sh | 1 -
.../kirkwood/base-files/lib/preinit/01_sysinfo | 9 ++++
target/linux/mvebu/base-files/lib/mvebu.sh | 1 -
.../linux/mvebu/base-files/lib/preinit/01_sysinfo | 9 ++++
.../linux/orion/base-files/lib/preinit/01_sysinfo | 12 ++++++
.../linux/ppc40x/base-files/lib/preinit/01_sysinfo | 12 ++++++
13 files changed, 136 insertions(+), 25 deletions(-)
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/01_sysinfo b/target/linux/brcm47xx/base-files/lib/preinit/01_sysinfo
new file mode 100644
index 0000000..8a2de67
--- /dev/null
+++ b/target/linux/brcm47xx/base-files/lib/preinit/01_sysinfo
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+do_sysinfo_brcm47xx() {
+ local name="$(sed -ne 's/^machine[ \t]*: //p' /proc/cpuinfo)"
+ [ -z "$name" ] && name="unknown"
+
+ [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
+ echo "$name" > /tmp/sysinfo/board_name
+ echo "unknown" > /tmp/sysinfo/model
+}
+
+boot_hook_add preinit_main do_sysinfo_brcm47xx
diff --git a/target/linux/cns3xxx/base-files/lib/cns3xxx.sh b/target/linux/cns3xxx/base-files/lib/cns3xxx.sh
index 476f9be..fb2c104 100644
--- a/target/linux/cns3xxx/base-files/lib/cns3xxx.sh
+++ b/target/linux/cns3xxx/base-files/lib/cns3xxx.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-#
-# Copyright (C) 2012 OpenWrt.org
-#
-cns3xxx_board_name() {
+CNS3XXX_BOARD_NAME=
+CNS3XXX_MODEL=
+
+cns3xxx_board_detect() {
local machine
local name
@@ -17,6 +17,21 @@ cns3xxx_board_name() {
name="generic";
;;
esac
-
- echo $name
+
+ [ -z "$CNS3XXX_BOARD_NAME" ] && CNS3XXX_BOARD_NAME="$name"
+ [ -z "$CNS3XXX_MODEL" ] && CNS3XXX_MODEL="$machine"
+
+ [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
+
+ echo "$CNS3XXX_BOARD_NAME" > /tmp/sysinfo/board_name
+ echo "$CNS3XXX_MODEL" > /tmp/sysinfo/model
+}
+
+cns3xxx_board_name() {
+ local name
+
+ [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
+ [ -z "$name" ] && name="unknown"
+
+ echo "$name"
}
diff --git a/target/linux/cns3xxx/base-files/lib/preinit/01_sysinfo b/target/linux/cns3xxx/base-files/lib/preinit/01_sysinfo
new file mode 100644
index 0000000..cc7b555
--- /dev/null
+++ b/target/linux/cns3xxx/base-files/lib/preinit/01_sysinfo
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+do_sysinfo_cns3xxx() {
+ . /lib/cns3xxx.sh
+
+ cns3xxx_board_detect
+}
+
+boot_hook_add preinit_main do_sysinfo_cns3xxx
diff --git a/target/linux/imx6/base-files/lib/imx6.sh b/target/linux/imx6/base-files/lib/imx6.sh
index 94adf1c..385c54f 100755
--- a/target/linux/imx6/base-files/lib/imx6.sh
+++ b/target/linux/imx6/base-files/lib/imx6.sh
@@ -75,7 +75,6 @@ imx6_board_detect() {
imx6_board_name() {
local name
- [ -f /tmp/sysinfo/board_name ] || imx6_board_detect
[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
[ -z "$name" ] && name="unknown"
diff --git a/target/linux/imx6/base-files/lib/preinit/01_sysinfo b/target/linux/imx6/base-files/lib/preinit/01_sysinfo
new file mode 100644
index 0000000..0a91aed
--- /dev/null
+++ b/target/linux/imx6/base-files/lib/preinit/01_sysinfo
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+do_sysinfo_imx6() {
+ . /lib/imx6.sh
+
+ imx6_board_detect
+}
+
+boot_hook_add preinit_main do_sysinfo_imx6
diff --git a/target/linux/ixp4xx/base-files/lib/ixp4xx.sh b/target/linux/ixp4xx/base-files/lib/ixp4xx.sh
index f7a6b76..7486356 100644
--- a/target/linux/ixp4xx/base-files/lib/ixp4xx.sh
+++ b/target/linux/ixp4xx/base-files/lib/ixp4xx.sh
@@ -3,23 +3,41 @@
# Copyright (C) 2012 OpenWrt.org
#
-ixp4xx_board_name() {
- local machine
- local name
-
- machine=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /Hardware/ {print $2}' /proc/cpuinfo)
-
- case "$machine" in
- "Gateworks Cambria"*)
- name="cambria"
- ;;
- "Gateworks Avila"*)
- name="avila"
- ;;
- *)
- name="generic";
- ;;
+IXP4XX_BOARD_NAME=
+IXP4XX_MODEL=
+
+ixp4xx_board_detect() {
+ local machine
+ local name
+
+ machine=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /Hardware/ {print $2}' /proc/cpuinfo)
+
+ case "$machine" in
+ "Gateworks Cambria"*)
+ name="cambria"
+ ;;
+ "Gateworks Avila"*)
+ name="avila"
+ ;;
+ *)
+ name="generic";
+ ;;
esac
+ [ -z "$IXP4XX_BOARD_NAME" ] && IXP4XX_BOARD_NAME="$name"
+ [ -z "$IXP4XX_MODEL" ] && IXP4XX_MODEL="$machine"
+
+ [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
+
+ echo "$IXP4XX_BOARD_NAME" > /tmp/sysinfo/board_name
+ echo "$IXP4XX_MODEL" > /tmp/sysinfo/model
+}
+
+ixp4xx_board_name() {
+ local name
+
+ [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
+ [ -z "$name" ] && name="unknown"
+
echo $name
}
diff --git a/target/linux/ixp4xx/base-files/lib/preinit/01_sysinfo b/target/linux/ixp4xx/base-files/lib/preinit/01_sysinfo
new file mode 100644
index 0000000..7699e9a
--- /dev/null
+++ b/target/linux/ixp4xx/base-files/lib/preinit/01_sysinfo
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+do_sysinfo_ixp4xx() {
+ . /lib/ixp4xx.sh
+
+ ixp4xx_board_detect
+}
+
+boot_hook_add preinit_main do_sysinfo_ixp4xx
diff --git a/target/linux/kirkwood/base-files/lib/kirkwood.sh b/target/linux/kirkwood/base-files/lib/kirkwood.sh
index c29a315..20c6ebd 100755
--- a/target/linux/kirkwood/base-files/lib/kirkwood.sh
+++ b/target/linux/kirkwood/base-files/lib/kirkwood.sh
@@ -90,7 +90,6 @@ kirkwood_board_detect() {
kirkwood_board_name() {
local name
- [ -f /tmp/sysinfo/board_name ] || kirkwood_board_detect
[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
[ -z "$name" ] && name="unknown"
diff --git a/target/linux/kirkwood/base-files/lib/preinit/01_sysinfo b/target/linux/kirkwood/base-files/lib/preinit/01_sysinfo
new file mode 100644
index 0000000..d45fc92
--- /dev/null
+++ b/target/linux/kirkwood/base-files/lib/preinit/01_sysinfo
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+do_sysinfo_kirkwood() {
+ . /lib/kirkwood.sh
+
+ kirkwood_board_detect
+}
+
+boot_hook_add preinit_main do_sysinfo_kirkwood
diff --git a/target/linux/mvebu/base-files/lib/mvebu.sh b/target/linux/mvebu/base-files/lib/mvebu.sh
index ecf3d44..9096860 100755
--- a/target/linux/mvebu/base-files/lib/mvebu.sh
+++ b/target/linux/mvebu/base-files/lib/mvebu.sh
@@ -75,7 +75,6 @@ mvebu_board_detect() {
mvebu_board_name() {
local name
- [ -f /tmp/sysinfo/board_name ] || mvebu_board_detect
[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
[ -z "$name" ] && name="unknown"
diff --git a/target/linux/mvebu/base-files/lib/preinit/01_sysinfo b/target/linux/mvebu/base-files/lib/preinit/01_sysinfo
new file mode 100644
index 0000000..6f473cf
--- /dev/null
+++ b/target/linux/mvebu/base-files/lib/preinit/01_sysinfo
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+do_sysinfo_mvebu() {
+ . /lib/mvebu.sh
+
+ mvebu_board_detect
+}
+
+boot_hook_add preinit_main do_sysinfo_mvebu
diff --git a/target/linux/orion/base-files/lib/preinit/01_sysinfo b/target/linux/orion/base-files/lib/preinit/01_sysinfo
new file mode 100644
index 0000000..1ef07d7
--- /dev/null
+++ b/target/linux/orion/base-files/lib/preinit/01_sysinfo
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+do_sysinfo_orion() {
+ local name="$(sed -n /Hardware/s/.*:.//p /proc/cpuinfo)"
+ [ -z "$name" ] && name="unknown"
+
+ [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
+ echo "$name" > /tmp/sysinfo/board_name
+ echo "unknown" > /tmp/sysinfo/model
+}
+
+boot_hook_add preinit_main do_sysinfo_orion
diff --git a/target/linux/ppc40x/base-files/lib/preinit/01_sysinfo b/target/linux/ppc40x/base-files/lib/preinit/01_sysinfo
new file mode 100644
index 0000000..9f82c84
--- /dev/null
+++ b/target/linux/ppc40x/base-files/lib/preinit/01_sysinfo
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+do_sysinfo_ppc40x() {
+ local name="$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /model/ {print $2}' /proc/cpuinfo)"
+ [ -z "$name" ] && name="unknown"
+
+ [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
+ echo "$name" > /tmp/sysinfo/board_name
+ echo "unknown" > /tmp/sysinfo/model
+}
+
+boot_hook_add preinit_main do_sysinfo_ppc40x
More information about the lede-commits
mailing list