diff --git a/buildroot-external/board/rpi2/barebox-env/init/rpi_bootargs b/buildroot-external/board/rpi2/barebox-env/init/rpi_bootargs index 94156ec2e..b9e0c3794 100644 --- a/buildroot-external/board/rpi2/barebox-env/init/rpi_bootargs +++ b/buildroot-external/board/rpi2/barebox-env/init/rpi_bootargs @@ -1,3 +1,3 @@ #!/bin/sh -global linux.bootargs.rpi="cma=64M" +global linux.bootargs.rpi="bcm2708_fb.fbwidth=656 bcm2708_fb.fbheight=416 bcm2708_fb.fbswap=1 vc_mem.mem_base=0x3ec00000 vc_mem.mem_size=0x40000000" diff --git a/buildroot-external/board/rpi2/barebox-env/overlay/rpi-dwc.dtbo b/buildroot-external/board/rpi2/barebox-env/overlay/rpi-dwc.dtbo deleted file mode 100644 index 800d46773..000000000 Binary files a/buildroot-external/board/rpi2/barebox-env/overlay/rpi-dwc.dtbo and /dev/null differ diff --git a/buildroot-external/board/rpi2/barebox-env/overlay/rpi-v3d.dtbo b/buildroot-external/board/rpi2/barebox-env/overlay/rpi-v3d.dtbo deleted file mode 100644 index b598d50b9..000000000 Binary files a/buildroot-external/board/rpi2/barebox-env/overlay/rpi-v3d.dtbo and /dev/null differ diff --git a/buildroot-external/board/rpi2/patches/barebox/0001-ARM-dts-bcm2836-rpi-2-re-enable-booting-from-SD-card.patch b/buildroot-external/board/rpi2/patches/barebox/0001-ARM-dts-bcm2836-rpi-2-re-enable-booting-from-SD-card.patch index bb4245409..dc5c9a29a 100644 --- a/buildroot-external/board/rpi2/patches/barebox/0001-ARM-dts-bcm2836-rpi-2-re-enable-booting-from-SD-card.patch +++ b/buildroot-external/board/rpi2/patches/barebox/0001-ARM-dts-bcm2836-rpi-2-re-enable-booting-from-SD-card.patch @@ -1,7 +1,7 @@ From 6344ec5c84a49c2df4c2f26b52d317a34e3bc0c7 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 4 Jun 2018 07:55:46 +0000 -Subject: [PATCH 1/3] ARM: dts: bcm2836-rpi-2: re-enable booting from SD card +Subject: [PATCH 1/2] ARM: dts: bcm2836-rpi-2: re-enable booting from SD card Signed-off-by: Pascal Vizeli --- 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 12e0aaf9c..1b2aa853a 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 e3e89d8d6fd9ba6567bccb65a9d8221b5b01492e Mon Sep 17 00:00:00 2001 +From 1f5edc2b907c89a3e27f55490479a0999b1127dc Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 4 Jun 2018 09:17:25 +0000 -Subject: [PATCH 2/3] ARM: dts: add more functions +Subject: [PATCH 2/2] ARM: dts: add more functions Signed-off-by: Pascal Vizeli --- arch/arm/dts/bcm2835-rpi.dts | 4 ---- arch/arm/dts/bcm2836-rpi-2.dts | 4 ---- - dts/src/arm/bcm2835-rpi.dtsi | 6 ++++++ - dts/src/arm/bcm283x.dtsi | 12 ++++-------- - 4 files changed, 10 insertions(+), 16 deletions(-) + dts/src/arm/bcm2835-rpi.dtsi | 38 ++++++++++++++++++++++++++++++++-- + dts/src/arm/bcm283x.dtsi | 12 ++++------- + 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/arch/arm/dts/bcm2835-rpi.dts b/arch/arm/dts/bcm2835-rpi.dts index c23e7c7c1..22d60e961 100644 @@ -42,10 +42,10 @@ 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..2bb406e28 100644 +index e36c392a2..86f1d493c 100644 --- a/dts/src/arm/bcm2835-rpi.dtsi +++ b/dts/src/arm/bcm2835-rpi.dtsi -@@ -27,6 +27,12 @@ +@@ -27,6 +27,39 @@ firmware = <&firmware>; #power-domain-cells = <1>; }; @@ -53,11 +53,58 @@ index e36c392a2..2bb406e28 100644 + fb: fb { + compatible = "brcm,bcm2708-fb"; + firmware = <&firmware>; ++ status = "okay"; ++ }; ++ ++ vchiq: vchiq { ++ compatible = "brcm,bcm2835-vchiq"; ++ reg = <0x7e00b840 0xf>; ++ interrupts = <0 2>; ++ cache-line-size = <32>; ++ firmware = <&firmware>; ++ }; ++ ++ vcsm: vcsm { ++ compatible = "raspberrypi,bcm2835-vcsm"; ++ firmware = <&firmware>; ++ status = "okay"; ++ }; ++ ++ /* Onboard audio */ ++ audio: audio { ++ compatible = "brcm,bcm2835-audio"; ++ brcm,pwm-channels = <8>; ++ status = "okay"; ++ }; ++ ++ /* External sound card */ ++ sound: sound { + status = "disabled"; + }; ++ }; }; +@@ -91,12 +124,12 @@ + + &hdmi { + power-domains = <&power RPI_POWER_DOMAIN_HDMI>; +- status = "okay"; ++ status = "disabled"; + }; + + &vec { + power-domains = <&power RPI_POWER_DOMAIN_VEC>; +- status = "okay"; ++ status = "disabled"; + }; + + &dsi0 { +@@ -106,3 +139,4 @@ + &dsi1 { + power-domains = <&power RPI_POWER_DOMAIN_DSI1>; + }; ++ 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/fdt/rpi-dwc.dtbo b/fdt/rpi-dwc.dtbo index 800d46773..3f7b691d4 100644 Binary files a/fdt/rpi-dwc.dtbo and b/fdt/rpi-dwc.dtbo differ diff --git a/fdt/rpi-dwc.dtso b/fdt/rpi-dwc.dtso index 7863c6cb9..6e5b61a5f 100644 --- a/fdt/rpi-dwc.dtso +++ b/fdt/rpi-dwc.dtso @@ -8,7 +8,7 @@ target = <&usb>; #address-cells = <1>; #size-cells = <1>; - dwc2_usb: __overlay__ { + __overlay__ { compatible = "brcm,bcm2835-usb"; reg = <0x7e980000 0x10000>; interrupts = <1 9>; diff --git a/scripts/update-dtb.sh b/scripts/update-dtb.sh index aeebbb606..983d2ac42 100755 --- a/scripts/update-dtb.sh +++ b/scripts/update-dtb.sh @@ -9,7 +9,8 @@ dtc -@ -I dts -O dtb -o fdt/barebox-state-rpi.dtbo fdt/barebox-state-rpi.dtso cp -f fdt/barebox-state-rpi.dtbo buildroot-external/board/rpi2/barebox-env/overlay/ dtc -@ -I dts -O dtb -o fdt/rpi-v3d.dtbo fdt/rpi-v3d.dtso -cp -f fdt/rpi-v3d.dtbo buildroot-external/board/rpi2/barebox-env/overlay/ +#cp -f fdt/rpi-v3d.dtbo buildroot-external/board/rpi2/barebox-env/overlay/ dtc -@ -I dts -O dtb -o fdt/rpi-dwc.dtbo fdt/rpi-dwc.dtso -cp -f fdt/rpi-dwc.dtbo buildroot-external/board/rpi2/barebox-env/overlay/ +#cp -f fdt/rpi-dwc.dtbo buildroot-external/board/rpi2/barebox-env/overlay/ +