summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-12-07 06:43:40 -0700
committerTom Rini <trini@ti.com>2012-12-07 08:47:59 -0700
commitfd4d564b3c80b111f18c93adb14233a6a7ddb0e9 (patch)
treea42d63aae4f7c07f441321c18098a85cbcc45dee /board
parent13d43555a9154cf12255023c47e80d947d7d0604 (diff)
parentac426b7290e3a96c97fbc093f15cd0660e0edaf2 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'board')
-rw-r--r--board/chromebook-x86/dts/alex.dts (renamed from board/chromebook-x86/dts/x86-alex.dts)18
-rw-r--r--board/chromebook-x86/dts/link.dts24
2 files changed, 30 insertions, 12 deletions
diff --git a/board/chromebook-x86/dts/x86-alex.dts b/board/chromebook-x86/dts/alex.dts
index bd90d185f1c..cb6a9e41eed 100644
--- a/board/chromebook-x86/dts/x86-alex.dts
+++ b/board/chromebook-x86/dts/alex.dts
@@ -1,5 +1,7 @@
/dts-v1/;
+/include/ "coreboot.dtsi"
+
/ {
#address-cells = <1>;
#size-cells = <1>;
@@ -10,19 +12,11 @@
silent_console = <0>;
};
- aliases {
- console = "/serial@e0401000";
- };
+ gpio: gpio {};
- serial@e0401000 {
- compatible = "ns16550";
- reg = <0xe0401000 0x40>;
- id = <1>;
- reg-shift = <1>;
- baudrate = <115200>;
- clock-frequency = <4000000>;
- multiplier = <1>;
- status = "ok";
+ serial {
+ reg = <0x3f8 8>;
+ clock-frequency = <115200>;
};
chosen { };
diff --git a/board/chromebook-x86/dts/link.dts b/board/chromebook-x86/dts/link.dts
new file mode 100644
index 00000000000..af60f59de78
--- /dev/null
+++ b/board/chromebook-x86/dts/link.dts
@@ -0,0 +1,24 @@
+/dts-v1/;
+
+/include/ "coreboot.dtsi"
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ model = "Google Link";
+ compatible = "google,link", "intel,celeron-ivybridge";
+
+ config {
+ silent_console = <0>;
+ };
+
+ gpio: gpio {};
+
+ serial {
+ reg = <0x3f8 8>;
+ clock-frequency = <115200>;
+ };
+
+ chosen { };
+ memory { device_type = "memory"; reg = <0 0>; };
+};