April 2007 - OpenBIOS - mail.coreboot.org

r119 - openbios-devel/drivers
by svn＠openbios.org April 9, 2007

April 9, 2007

Author: stepan Date: 2007-04-09 14:19:41 +0200 (Mon, 09 Apr 2007) New Revision: 119 Modified: openbios-devel/drivers/obio.c Log: fix from blueswirl Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-04-09 12:17:51 UTC (rev 118) +++ openbios-devel/drivers/obio.c 2007-04-09 12:19:41 UTC (rev 119) @@ -341,7 +341,8 @@ kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; size = nv_info.cmdline_size; - if (size > OBIO_CMDLINE_MAX) size = OBIO_CMDLINE_MAX; + if (size > OBIO_CMDLINE_MAX - 1) + size = OBIO_CMDLINE_MAX - 1; memcpy(obio_cmdline, nv_info.cmdline, size); obio_cmdline[size] = '\0'; cmdline = obio_cmdline;

1 0

[Patch] to fix XSLT build issue
by Alex Owen April 9, 2007

April 9, 2007

Hi I was having a problem compiling openbios on the lastest debian release. I thought it may have been a problem with the xsltproc version in debian... however the debian maintainer Mike Hommey tells me that the issue is in the openbios code. He has generated a patch which I am forwarding (attached) which he tells me fixes the openbios XSLT. Regards Alex Owen ---------- Forwarded message ---------- From: Mike Hommey <mh(a)glandium.org> Date: 08-Apr-2007 17:02 Subject: Re: Bug#401337: test case for error "Unexpected XSLT element 'param'" To: Alex Owen <r.alex.owen(a)gmail.com>, 401337-done(a)bugs.debian.org Cc: Nicolas Haller <nicolas(a)boiteameuh.org> On Fri, Feb 23, 2007 at 09:32:48PM +0000, Alex Owen <r.alex.owen(a)gmail.com> wrote: > Sorry missed a line: > > >mkdir /var/tmp/testcase > >cd /var/tmp/testcase > >svn co svn://openbios.org/openbios/openbios-devel -r 113 > >cd openbios-devel > config/scripts/switch-arch x86 > >make xml > >###output starts### > >Cleaning up... ok > >Initializing build tree...ok. > >Creating target Makefile...warning: failed to load external entity > >"rules.xml" > >runtime error: file config/xml/dictionary.xsl line 13 element param > >Unexpected XSLT element 'param'. > >runtime error: file config/xml/dictionary.xsl line 22 element if > >Variable 'conditions' has not been declared. > >make: *** [xml] Error 10 > >###output ends### Okay, I have been able to reproduce the bug... and it's not a bug. The reason why it didn't fail before is that previous versions of libxslt were lax on xsl:param. You are using xsl:param where xsl:variable is to be used. xsl:param can only be top-level or a direct child of an xsl:template. Attached here is a diff to fix openbios-devel's xsl stylesheet. With this patch applied, it works with xsltproc from etch. Mike

2 1

r118 - openbios-devel/config/xml
by svn＠openbios.org April 9, 2007

April 9, 2007

Author: stepan Date: 2007-04-09 14:17:51 +0200 (Mon, 09 Apr 2007) New Revision: 118 Modified: openbios-devel/config/xml/dictionary.xsl openbios-devel/config/xml/object.xsl openbios-devel/config/xml/util.xsl Log: fixes for xslt sheets from Mike Hommey <mh(a)glandium.org>, reported by Alex Owen <r.alex.owen(a)gmail.com> Modified: openbios-devel/config/xml/dictionary.xsl =================================================================== --- openbios-devel/config/xml/dictionary.xsl 2007-04-07 09:37:28 UTC (rev 117) +++ openbios-devel/config/xml/dictionary.xsl 2007-04-09 12:17:51 UTC (rev 118) @@ -10,14 +10,14 @@ <xsl:for-each select="//dictionary"> <xsl:sort select="@name"/> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions = 0"> @@ -31,26 +31,26 @@  <xsl:for-each select="//dictionary/object"> - <xsl:param name="path"> + <xsl:variable name="path"> <xsl:for-each select="ancestor::build"> <xsl:call-template name="get-dirname"> <xsl:with-param select="@base" name="path"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> - <xsl:param name="dictname"> + <xsl:variable name="dictname"> <xsl:value-of select="parent::*/@name"/> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY:=$(</xsl:text> @@ -68,22 +68,22 @@ <xsl:for-each select="//dictionary"> <xsl:sort select="@name"/> - <xsl:param name="outer-conditions"> + <xsl:variable name="outer-conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$outer-conditions = 0"> <xsl:if test="not(preceding::dictionary/@name = @name)"> - <xsl:param name="name"><xsl:value-of select="@name"/></xsl:param> - <xsl:param name="init"> + <xsl:variable name="name"><xsl:value-of select="@name"/></xsl:variable> + <xsl:variable name="init"> <xsl:value-of select="(//dictionary[@name=$name]/attribute::init)[last()]"/> - </xsl:param> + </xsl:variable>  <xsl:text>$(ODIR)/</xsl:text> <xsl:value-of select="@name"/><xsl:text>.dict: $(</xsl:text> @@ -97,22 +97,22 @@ <xsl:text>	$(ODIR)/forthstrap</xsl:text> <xsl:for-each select="//dictionary[@name = @name]"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> - <xsl:param name="path"> + <xsl:variable name="path"> <xsl:for-each select="ancestor::build"> <xsl:call-template name="get-dirname"> <xsl:with-param select="@base" name="path"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions = 0"> <xsl:text> -I</xsl:text> @@ -139,14 +139,14 @@ <xsl:for-each select="//dictionary"> <xsl:sort select="@name"/> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions = 0"> Modified: openbios-devel/config/xml/object.xsl =================================================================== --- openbios-devel/config/xml/object.xsl 2007-04-07 09:37:28 UTC (rev 117) +++ openbios-devel/config/xml/object.xsl 2007-04-09 12:17:51 UTC (rev 118) @@ -24,22 +24,22 @@  <xsl:for-each select="//object[(ancestor-or-self::*)[@target = $target]]"> - <xsl:param name="path"> + <xsl:variable name="path"> <xsl:for-each select="ancestor::build"> <xsl:call-template name="get-dirname"> <xsl:with-param select="@base" name="path"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> @@ -78,14 +78,14 @@  <xsl:for-each select="//executable"> - <xsl:param name="outer-conditions"> + <xsl:variable name="outer-conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$outer-conditions = 0"> <xsl:if test="(ancestor-or-self::*)[@target = $target]"> @@ -98,24 +98,24 @@  <xsl:for-each select="object"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> - <xsl:param name="path"> + <xsl:variable name="path"> <xsl:for-each select="ancestor::build"> <xsl:call-template name="get-dirname"> <xsl:with-param select="@base" name="path"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:text> $(ODIR)/</xsl:text> <xsl:value-of select="$target"/> @@ -130,14 +130,14 @@  <xsl:for-each select="external-object"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> <xsl:text> $(ODIR)/</xsl:text> @@ -166,14 +166,14 @@ <xsl:for-each select="//library"> <xsl:sort select="@name"/> - <xsl:param name="outer-conditions"> + <xsl:variable name="outer-conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$outer-conditions = 0"> @@ -196,29 +196,29 @@ </xsl:choose> <xsl:text>: </xsl:text> - <xsl:param name="name"><xsl:value-of select="@name"/></xsl:param> + <xsl:variable name="name"><xsl:value-of select="@name"/></xsl:variable>  <xsl:for-each select="//library[@name=$name]/object"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> - <xsl:param name="path"> + <xsl:variable name="path"> <xsl:for-each select="ancestor::build"> <xsl:call-template name="get-dirname"> <xsl:with-param select="@base" name="path"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:text>$(ODIR)/</xsl:text> <xsl:value-of select="$target"/> @@ -234,14 +234,14 @@  <xsl:for-each select="external-object"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> <xsl:text> $(ODIR)/</xsl:text> @@ -267,14 +267,14 @@ <xsl:for-each select="//library"> <xsl:if test="object[(ancestor-or-self::*)[@target = $target]]"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> <xsl:text> $(ODIR)/</xsl:text> <xsl:text>lib</xsl:text> @@ -300,14 +300,14 @@ <xsl:for-each select="//executable"> <xsl:if test="(ancestor-or-self::*)[@target = $target]"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> <xsl:text> $(ODIR)/</xsl:text> <xsl:value-of select="@name"/> Modified: openbios-devel/config/xml/util.xsl =================================================================== --- openbios-devel/config/xml/util.xsl 2007-04-07 09:37:28 UTC (rev 117) +++ openbios-devel/config/xml/util.xsl 2007-04-09 12:17:51 UTC (rev 118) @@ -44,8 +44,8 @@ <xsl:choose> <xsl:when test="$expression!=''"> - <xsl:param name="value"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::value"/></xsl:param> - <xsl:param name="type"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::type"/></xsl:param> + <xsl:variable name="value"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::value"/></xsl:variable> + <xsl:variable name="type"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::type"/></xsl:variable> <xsl:choose> <xsl:when test="$type='boolean'"> <xsl:choose>

1 0

Re: [OpenBIOS] r117 - openbios-devel/drivers
by Segher Boessenkool April 7, 2007

April 7, 2007

> if (size > OBIO_CMDLINE_MAX) size = OBIO_CMDLINE_MAX; > memcpy(obio_cmdline, nv_info.cmdline, size); > - obio_cmdline[size-1] = '\0'; > + obio_cmdline[size] = '\0'; Looks like you need to change the declaration of "obio_cmdline[]" or the maximum value "size" is clamped to, as well? Segher

1 0

r117 - openbios-devel/drivers
by svn＠openbios.org April 7, 2007

April 7, 2007

Author: stepan Date: 2007-04-07 11:37:28 +0200 (Sat, 07 Apr 2007) New Revision: 117 Modified: openbios-devel/drivers/obio.c Log: boot fix from blueswirl. Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-03-23 17:00:01 UTC (rev 116) +++ openbios-devel/drivers/obio.c 2007-04-07 09:37:28 UTC (rev 117) @@ -340,11 +340,10 @@ } kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; - - size = cmdline_size; + size = nv_info.cmdline_size; if (size > OBIO_CMDLINE_MAX) size = OBIO_CMDLINE_MAX; memcpy(obio_cmdline, nv_info.cmdline, size); - obio_cmdline[size-1] = '\0'; + obio_cmdline[size] = '\0'; cmdline = obio_cmdline; cmdline_size = size;

1 0

OpenBIOS Sparc32 boot fix
by Blue Swirl April 7, 2007

April 7, 2007

Hi, Current version can't boot the test images from Qemu, because the command line is truncated. Boot is fixed with the attached patch, please apply. _________________________________________________________________ FREE pop-up blocking with the new MSN Toolbar - get it now! http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/

1 0