Gentoo Archives: gentoo-commits

From: Richard Yao <ryao@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: netboot/
Date: Sat, 25 Jan 2014 03:11:14
Message-Id: 1390619492.ebd1221ef0ddf2b3d7a7fc8dfafcee689c16a93c.ryao@gentoo
1 commit: ebd1221ef0ddf2b3d7a7fc8dfafcee689c16a93c
2 Author: Guy Martin <gmsoft <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 22 14:00:55 2014 +0000
4 Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 25 03:11:32 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ebd1221e
7
8 Add machine detection for hppa.
9
10 Signed-off-by: Guy Martin <gmsoft <AT> gentoo.org>
11
12 ---
13 netboot/linuxrc.x | 16 ++++++++++++++++
14 1 file changed, 16 insertions(+)
15
16 diff --git a/netboot/linuxrc.x b/netboot/linuxrc.x
17 index 3e46859..69e7e7a 100644
18 --- a/netboot/linuxrc.x
19 +++ b/netboot/linuxrc.x
20 @@ -213,8 +213,23 @@ DetectPpc() {
21
22 #//--------------------------------------------------------------------------------
23
24 +#// Determine hppa Machine Type
25 +#//--------------------------------------------------------------------------------
26 +
27 +DetectHppa() {
28 + case "${ARCHINFO}" in
29 + parisc)
30 + MYARCH="HPPA"
31 + ;;
32 + parisc64)
33 + MYARCH="HPPA (64bit kernel)"
34 + ;;
35 + esac
36
37 + MACHTYPE=$(grep 'model' /proc/cpuinfo | cut -d '/' -f 3 | head -n 1 | sed -e 's/ //g')
38 +}
39
40 +#//--------------------------------------------------------------------------------
41 #// Discover if the network is already running for us or not
42 #//--------------------------------------------------------------------------------
43
44 @@ -338,6 +353,7 @@ case "${ARCHINFO}" in
45 mount -t openpromfs openprom /proc/openprom
46 ;;
47 ppc*) DetectPpc ;;
48 + parisc*) DetectHppa ;;
49 *) MACHTYPE=$ARCHINFO ;;
50 esac