diff options
author | Vadim Bendebury <vbendeb@chromium.org> | 2017-01-31 22:13:13 -0800 |
---|---|---|
committer | Vadim Bendebury <vbendeb@chromium.org> | 2017-02-01 06:36:18 +0000 |
commit | 11704ae6e9c35889ed1ec97bdaa9d42652397867 (patch) | |
tree | 12f7d873426f43c5c3d8ed84e7b7b7f1d20b199d /core | |
parent | 9fc399a0aaa4a12591907b498d4826a35fe4a806 (diff) | |
download | chrome-ec-11704ae6e9c35889ed1ec97bdaa9d42652397867.tar.gz |
Revert "version: Store image size data in version struct"
This is a dependency of the uderlyaing patch which breaks header
composition of g chip based boards.
This reverts commit 7cbb815732d7434f5985d3b50a869aa71ba5c507.
Change-Id: I4d94647cf5cb09fd338e5a581c956df6b5d83081
Reviewed-on: https://chromium-review.googlesource.com/435551
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
Tested-by: Vadim Bendebury <vbendeb@chromium.org>
Diffstat (limited to 'core')
-rw-r--r-- | core/cortex-m/ec.lds.S | 8 | ||||
-rw-r--r-- | core/cortex-m0/ec.lds.S | 4 | ||||
-rw-r--r-- | core/nds32/ec.lds.S | 2 |
3 files changed, 3 insertions, 11 deletions
diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S index 803845c5a6..90212a5389 100644 --- a/core/cortex-m/ec.lds.S +++ b/core/cortex-m/ec.lds.S @@ -79,7 +79,7 @@ SECTIONS #endif STRINGIFY(OUTDIR/core/CORE/init.o) (.text.vecttable) . = ALIGN(4); - __image_data_offset = .; + __version_struct_offset = .; KEEP(*(.rodata.ver)) . = ALIGN(4); @@ -357,12 +357,6 @@ SECTIONS ) >= (LOADADDR(.data) + SIZEOF(.data) - FW_OFF(SECTION)), "No room left in the flash") -#if defined(SECTION_IS_RO) && defined(NPCX_RO_HEADER) - __image_size = __hey_flash_used - FW_SIZE(RO_HDR); -#else - __image_size = __hey_flash_used; -#endif - #ifdef CONFIG_USB_RAM_SIZE .usb_ram (NOLOAD) : { __usb_ram_start = .; diff --git a/core/cortex-m0/ec.lds.S b/core/cortex-m0/ec.lds.S index ee65cb31ce..6102bfa973 100644 --- a/core/cortex-m0/ec.lds.S +++ b/core/cortex-m0/ec.lds.S @@ -41,7 +41,7 @@ SECTIONS .text : { STRINGIFY(OUTDIR/core/CORE/init.o) (.text.vecttable) . = ALIGN(4); - __image_data_offset = .; + __version_struct_offset = .; KEEP(*(.rodata.ver)) . = ALIGN(4); @@ -245,8 +245,6 @@ SECTIONS ) >= (LOADADDR(.data) + SIZEOF(.data) - FW_OFF(SECTION)), "No room left in the flash") - __image_size = __hey_flash_used; - #ifdef CONFIG_USB_RAM_SIZE .usb_ram (NOLOAD) : { __usb_ram_start = .; diff --git a/core/nds32/ec.lds.S b/core/nds32/ec.lds.S index 978f652815..1f125243c9 100644 --- a/core/nds32/ec.lds.S +++ b/core/nds32/ec.lds.S @@ -36,7 +36,7 @@ SECTIONS "__flash_dma_start has to be 4k-byte aligned"); KEEP(STRINGIFY(OUTDIR/core/CORE/init.o) (.text.vecttable)) . = ALIGN(4); - __image_data_offset = .; + __version_struct_offset = .; KEEP(*(.rodata.ver)) . = ALIGN(4); KEEP(STRINGIFY(OUTDIR/core/CORE/init.o) (.text.vectirq)) |