[coreboot-gerrit] New patch to review for coreboot: 90a469f nyan*: Fix unexpected symbol (CR) when converting DOS-formatted BCT config.

[Marc Jones (marc.jones@se-eng.com)]

Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7741

-gerrit

commit 90a469fea66edeae204aa963e8ef2d6a65f16caf
Author: Neil Chen <neilc at nvidia.com>
Date:   Wed Apr 2 15:38:09 2014 +0800

    nyan*: Fix unexpected symbol (CR) when converting DOS-formatted BCT config.
    
    There are some unexpected symbol at the end of each line in the
    generated .inc file when the config file is DOS format (CR+LF).
    Modify cfg2inc to support DOS format cfg file.
    
    BUG=chrome-os-partner:27614
    TEST=sudo cfg2inc.sh XXX.cfg # make a expected inc file
    
    BRANCH=nyan
    Signed-off-by: Neil Chen <neilc at nvidia.com>
    
    Original-Change-Id: I68b0f4b3805fcb5a6b633653c95afbafcb880a93
    Original-Reviewed-on: https://chromium-review.googlesource.com/192697
    Original-Tested-by: Neil Chen <neilc at nvidia.com>
    Original-Reviewed-by: Hung-Te Lin <hungte at chromium.org>
    Original-Commit-Queue: Neil Chen <neilc at nvidia.com>
    (cherry picked from commit 38e90ab0d9110d3ede39c70e27961b833813a7d4)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: I30737600fa8ac12a45ad0fbc6086a624993794e7
---
 src/mainboard/google/nyan/bct/cfg2inc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mainboard/google/nyan/bct/cfg2inc.sh b/src/mainboard/google/nyan/bct/cfg2inc.sh
index 6d0c7a8..a9c629b 100755
--- a/src/mainboard/google/nyan/bct/cfg2inc.sh
+++ b/src/mainboard/google/nyan/bct/cfg2inc.sh
@@ -23,7 +23,7 @@ bct_cfg2inc() {
 	echo "{ /* generated from ${in_file}; do not edit. */" >"${out_file}"
 	# Note currently we can only handle DDR3 type memory, even in C
 	# implementation.
-	sed "/^#.*$/d; s/^SDRAM.0./  /; s/;$/,/;" \
+	sed "/^#.*$/d; s/^SDRAM.0./  /; s/\r$//; s/;$/,/;" \
 		"${in_file}" >> "${out_file}"
 	echo "}," >>"${out_file}"
 }