diff options
| author | Vic Yang <victoryang@chromium.org> | 2012-02-16 13:07:32 -0800 |
|---|---|---|
| committer | Vic Yang <victoryang@chromium.org> | 2012-02-16 14:06:55 -0800 |
| commit | e75a32d2e3e9b62c47f4792d9ca17fb3b70b95d4 (patch) | |
| tree | 5a0da8cb4006359c8924d81e979d3e8475d49db3 | |
| parent | b221c77b6293ad03e2610b940e2d39de6d40c4db (diff) | |
| download | chrome-ec-e75a32d2e3e9b62c47f4792d9ca17fb3b70b95d4.tar.gz | |
Temporarily remove image RW.B due to code size.
To accomodate our growing code, image RW.B is removed so that RO and
RW.A can both have 60K space. This is just a temporary solution. Add
RW.B back when we have enough space for all three images.
Also add license header to firmware_image.lds.S so that repo does not
complain about it.
BUG=chrome-os-partner:8079
TEST=build image and run on proto-0.
Change-Id: I85b723f3e645c12fd89b189263ca44d58c4621eb
Signed-off-by: Vic Yang <victoryang@chromium.org>
| -rw-r--r-- | chip/lm4/config.h | 6 | ||||
| -rw-r--r-- | common/firmware_image.S | 2 | ||||
| -rw-r--r-- | common/firmware_image.lds.S | 7 |
3 files changed, 14 insertions, 1 deletions
diff --git a/chip/lm4/config.h b/chip/lm4/config.h index 6c3bbddc6d..b70837d21a 100644 --- a/chip/lm4/config.h +++ b/chip/lm4/config.h @@ -10,8 +10,12 @@ #define CONFIG_RAM_BASE 0x20000000 #define CONFIG_RAM_SIZE 0x00008000 +/* Disable RW.B firmware due to code size. + * TODO: Add it back when we can. */ +#define CONFIG_NO_RW_B + /* Size of one firmware image in flash */ -#define CONFIG_FW_IMAGE_SIZE (40 * 1024) +#define CONFIG_FW_IMAGE_SIZE (60 * 1024) #define CONFIG_FW_RO_OFF 0 #define CONFIG_FW_A_OFF CONFIG_FW_IMAGE_SIZE #define CONFIG_FW_B_OFF (2 * CONFIG_FW_IMAGE_SIZE) diff --git a/common/firmware_image.S b/common/firmware_image.S index 78207f96cf..8ffe1eb76b 100644 --- a/common/firmware_image.S +++ b/common/firmware_image.S @@ -20,6 +20,8 @@ .section .image.A, "ax" .incbin FW_IMAGE(A) +#ifndef CONFIG_NO_RW_B /* Read Write firmware copy B */ .section .image.B, "ax" .incbin FW_IMAGE(B) +#endif diff --git a/common/firmware_image.lds.S b/common/firmware_image.lds.S index c1c7d59682..c282e7ac28 100644 --- a/common/firmware_image.lds.S +++ b/common/firmware_image.lds.S @@ -1,3 +1,8 @@ +/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #include "config.h" OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") @@ -16,8 +21,10 @@ SECTIONS .image.A : AT(CONFIG_FW_A_OFF) { *(.image.A) } > FLASH +#ifndef CONFIG_NO_RW_B . = ALIGN(CONFIG_FLASH_BANK_SIZE); .image.B : AT(CONFIG_FW_B_OFF) { *(.image.B) } > FLASH +#endif } |