diff mbox

[U-Boot,v3] x86: panther: Add PCI and video configuration

Message ID 1440726888-9126-1-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Aug. 28, 2015, 1:54 a.m. UTC
Add a PCI node to the device tree. This allows SPI flash and SATA to work
correctly. Also configure the video to come up correctly even though there
is no keyboard.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

Changes in v3:
- Fix 'correectly' typo

Changes in v2:
- Fix PCI I/O range value

 arch/x86/dts/chromebox_panther.dts  | 10 ++++++++++
 include/configs/chromebox_panther.h |  2 ++
 2 files changed, 12 insertions(+)

Comments

Simon Glass Sept. 1, 2015, 12:31 a.m. UTC | #1
On 27 August 2015 at 19:54, Simon Glass <sjg@chromium.org> wrote:
> Add a PCI node to the device tree. This allows SPI flash and SATA to work
> correctly. Also configure the video to come up correctly even though there
> is no keyboard.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
> Changes in v3:
> - Fix 'correectly' typo
>
> Changes in v2:
> - Fix PCI I/O range value
>
>  arch/x86/dts/chromebox_panther.dts  | 10 ++++++++++
>  include/configs/chromebox_panther.h |  2 ++
>  2 files changed, 12 insertions(+)

Applied to u-boot-x86, thanks!
diff mbox

Patch

diff --git a/arch/x86/dts/chromebox_panther.dts b/arch/x86/dts/chromebox_panther.dts
index 84eae3a..31daf26 100644
--- a/arch/x86/dts/chromebox_panther.dts
+++ b/arch/x86/dts/chromebox_panther.dts
@@ -42,6 +42,16 @@ 
 		stdout-path = "/serial";
 	};
 
+	pci {
+		compatible = "pci-x86";
+		#address-cells = <3>;
+		#size-cells = <2>;
+		u-boot,dm-pre-reloc;
+		ranges = <0x02000000 0x0 0xe0000000 0xe0000000 0 0x10000000
+			0x42000000 0x0 0xd0000000 0xd0000000 0 0x10000000
+			0x01000000 0x0 0x1000 0x1000 0 0xf000>;
+	};
+
 	spi {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/include/configs/chromebox_panther.h b/include/configs/chromebox_panther.h
index 00fe26d..dc732b8 100644
--- a/include/configs/chromebox_panther.h
+++ b/include/configs/chromebox_panther.h
@@ -14,4 +14,6 @@ 
 /* Avoid a warning in the Realtek Ethernet driver */
 #define CONFIG_SYS_CACHELINE_SIZE 16
 
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+
 #endif	/* __CONFIG_H */