mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "H. Peter Anvin" <hpa@zytor.com>
To: linux-kernel@vger.kernel.org, klibc@zytor.com
Cc: "H. Peter Anvin" <hpa@zytor.com>
Subject: [klibc 29/31] sparc32: transfer arch-specific options to /arch.cmd
Date: Tue, 27 Jun 2006 22:17:29 -0700	[thread overview]
Message-ID: <klibc.200606272217.29@tazenda.hos.anvin.org> (raw)
In-Reply-To: <klibc.200606272217.00@tazenda.hos.anvin.org>

Boot options which have been obtained in an architecture-specific
fashion have to be copied to /arch.cmd in the rootfs.  This implements
that functionality for sparc32; the code is identical to sparc64 minus
the openprom support for obtaining nfsroot options.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

---
commit 15d00a4525e5127f0cb4ff31fae3c80c87d3212e
tree c55726dfc288f0ceee45ae53aa47978a0a9a0f99
parent 921aaa1bc54bbcdc3a91d3ea4f23b2b13d42699d
author H. Peter Anvin <hpa@zytor.com> Thu, 25 May 2006 22:34:47 -0700
committer H. Peter Anvin <hpa@zytor.com> Tue, 27 Jun 2006 20:51:17 -0700

 arch/sparc/kernel/setup.c |   47 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c
index a893a9c..f7c4673 100644
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@@ -241,8 +241,6 @@ #define RAMDISK_IMAGE_START_MASK	0x07FF
 #define RAMDISK_PROMPT_FLAG		0x8000
 #define RAMDISK_LOAD_FLAG		0x4000
 
-extern int root_mountflags;
-
 char reboot_command[COMMAND_LINE_SIZE];
 enum sparc_cpu sparc_cpu_model;
 
@@ -329,14 +327,7 @@ #endif
 	}
 	pfn_base = phys_base >> PAGE_SHIFT;
 
-	if (!root_flags)
-		root_mountflags &= ~MS_RDONLY;
 	ROOT_DEV = old_decode_dev(root_dev);
-#ifdef CONFIG_BLK_DEV_RAM
-	rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
-	rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);
-	rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);	
-#endif
 
 	prom_setsync(prom_sync_me);
 
@@ -389,6 +380,44 @@ static int __init set_preferred_console(
 }
 console_initcall(set_preferred_console);
 
+/*
+ * Platform-specific configuration commands which don't come from
+ * the actual kernel command line.  Write them into a file in rootfs
+ * so kinit can pick them up.
+ */
+static int __init set_arch_init_commands(void)
+{
+	int fd = sys_open("/arch.cmd", O_WRONLY|O_CREAT|O_APPEND, 0666);
+	char buffer[256];
+	int len = 0;
+
+	if (fd < 0)
+		return fd;
+
+	buffer[0] = 'r';
+	buffer[1] = root_flags ? 'o' : 'w';
+	buffer[2] = '\n';
+	len = 3;
+
+#ifdef CONFIG_BLK_DEV_RAM
+	len += min((int)(sizeof buffer - 1 - len),
+		   snprintf(buffer+len, sizeof buffer - len,
+			    "ramdisk_start=%u\n"
+			    "prompt_ramdisk=%d\n"
+			    "load_ramdisk=%d\n",
+			    ram_flags & RAMDISK_IMAGE_START_MASK,
+			    !!(ram_flags & RAMDISK_PROMPT_FLAG),
+			    !!(ram_flags & RAMDISK_LOAD_FLAG)));
+#endif
+
+	sys_write(fd, buffer, len);
+	sys_close(fd);
+
+	return 0;
+}
+
+late_initcall(set_arch_init_commands);
+
 extern char *sparc_cpu_type;
 extern char *sparc_fpu_type;
 

  parent reply	other threads:[~2006-06-28  5:28 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-28  5:17 [klibc 00/31] klibc as a historyless patchset (updated and reorganized) H. Peter Anvin
2006-06-28  5:17 ` [klibc 01/31] Add klibc/kinit to MAINTAINERS file H. Peter Anvin
2006-06-28  5:17 ` [klibc 02/31] Main Makefile changes for klibc H. Peter Anvin
2006-06-28  5:17 ` [klibc 03/31] Core klibc code H. Peter Anvin
2006-06-28  5:17 ` [klibc 04/31] alpha support for klibc H. Peter Anvin
2006-06-28 15:43   ` Richard Henderson
2006-06-28 15:51     ` H. Peter Anvin
2006-06-28  5:17 ` [klibc 05/31] arm " H. Peter Anvin
2006-06-28  5:17 ` [klibc 06/31] cris " H. Peter Anvin
2006-06-28  5:17 ` [klibc 07/31] i386 " H. Peter Anvin
2006-06-28  7:37   ` Jan Engelhardt
2006-06-28 15:33     ` H. Peter Anvin
2006-06-28 16:44       ` H. Peter Anvin
2006-06-29  0:14       ` Roman Zippel
2006-06-29  0:45         ` H. Peter Anvin
2006-06-29 23:43           ` Roman Zippel
2006-06-29 23:54             ` H. Peter Anvin
2006-06-30  0:23               ` Roman Zippel
2006-06-30  1:28                 ` [klibc] " Aaron Griffin
2006-06-30 13:56                   ` Jan Engelhardt
2006-06-28  5:17 ` [klibc 08/31] ia64 " H. Peter Anvin
2006-06-28  5:17 ` [klibc 09/31] m32r " H. Peter Anvin
2006-06-28  5:17 ` [klibc 10/31] m68k " H. Peter Anvin
2006-06-28  5:17 ` [klibc 11/31] mips " H. Peter Anvin
2006-06-28  5:17 ` [klibc 12/31] mips64 " H. Peter Anvin
2006-06-28  5:17 ` [klibc 13/31] parisc " H. Peter Anvin
2006-06-28  5:17 ` [klibc 14/31] ppc " H. Peter Anvin
2006-06-28  5:17 ` [klibc 15/31] ppc64 " H. Peter Anvin
2006-06-28  5:17 ` [klibc 16/31] s390 " H. Peter Anvin
2006-06-28  5:17 ` [klibc 17/31] sh " H. Peter Anvin
2006-06-28  5:17 ` [klibc 18/31] sparc " H. Peter Anvin
2006-06-28  5:17 ` [klibc 19/31] sparc64 " H. Peter Anvin
2006-06-28  5:17 ` [klibc 20/31] x86_64 " H. Peter Anvin
2006-06-28  5:17 ` [klibc 21/31] Simple test suite " H. Peter Anvin
2006-06-28  5:17 ` [klibc 22/31] zlib " H. Peter Anvin
2006-06-28  5:17 ` [klibc 23/31] kinit: replacement for in-kernel do_mount, ipconfig, nfsroot H. Peter Anvin
2006-06-28  5:17 ` [klibc 24/31] klibc basic build infrastructure H. Peter Anvin
2006-06-28  5:17 ` [klibc 25/31] Miscellaneous utilities for klibc H. Peter Anvin
2006-06-28  5:17 ` [klibc 26/31] dash - a small POSIX shell " H. Peter Anvin
2006-06-28  5:17 ` [klibc 27/31] A port of gzip to klibc H. Peter Anvin
2006-06-28  5:17 ` [klibc 28/31] sparc64: transmit arch-specific options to kinit via /arch.cmd H. Peter Anvin
2006-06-28  5:17 ` H. Peter Anvin [this message]
2006-06-28  5:17 ` [klibc 30/31] Remove in-kernel resume-from-disk invocation code H. Peter Anvin
2006-07-05 23:40   ` Nigel Cunningham
2006-07-05 23:58     ` Joshua Hudson
2006-07-06  0:11     ` H. Peter Anvin
2006-07-06  0:37       ` Nigel Cunningham
2006-07-06  0:54         ` H. Peter Anvin
2006-07-06  1:45           ` Nigel Cunningham
2006-07-06  2:18             ` Nigel Cunningham
2006-07-06  3:11               ` H. Peter Anvin
2006-07-06  3:28                 ` Nigel Cunningham
2006-07-06 10:26             ` Pavel Machek
     [not found]             ` <200607061028.k66AS8UB012207@smtp.micromuse.com>
2006-07-06 10:58               ` IBM spam Re: " Pavel Machek
2006-07-06 13:02                 ` Sean Young
2006-07-06  8:31       ` [klibc] " maximilian attems
2006-07-06  8:37         ` H. Peter Anvin
2006-06-28  5:17 ` [klibc 31/31] Remove in-kernel root-mounting code H. Peter Anvin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=klibc.200606272217.29@tazenda.hos.anvin.org \
    --to=hpa@zytor.com \
    --cc=klibc@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®