From c4f3fbc099362a90bb2b1942beb93e1158c0bf86 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Fri, 4 May 2007 20:55:05 +0000 Subject: [PATCH] Fix boot-device use git-svn-id: svn://coreboot.org/openbios/openbios-devel@138 f158a5a8-5612-0410-a976-696ce0be7e32 --- arch/sparc32/boot.c | 3 +-- forth/admin/nvram.fs | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/sparc32/boot.c b/arch/sparc32/boot.c index 4f36cfc..1b5c797 100644 --- a/arch/sparc32/boot.c +++ b/arch/sparc32/boot.c @@ -28,7 +28,7 @@ extern struct linux_arguments_v0 obp_arg; void boot(void) { - char *path = pop_fstr_copy(), *param, *oldpath; + char *path = pop_fstr_copy(), *param, *oldpath = path; char altpath[256]; int unit; const void *romvec; @@ -41,7 +41,6 @@ void boot(void) fword("get-package-property"); if (!POP()) { path = pop_fstr_copy(); - oldpath = path; unit = 0; } else { switch (boot_device) { diff --git a/forth/admin/nvram.fs b/forth/admin/nvram.fs index b6d4cdf..06ac42e 100644 --- a/forth/admin/nvram.fs +++ b/forth/admin/nvram.fs @@ -303,7 +303,6 @@ constant config-info.size \ fcode-debug? input-device output-device " true" " auto-boot?" bool-config \ 7.4.3.5 " boot" " boot-command" str-config \ 7.4.3.5 -" disk" " boot-device" str-config \ 7.4.3.5 " " " boot-file" str-config \ 7.4.3.5 " false" " diag-switch?" bool-config \ 7.4.3.5 " net" " diag-device" str-config \ 7.4.3.5 @@ -330,6 +329,7 @@ no-conf-def " security-mode" secmode-config [IFDEF] CONFIG_PPC \ ---- PPC ---- +" disk" " boot-device" str-config \ 7.4.3.5 " false" " little-endian?" bool-config " false" " real-mode?" bool-config " -1" " real-base" int-config @@ -341,6 +341,7 @@ no-conf-def " security-mode" secmode-config [IFDEF] CONFIG_X86 \ ---- X86 ---- +" disk" " boot-device" str-config \ 7.4.3.5 " true" " little-endian?" bool-config [THEN]