Author: quozl Date: Wed Jun 5 04:32:41 2013 New Revision: 3667 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3667 Log: OLPC - check for a NUL before removing it from the SN tag search result, because otherwise an SN tag with zero length may prevent normal boot. #12695 Modified: cpu/arm/olpc/build-fw.fth cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/via/devices.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Mon May 27 09:59:11 2013 (r3666) +++ cpu/arm/olpc/build-fw.fth Wed Jun 5 04:32:41 2013 (r3667) @@ -348,9 +348,7 @@ " OLPC " encode-bytes 2swap encode-string encode+ " banner-name" property board-revision " board-revision-int" integer-property compatible$ " compatible" string-property - - \ The "1-" removes the null byte - " SN" find-tag if 1- else " Unknown" then " serial-number" string-property + " SN" find-tag if ?-null else " Unknown" then " serial-number" string-property ec-api-ver@ " ec-version" integer-property Modified: cpu/x86/pc/olpc/devices.fth ============================================================================== --- cpu/x86/pc/olpc/devices.fth Mon May 27 09:59:11 2013 (r3666) +++ cpu/x86/pc/olpc/devices.fth Wed Jun 5 04:32:41 2013 (r3667) @@ -354,8 +354,7 @@ model-name$ 2dup model ( name$ ) " OLPC " encode-bytes 2swap encode-string encode+ " banner-name" property board-revision " board-revision-int" integer-property - \ The "1-" removes the null byte - " SN" find-tag if 1- else " Unknown" then " serial-number" string-property + " SN" find-tag if ?-null else " Unknown" then " serial-number" string-property 8 ec-cmd-b@ dup " ec-version" integer-property \ EC code API 56 and greater changes the version numbering Modified: cpu/x86/pc/olpc/via/devices.fth ============================================================================== --- cpu/x86/pc/olpc/via/devices.fth Mon May 27 09:59:11 2013 (r3666) +++ cpu/x86/pc/olpc/via/devices.fth Wed Jun 5 04:32:41 2013 (r3667) @@ -322,8 +322,7 @@ model-name$ 2dup model ( name$ ) " OLPC " encode-bytes 2swap encode-string encode+ " banner-name" property board-revision " board-revision-int" integer-property - \ The "1-" removes the null byte - " SN" find-tag if 1- else " Unknown" then " serial-number" string-property + " SN" find-tag if ?-null else " Unknown" then " serial-number" string-property 8 ec-cmd-b@ dup " ec-version" integer-property \ EC code API 56 and greater changes the version numbering