Hello community,
here is the log from the commit of package lilo
checked in at Mon Oct 30 17:59:24 CET 2006.
--------
--- arch/ppc/lilo/lilo.changes 2006-10-24 22:34:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2006-10-30 15:08:18.000000000 +0100
@@ -1,0 +2,42 @@
+Mon Oct 30 15:05:51 CET 2006 - olh@suse.de
+
+- let yaboot run 'output-device output' if no yaboot,do-not-open-screen
+ exists, or if yaboot,do-open-screen property exists in /chosen
+
+-------------------------------------------------------------------
+Mon Oct 30 14:06:25 CET 2006 - olh@suse.de
+
+- option no_os_chooser does now only load and start yaboot
+ it will not open the screen with " screen" output
+
+-------------------------------------------------------------------
+Mon Oct 30 13:44:40 CET 2006 - olh@suse.de
+
+- use cat instead of echo to generate the pmac os-chooser script
+
+-------------------------------------------------------------------
+Mon Oct 30 13:27:39 CET 2006 - olh@suse.de
+
+- no subshell for string assignment for pmac os-chooser
+
+-------------------------------------------------------------------
+Mon Oct 30 12:57:31 CET 2006 - olh@suse.de
+
+- change pmac os-chooser hint from linux to Linux
+
+-------------------------------------------------------------------
+Mon Oct 30 11:38:17 CET 2006 - olh@suse.de
+
+- fix weird loop handling in running_on_pmac_new
+
+-------------------------------------------------------------------
+Sun Oct 29 21:13:12 CET 2006 - olh@suse.de
+
+- setprop takes a const *buf
+
+-------------------------------------------------------------------
+Fri Oct 27 13:11:13 CEST 2006 - olh@suse.de
+
+- move and resize the yaboot internal malloc area (215616)
+
+-------------------------------------------------------------------
Old:
----
lilo-10.1.17.tar.bz2
yaboot-10.1.17-r836.tar.bz2
New:
----
lilo-10.1.18.tar.bz2
yaboot-10.1.18-r849.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilo.spec ++++++
--- /var/tmp/diff_new_pack.Hk0EDJ/_old 2006-10-30 17:59:13.000000000 +0100
+++ /var/tmp/diff_new_pack.Hk0EDJ/_new 2006-10-30 17:59:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package lilo (Version 10.1.17)
+# spec file for package lilo (Version 10.1.18)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
# norootforbuild
Name: lilo
-%define yaboot_vers 10.1.17-r836
+%define yaboot_vers 10.1.18-r849
Group: System/Boot
License: BSD License and BSD-like, Other License(s), see package
Summary: The Linux Loader, a Boot Menu
@@ -23,7 +23,7 @@
Requires: powerpc-utils
Requires: binutils
Requires: parted
-Version: 10.1.17
+Version: 10.1.18
Release: 1
Source0: lilo-%{version}.tar.bz2
Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2
@@ -161,6 +161,24 @@
%doc %{_mandir}/*/*
%changelog -n lilo
+* Mon Oct 30 2006 - olh@suse.de
+- let yaboot run 'output-device output' if no yaboot,do-not-open-screen
+ exists, or if yaboot,do-open-screen property exists in /chosen
+* Mon Oct 30 2006 - olh@suse.de
+- option no_os_chooser does now only load and start yaboot
+ it will not open the screen with " screen" output
+* Mon Oct 30 2006 - olh@suse.de
+- use cat instead of echo to generate the pmac os-chooser script
+* Mon Oct 30 2006 - olh@suse.de
+- no subshell for string assignment for pmac os-chooser
+* Mon Oct 30 2006 - olh@suse.de
+- change pmac os-chooser hint from linux to Linux
+* Mon Oct 30 2006 - olh@suse.de
+- fix weird loop handling in running_on_pmac_new
+* Sun Oct 29 2006 - olh@suse.de
+- setprop takes a const *buf
+* Fri Oct 27 2006 - olh@suse.de
+- move and resize the yaboot internal malloc area (215616)
* Tue Oct 24 2006 - olh@suse.de
- temporary reverse the meaning of the lilo.conf 'no_os_chooser'
option to test the new output-device code
++++++ lilo-10.1.17.tar.bz2 -> lilo-10.1.18.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.17/bootheader/chrp/of1275_setprop.c new/lilo-10.1.18/bootheader/chrp/of1275_setprop.c
--- old/lilo-10.1.17/bootheader/chrp/of1275_setprop.c 2006-02-07 15:38:07.000000000 +0100
+++ new/lilo-10.1.18/bootheader/chrp/of1275_setprop.c 2006-10-29 21:13:41.000000000 +0100
@@ -1,6 +1,6 @@
-/* $Id: of1275_setprop.c 590 2006-02-07 14:38:07Z jplack $ */
+/* $Id: of1275_setprop.c 840 2006-10-29 20:13:41Z olh $ */
#include
-int of1275_setprop(phandle node, const char *name, void *buf, int buflen)
+int of1275_setprop(phandle node, const char *name, const void *buf, int buflen)
{
return call_prom("setprop", 4, 1, node, name, buf, buflen);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.17/bootheader/include/prom.h new/lilo-10.1.18/bootheader/include/prom.h
--- old/lilo-10.1.17/bootheader/include/prom.h 2006-10-24 22:13:22.000000000 +0200
+++ new/lilo-10.1.18/bootheader/include/prom.h 2006-10-29 21:13:41.000000000 +0100
@@ -1,6 +1,6 @@
#ifndef _PPC_BOOT_PROM_H_
#define _PPC_BOOT_PROM_H_
-/* $Id: prom.h 835 2006-10-24 20:13:22Z olh $ */
+/* $Id: prom.h 840 2006-10-29 20:13:41Z olh $ */
typedef unsigned int phandle;
typedef unsigned int ihandle;
@@ -48,7 +48,7 @@
extern int of1275_read(phandle node, void *buf, int buflen);
extern void of1275_release(unsigned int virt, unsigned int size);
extern int of1275_seek(ihandle node, unsigned int a, unsigned int b);
-extern int of1275_setprop(phandle node, const char *name, void *buf, int buflen);
+extern int of1275_setprop(phandle node, const char *name, const void *buf, int buflen);
extern int of1275_write(phandle node, void *buf, int buflen);
extern void find_type_devices(phandle *, const char *type, int);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.17/lilo-pmac.lib new/lilo-10.1.18/lilo-pmac.lib
--- old/lilo-10.1.17/lilo-pmac.lib 2006-10-18 19:18:54.000000000 +0200
+++ new/lilo-10.1.18/lilo-pmac.lib 2006-10-30 15:08:18.000000000 +0100
@@ -1,4 +1,4 @@
-# $Id: lilo-pmac.lib 827 2006-10-18 17:18:54Z olh $
+# $Id: lilo-pmac.lib 848 2006-10-30 14:08:18Z olh $
# vim: syntax=sh
#
# library for PowerMac routings
@@ -158,77 +158,91 @@
echo "BOOT_DEVICEPATH = $BOOT_DEVICEPATH"
echo "OTHER_DEVICEPATH = $OTHER_DEVICEPATH"
{
- echo "<CHRP-BOOT>"
- echo "<COMPATIBLE>"
- echo "MacRISC MacRISC3 MacRISC4"
- echo "</COMPATIBLE>"
- echo "<DESCRIPTION>"
- echo "Linux/PPC Yaboot bootloader"
- echo "</DESCRIPTION>"
- echo "<BOOT-SCRIPT>"
- echo "\" screen\" output"
- echo "dev screen"
- echo "\" \"(0000000000aa00aa0000aaaaaa0000aa00aaaa5500aaaaaa)\" drop 0 7 set-colors"
- echo "\" \"(5555555555ff55ff5555ffffff5555ff55ffffff55ffffff)\" drop 8 15 set-colors"
- echo "device-end"
- echo "f to foreground-color"
- echo "0 to background-color"
-
- if [ "$CONFIG_PARSE_HASOTHER" = "true" ] ; then
- unset LOOPBLAH
- MY_MACOS_STRING=$(
- for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
- if [ -n "${CONFIG_IMAGE_OTHER[$i]}" -a -z "$LOOPBLAH" ] ; then
- LOOPBLAH=true
- if [ "${CONFIG_IMAGE_LABEL[$i]}" = "macosx" ] ; then
- echo "\" Booting Mac OS X ...\" cr \" boot $OTHER_DEVICEPATH,System\\Library\\CoreServices\\BootX\" eval"
- else
- echo "\" Booting MacOS ...\" cr \" boot $OTHER_DEVICEPATH,\\\\:tbxi\" eval"
- fi
+ cat <<-EOF
+ <CHRP-BOOT>
+ <COMPATIBLE>
+ MacRISC MacRISC3 MacRISC4
+ </COMPATIBLE>
+ <DESCRIPTION>
+ Linux/PPC Yaboot bootloader
+ </DESCRIPTION>
+ <BOOT-SCRIPT>
+ EOF
+ if [ "$OPTION_USE_OS_CHOOSER" = "yes" ] ; then
+ cat <<-EOF
+ dev /chosen 0 0 " yaboot,do-not-open-screen" property device-end
+ " screen" output
+ dev screen
+ " "(0000000000aa00aa0000aaaaaa0000aa00aaaa5500aaaaaa)" drop 0 7 set-colors
+ " "(5555555555ff55ff5555ffffff5555ff55ffffff55ffffff)" drop 8 15 set-colors
+ device-end
+ f to foreground-color
+ 0 to background-color
+ EOF
+
+ if [ "$CONFIG_PARSE_HASOTHER" = "true" ] ; then
+ MY_MACOS_STRING=
+ for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
+ if [ -n "${CONFIG_IMAGE_OTHER[$i]}" ] ; then
+ if [ "${CONFIG_IMAGE_LABEL[$i]}" = "macosx" ] ; then
+ MY_MACOS_STRING="\" Booting Mac OS X ...\" cr \" boot $OTHER_DEVICEPATH,System\\Library\\CoreServices\\BootX\" eval"
+ else
+ MY_MACOS_STRING="\" Booting MacOS ...\" cr \" boot $OTHER_DEVICEPATH,\\\\:tbxi\" eval"
+ fi
+ break
+ fi
+ done
+ MY_YABOOT_STRING="\" Booting Yaboot ...\" cr \" boot $BOOT_DEVICEPATH,\\\\yaboot\" eval "
+ if [ "$OPTION_DEFAULT" = "macos" -o "$OPTION_DEFAULT" = "macosx" ] ; then
+ # macos or macosx is the default
+ MY_STRING_WITH_SPACE_BAR=$MY_YABOOT_STRING
+ MY_STRING_WITHOUT_SPACE_BAR=$MY_MACOS_STRING
+ SPACE_BAR_HINT="Linux"
+ else
+ #yaboot is the default
+ MY_STRING_WITH_SPACE_BAR=$MY_MACOS_STRING
+ MY_STRING_WITHOUT_SPACE_BAR=$MY_YABOOT_STRING
+ SPACE_BAR_HINT="MacOS"
+ fi
+ # 1 is the timeout
+ cat <<-EOF
+ " "(0C)" fb8-write drop
+ " "(0d 0a)" fb8-write drop
+ " "(0d 0a)" fb8-write drop
+ " "(0d 0a)" fb8-write drop
+ " "(0d 0a)" fb8-write drop
+ " "(0d 0a)" fb8-write drop
+ " "(0d 0a)" fb8-write drop
+ " "(0d 0a)" fb8-write drop
+ " "(0d 0a)" fb8-write drop
+ " "(0d 0a)" fb8-write drop
+ " "(0d 0a)" fb8-write drop
+ " "(09) press space to boot $SPACE_BAR_HINT ... " fb8-write drop
+ get-msecs d# 3 3E8 * +
+ begin
+ key? if
+ key case
+ hex 20 of $MY_STRING_WITH_SPACE_BAR endof
+ endcase
+ then
+ dup get-msecs <
+ until
+ drop
+ $MY_STRING_WITHOUT_SPACE_BAR
+ echo
+ EOF
+ else
+ cat <<-EOF
+ " "(0d 0a)" fb8-write drop
+ " Booting Yaboot ..." cr " boot $BOOT_DEVICEPATH,\\\\yaboot" eval
+ EOF
fi
- done
- )
- MY_YABOOT_STRING="\" Booting Yaboot ...\" cr \" boot $BOOT_DEVICEPATH,\\\\yaboot\" eval "
- if [ "$OPTION_DEFAULT" = "macos" -o "$OPTION_DEFAULT" = "macosx" ] ; then
- # macos or macosx is the default
- MY_STRING_WITH_SPACE_BAR=$MY_YABOOT_STRING
- MY_STRING_WITHOUT_SPACE_BAR=$MY_MACOS_STRING
- SPACE_BAR_HINT="linux"
- else
- #yaboot is the default
- MY_STRING_WITH_SPACE_BAR=$MY_MACOS_STRING
- MY_STRING_WITHOUT_SPACE_BAR=$MY_YABOOT_STRING
- SPACE_BAR_HINT="MacOS"
- fi
- # 1 is the timeout
- echo "\" \"(0C)\" fb8-write drop"
- echo "\" \"(0d 0a)\" fb8-write drop"
- echo "\" \"(0d 0a)\" fb8-write drop"
- echo "\" \"(0d 0a)\" fb8-write drop"
- echo "\" \"(0d 0a)\" fb8-write drop"
- echo "\" \"(0d 0a)\" fb8-write drop"
- echo "\" \"(0d 0a)\" fb8-write drop"
- echo "\" \"(0d 0a)\" fb8-write drop"
- echo "\" \"(0d 0a)\" fb8-write drop"
- echo "\" \"(0d 0a)\" fb8-write drop"
- echo "\" \"(0d 0a)\" fb8-write drop"
- echo "\" \"(09) press space to boot $SPACE_BAR_HINT ... \" fb8-write drop"
- echo "get-msecs d# 3 3E8 * +"
- echo "begin"
- echo " key? if"
- echo " key case"
- echo -n " hex 20 of "
- echo " $MY_STRING_WITH_SPACE_BAR endof"
- echo " endcase"
- echo " then"
- echo " dup get-msecs <"
- echo "until"
- echo "drop"
- echo $MY_STRING_WITHOUT_SPACE_BAR
- echo
else
- echo "\" \"(0d 0a)\" fb8-write drop"
- echo -e "\n\" Booting Yaboot ...\" cr \" boot $BOOT_DEVICEPATH,\\\\\\yaboot\" eval"
+ cat <<-EOF
+ dev /chosen 0 0 " yaboot,do-not-open-screen" property device-end
+ load $BOOT_DEVICEPATH,\\\\yaboot
+ go
+ EOF
fi
echo "</BOOT-SCRIPT>"
cat /lib/lilo/pmac/os-badge-icon
@@ -258,14 +272,9 @@
hattrib -t FNDR -c MACS Finder
hattrib -t zsys -c MACS System
hattrib -t TEXT -c "R*ch" yaboot.conf
- if [ "$OPTION_NO_OS_CHOOSER" = "yes" ] ; then
- hattrib -t tbxi -c chrp yaboot
- hattrib -t TEXT -c "R*ch" os-chooser 2>/dev/null
- else
- hcopy $TEMP/os-chooser :os-chooser
- hattrib -t BINA -c UNIX yaboot
- hattrib -t tbxi -c chrp os-chooser
- fi
+ hcopy $TEMP/os-chooser :os-chooser
+ hattrib -t BINA -c UNIX yaboot
+ hattrib -t tbxi -c chrp os-chooser
for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
test -z "${CONFIG_IMAGE_OTHER[$i]}" || continue
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.17/lilo.new new/lilo-10.1.18/lilo.new
--- old/lilo-10.1.17/lilo.new 2006-10-24 22:34:04.000000000 +0200
+++ new/lilo-10.1.18/lilo.new 2006-10-30 14:07:26.000000000 +0100
@@ -1,5 +1,5 @@
#! /bin/bash
-# $Id: lilo.new 837 2006-10-24 20:34:04Z olh $
+# $Id: lilo.new 846 2006-10-30 13:07:26Z olh $
#
# a simple lilo to store the boot loader and the kernel images
# in bash2 ... Think different [tm]
@@ -38,7 +38,7 @@
DEFAULT_BOOTFOLDER=suseboot
TEMP="${TMPDIR:-/tmp}/ppc_lilo"
MACHINE=
-OPTION_NO_OS_CHOOSER=yes
+OPTION_USE_OS_CHOOSER=yes
_sysfs_mounted=
_proc_mounted=
@@ -66,7 +66,7 @@
function Usage() {
cat < yaboot-10.1.18-r849.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.17-r836/Changelog.SuSE new/yaboot-10.1.18-r849/Changelog.SuSE
--- old/yaboot-10.1.17-r836/Changelog.SuSE 2006-10-24 22:57:24.000000000 +0200
+++ new/yaboot-10.1.18-r849/Changelog.SuSE 2006-10-30 16:57:10.000000000 +0100
@@ -1,4 +1,47 @@
------------------------------------------------------------------------
+r849 | olh | 2006-10-30 15:53:10 +0000 (Mon, 30 Oct 2006) | 1 line
+Changed paths:
+ M /trunk/yaboot/include/prom.h
+ M /trunk/yaboot/second/prom.c
+
+prom_set_chosen gets also a const buffer
+------------------------------------------------------------------------
+r848 | olh | 2006-10-30 14:08:18 +0000 (Mon, 30 Oct 2006) | 3 lines
+Changed paths:
+ M /trunk/lilo/lilo-pmac.lib
+ M /trunk/lilo.changes
+ M /trunk/yaboot/second/prom.c
+
++- let yaboot run 'output-device output' if no yaboot,do-not-open-screen
++ exists, or if yaboot,do-open-screen property exists in /chosen
+
+------------------------------------------------------------------------
+r847 | olh | 2006-10-30 13:11:03 +0000 (Mon, 30 Oct 2006) | 1 line
+Changed paths:
+ M /trunk/yaboot/second/prom.c
+
+open /chosen earlier in yaboot
+------------------------------------------------------------------------
+r840 | olh | 2006-10-29 20:13:41 +0000 (Sun, 29 Oct 2006) | 2 lines
+Changed paths:
+ M /trunk/lilo/bootheader/chrp/of1275_setprop.c
+ M /trunk/lilo/bootheader/include/prom.h
+ M /trunk/lilo.changes
+ M /trunk/yaboot/include/prom.h
+ M /trunk/yaboot/second/prom.c
+
++- setprop takes a const *buf
+
+------------------------------------------------------------------------
+r839 | olh | 2006-10-27 11:12:28 +0000 (Fri, 27 Oct 2006) | 2 lines
+Changed paths:
+ M /trunk/lilo.changes
+ M /trunk/yaboot/Makefile
+ M /trunk/yaboot/second/yaboot.c
+
++- move and resize the yaboot internal malloc area (215616)
+
+------------------------------------------------------------------------
r836 | olh | 2006-10-24 20:22:02 +0000 (Tue, 24 Oct 2006) | 2 lines
Changed paths:
M /trunk/lilo.changes
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.17-r836/Makefile new/yaboot-10.1.18-r849/Makefile
--- old/yaboot-10.1.17-r836/Makefile 2006-10-24 22:57:24.000000000 +0200
+++ new/yaboot-10.1.18-r849/Makefile 2006-10-30 16:57:11.000000000 +0100
@@ -6,7 +6,7 @@
include Config
-VERSION = 10.1.17-r836
+VERSION = 10.1.18-r849
# Debug mode (spam/verbose)
DEBUG = 0
# make install vars
@@ -16,13 +16,6 @@
# command used to get root (needed for tarball creation)
GETROOT = fakeroot
-# We use fixed addresses to avoid overlap when relocating
-# and other trouble with initrd
-
-# Malloc block at 3Mb -> 4Mb
-MALLOCADDR = 0x300000
-MALLOCSIZE = 0x100000
-
# Set this to the prefix of your cross-compiler, if you have one.
# Else leave it empty.
#
@@ -34,7 +27,6 @@
YBCFLAGS += -g
YBCFLAGS += -mcpu=powerpc
YBCFLAGS += -DVERSION=\"${VERSION}\" #"
-YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE)
YBCFLAGS += -I ./include
ifneq ($(DEBUG),0)
YBCFLAGS += -DDEBUG=$(DEBUG)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.17-r836/include/prom.h new/yaboot-10.1.18-r849/include/prom.h
--- old/yaboot-10.1.17-r836/include/prom.h 2006-10-24 22:13:22.000000000 +0200
+++ new/yaboot-10.1.18-r849/include/prom.h 2006-10-30 16:53:10.000000000 +0100
@@ -94,7 +94,7 @@
prom_handle prom_findpackage(const char *path);
int prom_getproplen(prom_handle dev, const char *name);
int prom_getprop(prom_handle dev, const char *name, void *buf, int len);
-int prom_setprop(prom_handle dev, const char *name, void *buf, int len);
+int prom_setprop(prom_handle dev, const char *name, const void *buf, int len);
enum device_type prom_get_devtype(const char *device);
/* misc */
@@ -106,7 +106,7 @@
int prom_interpret(const char *forth);
int prom_get_chosen(const char *name, void *mem, int len);
-int prom_set_chosen(const char *name, void *mem, int len);
+int prom_set_chosen(const char *name, const void *mem, int len);
extern int prom_getms(void);
extern void prom_pause(void);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.17-r836/second/prom.c new/yaboot-10.1.18-r849/second/prom.c
--- old/yaboot-10.1.17-r836/second/prom.c 2006-10-24 22:22:02.000000000 +0200
+++ new/yaboot-10.1.18-r849/second/prom.c 2006-10-30 16:53:10.000000000 +0100
@@ -155,7 +155,7 @@
return (int)call_prom("getprop", 4, 1, pack, name, mem, len);
}
-int prom_setprop(prom_handle pack, const char *name, void *mem, int len)
+int prom_setprop(prom_handle pack, const char *name, const void *mem, int len)
{
return (int)call_prom("setprop", 4, 1, pack, name, mem, len);
}
@@ -201,7 +201,7 @@
return prom_getprop(prom_chosen, name, mem, len);
}
-int prom_set_chosen(const char *name, void *mem, int len)
+int prom_set_chosen(const char *name, const void *mem, int len)
{
return prom_setprop(prom_chosen, name, mem, len);
}
@@ -244,37 +244,17 @@
}
}
-static int screen_connected(const char *path)
+static int open_output_device(void)
{
- if (prom_getproplen(prom_finddevice(path), "iso6429-1983-colors") >= 0)
- return 1;
- return 0;
-}
-
-static int find_screen(void)
-{
- char screen_path[128];
- int len;
+ int ret;
- len = prom_getprop(prom_finddevice("/aliases"), "screen", screen_path, sizeof(screen_path) - 1);
- if (len > 5 && len < sizeof(screen_path)) {
- screen_path[len] = '\0';
- len = strlen(screen_path);
- if (screen_connected(screen_path))
- return 1;
- if (screen_path[len - 2] == '@') {
- if (screen_path[len - 3] == 'A') {
- screen_path[len - 3] = 'B';
- screen_path[len - 1] = '1';
- return screen_connected(screen_path);
- } else if (screen_path[len - 3] == 'B') {
- screen_path[len - 3] = 'A';
- screen_path[len - 1] = '0';
- return screen_connected(screen_path);
- }
- }
- }
- return 0;
+ ret = prom_get_chosen("yaboot,do-open-screen", &ret, sizeof(ret));
+ if (ret >= 0)
+ return 1;
+ ret = prom_get_chosen("yaboot,do-not-open-screen", &ret, sizeof(ret));
+ if (ret >= 0)
+ return 0;
+ return 1;
}
void prom_init(prom_entry pp)
@@ -284,6 +264,10 @@
prom = pp;
+ prom_chosen = prom_finddevice("/chosen");
+ if (prom_chosen == (void *)-1)
+ prom_exit();
+
/* this must be done before looking for stdout, for whatever reason */
len = prom_getprop(prom_finddevice("/"), "compatible", cmptbl, sizeof(cmptbl) - 1);
if (len > 0 && len < sizeof(cmptbl)) {
@@ -293,13 +277,10 @@
cmptbl[len] = ' ';
}
/* G5 with nvidia card crash when no monitor is connected */
- if (strstr(cmptbl, "MacRISC") && find_screen())
+ if (strstr(cmptbl, "MacRISC") && open_output_device())
prom_interpret("output-device output");
}
- prom_chosen = prom_finddevice("/chosen");
- if (prom_chosen == (void *)-1)
- prom_exit();
prom_openprom = prom_finddevice("/openprom");
if (prom_openprom != (void *)-1)
get_openprom_build_date();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.17-r836/second/yaboot.c new/yaboot-10.1.18-r849/second/yaboot.c
--- old/yaboot-10.1.17-r836/second/yaboot.c 2006-09-22 23:05:49.000000000 +0200
+++ new/yaboot-10.1.18-r849/second/yaboot.c 2006-10-27 13:12:28.000000000 +0200
@@ -65,6 +65,8 @@
#define _ALIGN(addr,size) (((addr)+size-1)&(~(size-1)))
#define MAX_HEADERS 32
+#define MALLOCADDR ((2 * 1024 * 1024) + (512 * 1024))
+#define MALLOCSIZE ((1 * 1024 * 1024) + (512 * 1024))
#define CLAIM_END (128 * 1024 * 1024) /* FIXME: look at /memory/available */
typedef struct {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org