diff options
author | Simon Glass <sjg@chromium.org> | 2011-08-18 13:09:32 -0600 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:35 -0700 |
commit | 02be9cf6069bb90fa40f7dbc7373eec5ae90ead0 (patch) | |
tree | 412e9b5a0228a95b8932d748e76af41528fe935b /board/nvidia/seaboard | |
parent | b43dac1e4ea9ace49d2a73435f9e77f07922bb46 (diff) |
fdt: Break out common Chrome OS components
Create a new chromeos.dtsi to contain fdt properties which are common to
all Chrome OS ARM boards.
BUG=chromium-os:17062
TEST=build full image for all ARM boards
Change-Id: I8e0521bd819d1d16e6a3cb6374bca8b4c8053cbb
Reviewed-on: http://gerrit.chromium.org/gerrit/6239
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board/nvidia/seaboard')
-rw-r--r-- | board/nvidia/seaboard/chromeos.dtsi | 31 | ||||
-rw-r--r-- | board/nvidia/seaboard/flashmap-ro.dtsi | 11 | ||||
-rw-r--r-- | board/nvidia/seaboard/tegra2-aebl.dts | 6 | ||||
-rw-r--r-- | board/nvidia/seaboard/tegra2-arthur.dts | 6 | ||||
-rw-r--r-- | board/nvidia/seaboard/tegra2-asymptote.dts | 6 | ||||
-rw-r--r-- | board/nvidia/seaboard/tegra2-kaen.dts | 6 | ||||
-rw-r--r-- | board/nvidia/seaboard/tegra2-seaboard.dts | 6 |
7 files changed, 36 insertions, 36 deletions
diff --git a/board/nvidia/seaboard/chromeos.dtsi b/board/nvidia/seaboard/chromeos.dtsi new file mode 100644 index 00000000000..c04ef8257b7 --- /dev/null +++ b/board/nvidia/seaboard/chromeos.dtsi @@ -0,0 +1,31 @@ +/* + * 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 */ + textbase = <0xe08000>; /* Address where U-Boot loads */ + + /* + * Device and offset for second-stage firmware, in SPI for now + * second-stage = <&emmc 0x00000080 0>; + */ + }; + + config { + silent_console = <0>; + }; + + chosen { + bootargs = ""; + }; + +}; diff --git a/board/nvidia/seaboard/flashmap-ro.dtsi b/board/nvidia/seaboard/flashmap-ro.dtsi index c6fdfcd4e0e..1fc68127864 100644 --- a/board/nvidia/seaboard/flashmap-ro.dtsi +++ b/board/nvidia/seaboard/flashmap-ro.dtsi @@ -16,17 +16,6 @@ */ / { - chromeos-config { - twostop; /* Two-stop boot */ - twostop-optional; /* One-stop optimization enabled */ - textbase = <0xe08000>; /* Address where U-Boot loads */ - - /* - * Device and offset for second-stage firmware, in SPI for now - * second-stage = <&emmc 0x00000080 0>; - */ - }; - /* * Labels have been selected to be to compatible with existing tools, * even thought the terminology may be a little different on ARM. diff --git a/board/nvidia/seaboard/tegra2-aebl.dts b/board/nvidia/seaboard/tegra2-aebl.dts index 6c667e291be..168da7eac76 100644 --- a/board/nvidia/seaboard/tegra2-aebl.dts +++ b/board/nvidia/seaboard/tegra2-aebl.dts @@ -2,6 +2,7 @@ /memreserve/ 0x1c000000 0x04000000; /include/ "tegra250.dtsi" +/include/ "chromeos.dtsi" /include/ "flashmap-twostop-4mb.dtsi" / { @@ -9,7 +10,6 @@ compatible = "google,aebl", "nvidia,tegra250"; config { - silent_console = <0>; odmdata = <0x300d8011>; hwid = "ARM AEBL TEST 5789"; machine-arch-id = <3287>; @@ -42,10 +42,6 @@ i2c3 = "/i2c@0x7000c500"; }; - chosen { - bootargs = ""; - }; - memory { device_type = "memory"; reg = <0x00000000 0x40000000>; diff --git a/board/nvidia/seaboard/tegra2-arthur.dts b/board/nvidia/seaboard/tegra2-arthur.dts index 583537e8cd2..8e9edc14457 100644 --- a/board/nvidia/seaboard/tegra2-arthur.dts +++ b/board/nvidia/seaboard/tegra2-arthur.dts @@ -2,6 +2,7 @@ /memreserve/ 0x1c000000 0x04000000; /include/ "tegra250.dtsi" +/include/ "chromeos.dtsi" /include/ "flashmap-twostop-4mb.dtsi" / { @@ -9,7 +10,6 @@ compatible = "google,arthur", "nvidia,tegra250"; config { - silent_console = <0>; odmdata = <0x300d8011>; hwid = "ARM ARTHUR TEST 3403"; machine-arch-id = <3474>; @@ -41,10 +41,6 @@ i2c3 = "/i2c@0x7000c500"; }; - chosen { - bootargs = ""; - }; - memory { device_type = "memory"; reg = <0x00000000 0x40000000>; diff --git a/board/nvidia/seaboard/tegra2-asymptote.dts b/board/nvidia/seaboard/tegra2-asymptote.dts index b5692c446ee..f1e6265ffce 100644 --- a/board/nvidia/seaboard/tegra2-asymptote.dts +++ b/board/nvidia/seaboard/tegra2-asymptote.dts @@ -2,6 +2,7 @@ /memreserve/ 0x1c000000 0x04000000; /include/ "tegra250.dtsi" +/include/ "chromeos.dtsi" /include/ "flashmap-twostop-4mb.dtsi" / { @@ -9,7 +10,6 @@ compatible = "google,asymptote", "nvidia,tegra250"; config { - silent_console = <0>; odmdata = <0x300d8011>; hwid = "ARM ASYMPTOTE TEST 8314"; machine-arch-id = <3624>; @@ -39,10 +39,6 @@ i2c3 = "/i2c@0x7000c500"; }; - chosen { - bootargs = ""; - }; - memory { device_type = "memory"; reg = <0x00000000 0x40000000>; diff --git a/board/nvidia/seaboard/tegra2-kaen.dts b/board/nvidia/seaboard/tegra2-kaen.dts index e64e473c933..e11bd7adcd6 100644 --- a/board/nvidia/seaboard/tegra2-kaen.dts +++ b/board/nvidia/seaboard/tegra2-kaen.dts @@ -2,6 +2,7 @@ /memreserve/ 0x1c000000 0x04000000; /include/ "tegra250.dtsi" +/include/ "chromeos.dtsi" /include/ "flashmap-twostop-4mb.dtsi" / { @@ -9,7 +10,6 @@ compatible = "google,kaen", "nvidia,tegra250"; config { - silent_console = <0>; odmdata = <0x300d8011>; hwid = "ARM KAEN TEST 3084"; machine-arch-id = <3217>; @@ -43,10 +43,6 @@ i2c3 = "/i2c@0x7000c500"; }; - chosen { - bootargs = ""; - }; - memory { device_type = "memory"; reg = <0x00000000 0x40000000>; diff --git a/board/nvidia/seaboard/tegra2-seaboard.dts b/board/nvidia/seaboard/tegra2-seaboard.dts index c1b93d2319c..ff5f1d395df 100644 --- a/board/nvidia/seaboard/tegra2-seaboard.dts +++ b/board/nvidia/seaboard/tegra2-seaboard.dts @@ -2,6 +2,7 @@ /memreserve/ 0x1c000000 0x04000000; /include/ "tegra250.dtsi" +/include/ "chromeos.dtsi" /include/ "flashmap-twostop-2mb.dtsi" / { @@ -9,7 +10,6 @@ compatible = "nvidia,seaboard", "nvidia,tegra250"; config { - silent_console = <0>; odmdata = <0x300d8011>; hwid = "ARM SEABOARD TEST 1176"; machine-arch-id = <3005>; @@ -43,10 +43,6 @@ i2c3 = "/i2c@0x7000c500"; }; - chosen { - bootargs = ""; - }; - memory { device_type = "memory"; reg = <0x00000000 0x40000000>; |