From 5b18dc36a7d162beece281a6c4087b57101d4e5a Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 28 Sep 2011 18:15:32 -0700 Subject: Remove manual configuration of the serial console from the device tree Coreboot is going to set up the serial configuration in the device tree at run time, and this manual configuration would get in the way. BUG=chrome-os-partner:4901 TEST=Booted on Stumpy and Alex with the change in coreboot that makes it configure the serial device. Booted on Alex with the external serial card removed and its driver disabled in coreboot and no other change in u-boot. Change-Id: Ibdf2590722c822ce663a62516a5d1c374e8b1293 Signed-off-by: Gabe Black Reviewed-on: http://gerrit.chromium.org/gerrit/8473 Reviewed-by: Stefan Reinauer Reviewed-by: Simon Glass Tested-by: Gabe Black --- board/chromebook-x86/coreboot/alex.dts | 1 - board/chromebook-x86/coreboot/iouart.dtsi | 19 ------------------- board/chromebook-x86/coreboot/lumpy.dts | 1 - board/chromebook-x86/coreboot/mario.dts | 1 - board/chromebook-x86/coreboot/oxpcie.dtsi | 19 ------------------- board/chromebook-x86/coreboot/stumpy.dts | 1 - 6 files changed, 42 deletions(-) delete mode 100644 board/chromebook-x86/coreboot/iouart.dtsi delete mode 100644 board/chromebook-x86/coreboot/oxpcie.dtsi (limited to 'board') diff --git a/board/chromebook-x86/coreboot/alex.dts b/board/chromebook-x86/coreboot/alex.dts index 6634d74b95a..db7e0d65803 100644 --- a/board/chromebook-x86/coreboot/alex.dts +++ b/board/chromebook-x86/coreboot/alex.dts @@ -3,7 +3,6 @@ /include/ "skeleton.dtsi" /include/ "chromeos.dtsi" /include/ "flashmap-4mb.dtsi" -/include/ "oxpcie.dtsi" / { model = "Google Alex"; diff --git a/board/chromebook-x86/coreboot/iouart.dtsi b/board/chromebook-x86/coreboot/iouart.dtsi deleted file mode 100644 index ac455a9a029..00000000000 --- a/board/chromebook-x86/coreboot/iouart.dtsi +++ /dev/null @@ -1,19 +0,0 @@ -/* Classical IO mapped 16550 UART */ - -/{ - aliases { - console = "/serial@i3f8"; - }; - - serial@i3f8 { - compatible = "ns16550"; - reg = <0x3f8 0x08>; - id = <1>; - reg-shift = <1>; - baudrate = <115200>; - clock-frequency = <115200>; - multiplier = <1>; - io-mapped = <1>; - status = "ok"; - }; -}; diff --git a/board/chromebook-x86/coreboot/lumpy.dts b/board/chromebook-x86/coreboot/lumpy.dts index 3bb36c465b7..67b612c61f9 100644 --- a/board/chromebook-x86/coreboot/lumpy.dts +++ b/board/chromebook-x86/coreboot/lumpy.dts @@ -3,7 +3,6 @@ /include/ "skeleton.dtsi" /include/ "chromeos.dtsi" /include/ "flashmap-4mb.dtsi" -/include/ "oxpcie.dtsi" / { model = "Google Lumpy"; diff --git a/board/chromebook-x86/coreboot/mario.dts b/board/chromebook-x86/coreboot/mario.dts index f5b033e8fc9..d788fa8027e 100644 --- a/board/chromebook-x86/coreboot/mario.dts +++ b/board/chromebook-x86/coreboot/mario.dts @@ -3,7 +3,6 @@ /include/ "skeleton.dtsi" /include/ "chromeos.dtsi" /include/ "flashmap-4mb.dtsi" -/include/ "oxpcie.dtsi" / { model = "Google Mario"; diff --git a/board/chromebook-x86/coreboot/oxpcie.dtsi b/board/chromebook-x86/coreboot/oxpcie.dtsi deleted file mode 100644 index 001203c8b83..00000000000 --- a/board/chromebook-x86/coreboot/oxpcie.dtsi +++ /dev/null @@ -1,19 +0,0 @@ -/* OXPCIe 952 UART */ - -/ { - aliases { - console = "/serial@e0401000"; - }; - - serial@e0401000 { - compatible = "ns16550"; - reg = <0xe0401000 0x40>; - id = <1>; - reg-shift = <1>; - baudrate = <115200>; - clock-frequency = <4000000>; - multiplier = <1>; - status = "ok"; - }; -}; - diff --git a/board/chromebook-x86/coreboot/stumpy.dts b/board/chromebook-x86/coreboot/stumpy.dts index a469009c334..b191f13a303 100644 --- a/board/chromebook-x86/coreboot/stumpy.dts +++ b/board/chromebook-x86/coreboot/stumpy.dts @@ -3,7 +3,6 @@ /include/ "skeleton.dtsi" /include/ "chromeos.dtsi" /include/ "flashmap-4mb.dtsi" -/include/ "iouart.dtsi" / { model = "Google Stumpy"; -- cgit v1.2.3