Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

Fix boot-device use

Browse Source 
git-svn-id: svn://coreboot.org/openbios/openbios-devel@138 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Blue Swirl
2007-05-04 20:55:05 +00:00
parent 2b99ad760f
commit c4f3fbc099
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sparc32/boot.c
View File

@@ -28,7 +28,7 @@ extern struct linux_arguments_v0 obp_arg;
void boot(void) void boot(void)
{ {
char *path = pop_fstr_copy(), *param, *oldpath; char *path = pop_fstr_copy(), *param, *oldpath = path;
char altpath[256]; char altpath[256];
int unit; int unit;
const void *romvec; const void *romvec;
@@ -41,7 +41,6 @@ void boot(void)
fword("get-package-property"); fword("get-package-property");
if (!POP()) { if (!POP()) {
path = pop_fstr_copy(); path = pop_fstr_copy();
oldpath = path;
unit = 0; unit = 0;
} else { } else {
switch (boot_device) { switch (boot_device) {

3
forth/admin/nvram.fs
View File

@@ -303,7 +303,6 @@ constant config-info.size
\ fcode-debug? input-device output-device \ fcode-debug? input-device output-device
" true" " auto-boot?" bool-config \ 7.4.3.5 " true" " auto-boot?" bool-config \ 7.4.3.5
" boot" " boot-command" str-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 " " " boot-file" str-config \ 7.4.3.5
" false" " diag-switch?" bool-config \ 7.4.3.5 " false" " diag-switch?" bool-config \ 7.4.3.5
" net" " diag-device" str-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 [IFDEF] CONFIG_PPC
\ ---- PPC ---- \ ---- PPC ----
" disk" " boot-device" str-config \ 7.4.3.5
" false" " little-endian?" bool-config " false" " little-endian?" bool-config
" false" " real-mode?" bool-config " false" " real-mode?" bool-config
" -1" " real-base" int-config " -1" " real-base" int-config
@@ -341,6 +341,7 @@ no-conf-def " security-mode" secmode-config
[IFDEF] CONFIG_X86 [IFDEF] CONFIG_X86
\ ---- X86 ---- \ ---- X86 ----
" disk" " boot-device" str-config \ 7.4.3.5
" true" " little-endian?" bool-config " true" " little-endian?" bool-config
[THEN] [THEN]