Rpi upstream overlay

buildroot-external/barebox.config

@@ -36,6 +36,9 @@ CONFIG_CMD_READF=y
 CONFIG_OFTREE=y
 CONFIG_OFTREE_OVERLAY=y
 
+CONFIG_DISK=y
+CONFIG_DISK_WRITE=y
+
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y

buildroot-external/board/ova/post-image.sh

@@ -18,7 +18,7 @@ mkdir -p ${BOOT_DATA}/EFI/BOOT
 mkdir -p ${BOOT_DATA}/EFI/barebox
 
 cp ${BINARIES_DIR}/barebox.bin ${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI
-cp ${BR2_EXTERNAL_HASSOS_PATH}/fdt/barebox-state-efi.dtb ${BOOT_DATA}/EFI/barebox/state.dtb
+cp ${BOARD_DIR}/barebox-state-efi.dtb ${BOOT_DATA}/EFI/barebox/state.dtb
 
 # Create other layers
 create_boot_image ${BINARIES_DIR}

buildroot-external/board/rpi2/barebox-env/init/rpi_bootargs

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+global linux.bootargs.rpi="cma=64M"

buildroot-external/board/rpi2/barebox.config

@@ -6,10 +6,8 @@ CONFIG_ARM_UNWIND=y
 CONFIG_MMU=y
 CONFIG_MALLOC_TLSF=y
 CONFIG_KALLSYMS=y
-CONFIG_SERIAL_AMBA_PL011=y
 # CONFIG_SPI is not set
 CONFIG_MCI=y
 CONFIG_MCI_BCM283X=y
-CONFIG_GPIO_BCM283X=y
 # CONFIG_PINCTRL is not set
 CONFIG_REGULATOR=y

fdt/barebox-state-rpi.dtso

@@ -2,6 +2,7 @@
 /plugin/;
 
 / {
+	compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
 
 	fragment@0 {
 		target = <&sdhci>;

fdt/rpi-dwc.dtso

@@ -0,0 +1,23 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "brcm,bcm2708";
+
+	fragment@0 {
+		target = <&usb>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		dwc2_usb: __overlay__ {
+			compatible = "brcm,bcm2835-usb";
+			reg = <0x7e980000 0x10000>;
+			interrupts = <1 9>;
+			dr_mode = "otg";
+			g-np-tx-fifo-size = <32>;
+			g-rx-fifo-size = <256>;
+			g-tx-fifo-size = <512 512 512 512 512 256 256>;
+			status = "okay";
+		};
+	};
+};
+

fdt/rpi-v3d.dtso

@@ -0,0 +1,108 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
+
+	fragment@0 {
+		target = <&i2c2>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@1 {
+		target = <&fb>;
+
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@2 {
+		target = <&pixelvalve0>;
+
+		__overlay__ {
+			interrupts = <0x2 0xd>;
+			status = "okay";
+		};
+	};
+
+	fragment@3 {
+		target = <&pixelvalve1>;
+
+		__overlay__ {
+			interrupts = <0x2 0xe>;
+			status = "okay";
+		};
+	};
+
+	fragment@4 {
+		target = <&pixelvalve2>;
+
+		__overlay__ {
+			interrupts = <0x2 0xa>;
+			status = "okay";
+		};
+	};
+
+	fragment@5 {
+		target = <&hvs>;
+
+		__overlay__ {
+			interrupts = <0x2 0x1>;
+			status = "okay";
+		};
+	};
+
+	fragment@6 {
+		target = <&hdmi>;
+
+		__overlay__ {
+			interrupts = <0x2 0x8 0x2 0x9>;
+			status = "okay";
+		};
+	};
+
+	fragment@7 {
+		target = <&v3d>;
+
+		__overlay__ {
+			interrupts = <0x1 0xa>;
+			status = "okay";
+		};
+	};
+
+	fragment@8 {
+		target = <&vc4>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@9 {
+		target-path = "/soc/dma";
+
+		__overlay__ {
+			brcm,dma-channel-mask = <0x7f35>;
+		};
+	};
+
+	fragment@10 {
+		target = <&clocks>;
+
+		__overlay__ {
+			claim-clocks = <0x22 0x23 0xf 0x10>;
+		};
+	};
+
+	fragment@11 {
+		target = <&vec>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};

scripts/update-dtb.sh

@@ -1,5 +1,15 @@
 #!/bin/sh
 
-dtc -I dts -O dtb -o buildroot-external/fdt/barebox-state-efi.dtb buildroot-external/fdt/barebox-state-efi.dts
+## OVA
+dtc -@ -I dts -O dtb -o fdt/barebox-state-efi.dtb fdt/barebox-state-efi.dts
+cp -f fdt/barebox-state-efi.dtb buildroot-external/board/ova/
 
-dtc -@ -I dts -O dtb -o buildroot-external/fdt/barebox-state-rpi.dtbo buildroot-external/fdt/barebox-state-rpi.dtso
+## Raspberry
+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/
+
+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/