diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-06-26 09:48:04 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-06-26 13:58:54 -0700 |
| commit | fb123b48384cdf2eb1c5008324fac6f8d2811e16 (patch) | |
| tree | 32f5a582794db1d253fadc2c6427b7905fae3640 /common/firmware_image.S | |
| parent | 90afebac6406e02ce306a4a6eaf7b66097a81931 (diff) | |
| download | chrome-ec-fb123b48384cdf2eb1c5008324fac6f8d2811e16.tar.gz | |
Only one RW image is now the default
And if RW B isn't enabled, it's not even linked.
BUG=chrome-os-partner:10881
TEST=on link, should be no B image, and 'sysjump B' should fail
On BDS, still should be A and B images
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Change-Id: Icb2af07881cc7e28b9b877f45824486a22fde8d7
Reviewed-on: https://gerrit.chromium.org/gerrit/26116
Diffstat (limited to 'common/firmware_image.S')
| -rw-r--r-- | common/firmware_image.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common/firmware_image.S b/common/firmware_image.S index 8ffe1eb76b..0c086728aa 100644 --- a/common/firmware_image.S +++ b/common/firmware_image.S @@ -1,10 +1,11 @@ -/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +/* 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. * - * Build the full image with 3 copies (Read only, A, B) of the program + * Build the full image with up to 3 copies (Read only, A, B) of the program */ +#include "board.h" #include "config.h" #define FW_FILE(builddir,proj,sect) builddir##/##proj##.##sect##.flat @@ -20,7 +21,7 @@ .section .image.A, "ax" .incbin FW_IMAGE(A) -#ifndef CONFIG_NO_RW_B +#ifdef CONFIG_RW_B /* Read Write firmware copy B */ .section .image.B, "ax" .incbin FW_IMAGE(B) |