diff options
| author | Neil Chen <neilc@nvidia.com> | 2014-04-02 15:38:09 +0800 |
|---|---|---|
| committer | Marc Jones <marc.jones@se-eng.com> | 2014-12-15 20:11:34 +0100 |
| commit | 83cbeda88dbfdd9717cf8124cc863abffb5f516b (patch) | |
| tree | 1e6de4605b61de96d9effe764a5fb11961962d9d /src/mainboard/google/nyan | |
| parent | 164ac0a4299f26b6705ff293af87b57575434108 (diff) | |
| download | coreboot-83cbeda88dbfdd9717cf8124cc863abffb5f516b.tar.xz | |
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 in DOS format (CR+LF).
Modify cfg2inc to support DOS format cfg file by removing carriage return symbols from the end of each line.
BUG=chrome-os-partner:27614
TEST=sudo cfg2inc.sh XXX.cfg # make a expected inc file
BRANCH=nyan
Signed-off-by: Neil Chen <neilc@nvidia.com>
Original-Change-Id: I68b0f4b3805fcb5a6b633653c95afbafcb880a93
Original-Reviewed-on: https://chromium-review.googlesource.com/192697
Original-Tested-by: Neil Chen <neilc@nvidia.com>
Original-Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Original-Commit-Queue: Neil Chen <neilc@nvidia.com>
(cherry picked from commit 38e90ab0d9110d3ede39c70e27961b833813a7d4)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Change-Id: I30737600fa8ac12a45ad0fbc6086a624993794e7
Reviewed-on: http://review.coreboot.org/7741
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard/google/nyan')
| -rwxr-xr-x | src/mainboard/google/nyan/bct/cfg2inc.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mainboard/google/nyan/bct/cfg2inc.sh b/src/mainboard/google/nyan/bct/cfg2inc.sh index 6d0c7a8eaf..a9c629b523 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}" } |