From d993c4891794588ca53044a8a8de87ec9053c83b Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 4 Jun 2018 20:25:13 +0000
Subject: [PATCH] Disable GPU on rpi

Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
 buildroot-external/board/ova/post-image.sh    |  2 ++
 .../0002-ARM-dts-add-more-functions.patch     | 24 ++++++++++++-------
 buildroot-external/board/rpi2/post-image.sh   |  4 +++-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/buildroot-external/board/ova/post-image.sh b/buildroot-external/board/ova/post-image.sh
index a85b99602..8bde7962a 100755
--- a/buildroot-external/board/ova/post-image.sh
+++ b/buildroot-external/board/ova/post-image.sh
@@ -20,6 +20,8 @@ mkdir -p ${BOOT_DATA}/EFI/barebox
 cp ${BINARIES_DIR}/barebox.bin ${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI
 cp ${BOARD_DIR}/barebox-state-efi.dtb ${BOOT_DATA}/EFI/barebox/state.dtb
 
+echo "console=tty1" > ${BOARD_DIR}/cmdline.txt
+
 # Create other layers
 create_boot_image ${BINARIES_DIR}
 create_overlay_image ${BINARIES_DIR}
diff --git a/buildroot-external/board/rpi2/patches/barebox/0002-ARM-dts-add-more-functions.patch b/buildroot-external/board/rpi2/patches/barebox/0002-ARM-dts-add-more-functions.patch
index 1b2aa853a..1e50c00b6 100644
--- a/buildroot-external/board/rpi2/patches/barebox/0002-ARM-dts-add-more-functions.patch
+++ b/buildroot-external/board/rpi2/patches/barebox/0002-ARM-dts-add-more-functions.patch
@@ -1,15 +1,15 @@
-From 1f5edc2b907c89a3e27f55490479a0999b1127dc Mon Sep 17 00:00:00 2001
+From 114c8fd0327f1c0f1bf886953c600e2a72a55df7 Mon Sep 17 00:00:00 2001
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Mon, 4 Jun 2018 09:17:25 +0000
 Subject: [PATCH 2/2] ARM: dts: add more functions
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
- arch/arm/dts/bcm2835-rpi.dts   |  4 ----
- arch/arm/dts/bcm2836-rpi-2.dts |  4 ----
- dts/src/arm/bcm2835-rpi.dtsi   | 38 ++++++++++++++++++++++++++++++++--
- dts/src/arm/bcm283x.dtsi       | 12 ++++-------
- 4 files changed, 40 insertions(+), 18 deletions(-)
+ arch/arm/dts/bcm2835-rpi.dts   |  4 ---
+ arch/arm/dts/bcm2836-rpi-2.dts |  4 ---
+ dts/src/arm/bcm2835-rpi.dtsi   | 46 ++++++++++++++++++++++++++++++++--
+ dts/src/arm/bcm283x.dtsi       | 12 +++------
+ 4 files changed, 48 insertions(+), 18 deletions(-)
 
 diff --git a/arch/arm/dts/bcm2835-rpi.dts b/arch/arm/dts/bcm2835-rpi.dts
 index c23e7c7c1..22d60e961 100644
@@ -42,7 +42,7 @@ index 2fa1c8bb4..bdee1296e 100644
  		reg = <0x0 0x0>;
  	};
 diff --git a/dts/src/arm/bcm2835-rpi.dtsi b/dts/src/arm/bcm2835-rpi.dtsi
-index e36c392a2..86f1d493c 100644
+index e36c392a2..d3dfb4b3e 100644
 --- a/dts/src/arm/bcm2835-rpi.dtsi
 +++ b/dts/src/arm/bcm2835-rpi.dtsi
 @@ -27,6 +27,39 @@
@@ -100,11 +100,19 @@ index e36c392a2..86f1d493c 100644
  };
  
  &dsi0 {
-@@ -106,3 +139,4 @@
+@@ -106,3 +139,12 @@
  &dsi1 {
  	power-domains = <&power RPI_POWER_DOMAIN_DSI1>;
  };
 +
++&v3d {
++	status = "disabled";
++};
++
++&vc4 {
++	status = "disabled";
++};
++
 diff --git a/dts/src/arm/bcm283x.dtsi b/dts/src/arm/bcm283x.dtsi
 index 9d293decf..0abb72a47 100644
 --- a/dts/src/arm/bcm283x.dtsi
diff --git a/buildroot-external/board/rpi2/post-image.sh b/buildroot-external/board/rpi2/post-image.sh
index 141782309..e8b0599d1 100755
--- a/buildroot-external/board/rpi2/post-image.sh
+++ b/buildroot-external/board/rpi2/post-image.sh
@@ -28,9 +28,11 @@ cp -r ${BINARIES_DIR}/rpi-firmware/overlays ${BOOT_DATA}/
 (
     echo "kernel=barebox.bin"
     echo "disable_splash=1"
+    echo "dtparam=audio=on"
+    echo "enable_uart=1"
 ) > ${BOOT_DATA}/config.txt
 
-touch ${BOOT_DATA}/cmdline.txt
+echo "dwc_otg.lpm_enable=0 console=tty1 console=ttyAMA0,115200" > ${BOOT_DATA}/cmdline.txt
 
 # Create other layers
 create_boot_image ${BINARIES_DIR}