diff options
author | Shawn Nematbakhsh <shawnn@chromium.org> | 2016-06-02 14:34:09 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2016-06-03 03:00:08 -0700 |
commit | 0e532c6044e068c3929a0407c31893e0070e1196 (patch) | |
tree | cc0d252f663af2fc55f9b1f86aaeaf587e62ecf3 | |
parent | 82c803d93b6908adca93c88b70012b58db640d71 (diff) | |
download | chrome-ec-0e532c6044e068c3929a0407c31893e0070e1196.tar.gz |
cleanup: Remove SHIFT_CODE_FOR_TEST handling
SHIFT_CODE_FOR_TEST images were used for an old FAFT test but is no
longer in use today.
BUG=chromium:616806
BRANCH=None
TEST=`make buildall -j`
CQ-DEPEND=CL:349281
Change-Id: I1b4e8c2560e2a7ff507cf2275dbbbdabf435866b
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/349272
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Tom Tam <waihong@google.com>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
-rw-r--r-- | core/cortex-m/ec.lds.S | 4 | ||||
-rw-r--r-- | core/cortex-m0/ec.lds.S | 4 | ||||
-rw-r--r-- | core/nds32/ec.lds.S | 4 | ||||
-rwxr-xr-x | util/getversion.sh | 4 |
4 files changed, 0 insertions, 16 deletions
diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S index 6beb007dba..bdaf382a55 100644 --- a/core/cortex-m/ec.lds.S +++ b/core/cortex-m/ec.lds.S @@ -85,11 +85,7 @@ SECTIONS . = ALIGN(4); KEEP(*(.rodata.pstate)) -#ifdef SHIFT_CODE_FOR_TEST - . = ALIGN(256); -#else . = ALIGN(4); -#endif STRINGIFY(OUTDIR/core/CORE/init.o) (.text) *(.text*) #ifdef CONFIG_EXTERNAL_STORAGE diff --git a/core/cortex-m0/ec.lds.S b/core/cortex-m0/ec.lds.S index 602374404a..429c52ae34 100644 --- a/core/cortex-m0/ec.lds.S +++ b/core/cortex-m0/ec.lds.S @@ -47,11 +47,7 @@ SECTIONS . = ALIGN(4); KEEP(*(.rodata.pstate)) -#ifdef SHIFT_CODE_FOR_TEST - . = ALIGN(256); -#else . = ALIGN(4); -#endif STRINGIFY(OUTDIR/core/CORE/init.o) (.text) *(.text*) } > FLASH diff --git a/core/nds32/ec.lds.S b/core/nds32/ec.lds.S index 4f217d66b3..0d91c6d6e4 100644 --- a/core/nds32/ec.lds.S +++ b/core/nds32/ec.lds.S @@ -32,11 +32,7 @@ SECTIONS . = ALIGN(4); __version_struct_offset = .; KEEP(*(.rodata.ver)) -#ifdef SHIFT_CODE_FOR_TEST - . = ALIGN(256); -#else . = ALIGN(4); -#endif KEEP(STRINGIFY(OUTDIR/core/CORE/init.o) (.text.vectirq)) KEEP(STRINGIFY(OUTDIR/core/CORE/init.o) (.text)) *(.text*) diff --git a/util/getversion.sh b/util/getversion.sh index 811abfdf47..abf99eb186 100755 --- a/util/getversion.sh +++ b/util/getversion.sh @@ -40,11 +40,7 @@ ver="${BOARD}_${vbase}" echo "/* This file is generated by util/getversion.sh */" echo "/* Version string for use by common/version.c */" -echo "#ifdef SHIFT_CODE_FOR_TEST" -echo "#define CROS_EC_VERSION \"${ver}_shift\"" -echo "#else" echo "#define CROS_EC_VERSION \"${ver}\"" -echo "#endif" echo "/* Version string, truncated to 31 chars (+ terminating null = 32) */" echo "#define CROS_EC_VERSION32 \"${ver:0:31}\"" |