diff options
| author | Simon Glass <sjg@chromium.org> | 2011-09-13 16:22:42 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-09-14 21:37:44 -0700 |
| commit | 45943ddd690d6d5cc6778647543fd4efac89e7ab (patch) | |
| tree | 36e0311cf50d8e03d28e513ec7442f4295408899 /board/chromebook-x86 | |
| parent | ac085a63ac21113b09a680a73e87ac719b6f07c5 (diff) | |
fdt: coreboot: refactor to put Chrome OS config into a separate file
The chromeos-config node is not really related to the flashmap, so
this brings it into a separate file.
BUG=chromium-os:17062
TEST=emerge-x86-mario chromeos-u-boot
Change-Id: I303903beb217a3e222c23b5d7929cd3929e5860a
Reviewed-on: http://gerrit.chromium.org/gerrit/7680
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board/chromebook-x86')
| -rw-r--r-- | board/chromebook-x86/coreboot/chromeos.dtsi | 25 | ||||
| -rw-r--r-- | board/chromebook-x86/coreboot/flashmap-4mb.dtsi | 6 | ||||
| -rw-r--r-- | board/chromebook-x86/coreboot/lumpy.dts | 2 | ||||
| -rw-r--r-- | board/chromebook-x86/coreboot/mario.dts | 2 | ||||
| -rw-r--r-- | board/chromebook-x86/coreboot/stumpy.dts | 2 |
5 files changed, 28 insertions, 9 deletions
diff --git a/board/chromebook-x86/coreboot/chromeos.dtsi b/board/chromebook-x86/coreboot/chromeos.dtsi new file mode 100644 index 00000000000..0e0147b0687 --- /dev/null +++ b/board/chromebook-x86/coreboot/chromeos.dtsi @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2011 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. + */ + +/* + * This file holds Chrome OS-specific options, kept within a chromeos-config + */ + +/ { + chromeos-config { + twostop; /* Two-stop boot */ + twostop-optional; /* One-stop optimization enabled */ + }; + + config { + silent_console = <0>; + }; + + chosen { + bootargs = ""; + }; + +}; diff --git a/board/chromebook-x86/coreboot/flashmap-4mb.dtsi b/board/chromebook-x86/coreboot/flashmap-4mb.dtsi index eadb38a34d0..acbc73fc0e7 100644 --- a/board/chromebook-x86/coreboot/flashmap-4mb.dtsi +++ b/board/chromebook-x86/coreboot/flashmap-4mb.dtsi @@ -5,12 +5,6 @@ */ / { - /* ChromeOS specific configuration for this flashmap */ - chromeos-config { - twostop; /* Two-stop boot */ - twostop-optional; /* One-stop optimization enabled */ - }; - /* * Names will be capitalized and hyphen converted to underscore by * cros_bundle_firmware. diff --git a/board/chromebook-x86/coreboot/lumpy.dts b/board/chromebook-x86/coreboot/lumpy.dts index 928b00f7407..9b9ec99cecf 100644 --- a/board/chromebook-x86/coreboot/lumpy.dts +++ b/board/chromebook-x86/coreboot/lumpy.dts @@ -1,6 +1,7 @@ /dts-v1/; /include/ "skeleton.dtsi" +/include/ "chromeos.dtsi" /include/ "flashmap-4mb.dtsi" /include/ "oxpcie.dtsi" @@ -9,7 +10,6 @@ compatible = "google,lumpy", "intel,celeron-sandybridge"; config { - silent_console = <0>; hwid = "X86 LUMPY TEST 6638"; }; }; diff --git a/board/chromebook-x86/coreboot/mario.dts b/board/chromebook-x86/coreboot/mario.dts index c0b16213411..f5b033e8fc9 100644 --- a/board/chromebook-x86/coreboot/mario.dts +++ b/board/chromebook-x86/coreboot/mario.dts @@ -1,6 +1,7 @@ /dts-v1/; /include/ "skeleton.dtsi" +/include/ "chromeos.dtsi" /include/ "flashmap-4mb.dtsi" /include/ "oxpcie.dtsi" @@ -9,7 +10,6 @@ compatible = "google,mario", "intel,atom-pineview"; config { - silent_console = <0>; hwid = "X86 MARIO TEST 1089"; }; }; diff --git a/board/chromebook-x86/coreboot/stumpy.dts b/board/chromebook-x86/coreboot/stumpy.dts index d4998d4119f..a469009c334 100644 --- a/board/chromebook-x86/coreboot/stumpy.dts +++ b/board/chromebook-x86/coreboot/stumpy.dts @@ -1,6 +1,7 @@ /dts-v1/; /include/ "skeleton.dtsi" +/include/ "chromeos.dtsi" /include/ "flashmap-4mb.dtsi" /include/ "iouart.dtsi" @@ -9,7 +10,6 @@ compatible = "google,stumpy", "intel,celeron-sandybridge"; config { - silent_console = <0>; hwid = "X86 STUMPY TEST 0128"; }; |