diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2011-12-15 14:39:53 -0800 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-01-09 16:25:35 -0800 |
| commit | d9def8a7ff9409b92b837000b2f439af785d1a31 (patch) | |
| tree | 3a01eed18165d163b0935f4d32d772be876a035d /board | |
| parent | 1b1b0c65f4bb6d39cb749f3cb11b2e55f4cae682 (diff) | |
[x86]: Add environment section to flash map.
dev_cfg is used by vboot_reference, hence we can't store our
u-boot environment there anymore. So create a section rw-environment
for that purpose.
Signed-off-by: Stefan Reinauer <reinauer@google.com>
BUG=chrome-os-partner:7264
TEST=boot tested on Stumpy
Change-Id: I15479f0f1a2aa111b742d2792052f48d660d122c
Reviewed-on: https://gerrit.chromium.org/gerrit/13022
Tested-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Commit-Ready: Stefan Reinauer <reinauer@chromium.org>
Diffstat (limited to 'board')
5 files changed, 25 insertions, 20 deletions
diff --git a/board/chromebook-x86/coreboot/flashmap-4mb.dtsi b/board/chromebook-x86/coreboot/flashmap-4mb.dtsi index 9655b71757..79376495ad 100644 --- a/board/chromebook-x86/coreboot/flashmap-4mb.dtsi +++ b/board/chromebook-x86/coreboot/flashmap-4mb.dtsi @@ -169,8 +169,8 @@ wipe-value = [00]; }; /* ---- Section: Rewritable private 16 KB---- */ - dev-cfg@0 { - label = "dev-cfg"; + rw-environment@0 { + label = "rw-environment"; /* Alignment: 4k, and must occupy bottom of U-Boot * firmware -- check CONFIG_ENV_OFFSET */ reg = <0x0001c000 0x00004000>; diff --git a/board/chromebook-x86/coreboot/flashmap-8mb.dtsi b/board/chromebook-x86/coreboot/flashmap-8mb.dtsi index c225e5a4e7..8e550b4a9c 100644 --- a/board/chromebook-x86/coreboot/flashmap-8mb.dtsi +++ b/board/chromebook-x86/coreboot/flashmap-8mb.dtsi @@ -73,7 +73,7 @@ */ rw-unused@0 { label = "rw-unused"; - reg = <0x00181000 0x0006b000>; + reg = <0x00181000 0x00067000>; type = "wiped"; wipe-value = [ff]; }; @@ -83,7 +83,21 @@ /* Alignment: 4k (for updating). * Anything in this range may be updated in recovery. */ label = "rw-shared"; - reg = <0x001ec000 0x00014000>; + reg = <0x001e8000 0x00018000>; + }; + + /* ---- Section: Rewritable u-boot environment 16 KB---- */ + rw-environment@0 { + label = "rw-environment"; + /* Alignment 4k: (for updating) */ + reg = <0x001e8000 0x00004000>; + /* + * We could put the dev environment here, but U-Boot has + * a default built in. Devs can 'saveenv' to set this + * up. + */ + type = "wiped"; + wipe-value = [00]; }; /* ---- Section: Rewritable MRC cache 64 KB ---- */ @@ -98,17 +112,8 @@ /* ---- Section: Rewritable private 16 KB---- */ dev-cfg@0 { label = "dev-cfg"; - /* - * Alignment: 4k, and must occupy bottom of U-Boot - * firmware -- check CONFIG_ENV_OFFSET - */ + /* Alignment: 4k (for updating) */ reg = <0x001fc000 0x00004000>; - - /* - * We could put the dev environment here, but U-Boot has - * a default built in. Devs can 'saveenv' to set this - * up. - */ type = "wiped"; wipe-value = [00]; }; diff --git a/board/chromebook-x86/coreboot/flashmap-8mb_1mbRom.dtsi b/board/chromebook-x86/coreboot/flashmap-8mb_1mbRom.dtsi index aa0e3bc4c0..6cb64b2acf 100644 --- a/board/chromebook-x86/coreboot/flashmap-8mb_1mbRom.dtsi +++ b/board/chromebook-x86/coreboot/flashmap-8mb_1mbRom.dtsi @@ -108,8 +108,8 @@ }; /* ---- Section: Rewritable private 16 KB---- */ - dev-cfg@0 { - label = "dev-cfg"; + rw-environment@0 { + label = "rw-environment"; /* * Alignment: 4k, and must occupy bottom of U-Boot * firmware -- check CONFIG_ENV_OFFSET diff --git a/board/nvidia/seaboard/flashmap-twostop-2mb.dtsi b/board/nvidia/seaboard/flashmap-twostop-2mb.dtsi index be89993d55..e6fc41a613 100644 --- a/board/nvidia/seaboard/flashmap-twostop-2mb.dtsi +++ b/board/nvidia/seaboard/flashmap-twostop-2mb.dtsi @@ -123,8 +123,8 @@ label = "rw-private"; reg = <0x001fc000 0x00004000>; }; - dev-cfg@1fe000 { - label = "dev-cfg"; + rw-environment@1fe000 { + label = "rw-environment"; /* Alignment: 4k, and must occupy bottom of U-Boot * firmware -- check CONFIG_ENV_OFFSET */ reg = <0x001fe000 0x00002000>; diff --git a/board/nvidia/seaboard/flashmap-twostop-4mb.dtsi b/board/nvidia/seaboard/flashmap-twostop-4mb.dtsi index 857e5585ad..ab01bd61c9 100644 --- a/board/nvidia/seaboard/flashmap-twostop-4mb.dtsi +++ b/board/nvidia/seaboard/flashmap-twostop-4mb.dtsi @@ -128,8 +128,8 @@ label = "rw-private"; reg = <0x003fc000 0x00004000>; }; - dev-cfg { - label = "dev-cfg"; + rw-environment { + label = "rw-environment"; /* Alignment: 4k, and must occupy bottom of U-Boot * firmware -- check CONFIG_ENV_OFFSET */ reg = <0x003fe000 0x00002000>; |