1 From b9a068e26261007d4a0592fcb47f82658af2c775 Mon Sep 17 00:00:00 2001
2 From: Michael Tremer <michael.tremer@ipfire.org>
3 Date: Mon, 3 Nov 2014 21:33:45 +0100
4 Subject: [PATCH 2/3] ARM: Read board model from device-tree in /proc
7 src/fireinfo/system.py | 35 +++++++++--------------------------
8 1 file changed, 9 insertions(+), 26 deletions(-)
10 diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
11 index 890f58c05027..195832e9f7eb 100644
12 --- a/src/fireinfo/system.py
13 +++ b/src/fireinfo/system.py
14 @@ -304,27 +304,6 @@ class System(object):
16 return read_from_file("/sys/class/dmi/id/bios_vendor")
18 - def vendor_model_tuple(self):
20 - s = self.__cpuinfo["Hardware"]
24 - if s.startswith("ARM-Versatile"):
28 - v, m = s.split(" ", 1)
30 - if s.startswith("BCM"):
42 @@ -337,8 +316,10 @@ class System(object):
46 - v, m = self.vendor_model_tuple()
49 + return self.__cpuinfo["Hardware"]
55 @@ -353,9 +334,11 @@ class System(object):
60 - v, m = self.vendor_model_tuple()
62 + # Read device-tree model if available
63 + ret = read_from_file("/proc/device-tree/model")
65 + # replace the NULL byte with which the DT string ends
66 + ret = ret.replace(u"\u0000", "")