From 9ec32eda850fc377a0b37c631fd7ce197d153538 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sun, 3 Jun 2018 22:15:41 +0000 Subject: [PATCH] Rpi upstream overlay --- buildroot-external/barebox.config | 3 + .../board/ova/barebox-state-efi.dtb | Bin 0 -> 1177 bytes buildroot-external/board/ova/post-image.sh | 2 +- .../board/rpi2/barebox-env/init/rpi_bootargs | 3 + .../overlay/barebox-state-rpi.dtbo | Bin 879 -> 931 bytes .../rpi2/barebox-env/overlay/rpi-dwc.dtbo | Bin 0 -> 636 bytes .../rpi2/barebox-env/overlay/rpi-v3d.dtbo | Bin 0 -> 1744 bytes buildroot-external/board/rpi2/barebox.config | 2 - buildroot-external/fdt/barebox-state-efi.dtb | Bin 1075 -> 0 bytes buildroot-external/fdt/barebox-state-rpi.dtbo | Bin 879 -> 0 bytes fdt/barebox-state-efi.dtb | Bin 0 -> 1177 bytes .../fdt => fdt}/barebox-state-efi.dts | 0 fdt/barebox-state-rpi.dtbo | Bin 0 -> 931 bytes .../fdt => fdt}/barebox-state-rpi.dtso | 1 + fdt/rpi-dwc.dtbo | Bin 0 -> 636 bytes fdt/rpi-dwc.dtso | 23 ++++ fdt/rpi-v3d.dtbo | Bin 0 -> 1744 bytes fdt/rpi-v3d.dtso | 108 ++++++++++++++++++ scripts/update-dtb.sh | 14 ++- 19 files changed, 151 insertions(+), 5 deletions(-) create mode 100644 buildroot-external/board/ova/barebox-state-efi.dtb create mode 100644 buildroot-external/board/rpi2/barebox-env/init/rpi_bootargs create mode 100644 buildroot-external/board/rpi2/barebox-env/overlay/rpi-dwc.dtbo create mode 100644 buildroot-external/board/rpi2/barebox-env/overlay/rpi-v3d.dtbo delete mode 100644 buildroot-external/fdt/barebox-state-efi.dtb delete mode 100644 buildroot-external/fdt/barebox-state-rpi.dtbo create mode 100644 fdt/barebox-state-efi.dtb rename {buildroot-external/fdt => fdt}/barebox-state-efi.dts (100%) create mode 100644 fdt/barebox-state-rpi.dtbo rename {buildroot-external/fdt => fdt}/barebox-state-rpi.dtso (89%) create mode 100644 fdt/rpi-dwc.dtbo create mode 100644 fdt/rpi-dwc.dtso create mode 100644 fdt/rpi-v3d.dtbo create mode 100644 fdt/rpi-v3d.dtso diff --git a/buildroot-external/barebox.config b/buildroot-external/barebox.config index c3dd39837..3fce53aee 100644 --- a/buildroot-external/barebox.config +++ b/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 diff --git a/buildroot-external/board/ova/barebox-state-efi.dtb b/buildroot-external/board/ova/barebox-state-efi.dtb new file mode 100644 index 0000000000000000000000000000000000000000..c4bf99d08649968659d6a8fa427a4c426690c58a GIT binary patch literal 1177 zcmb7DSx&<+5On~tiCu62gi!e)B2C!J4;4S$fuG2Uoz^0oY*%gh=MHcy4!{)Xb zOUUNSSbhhw(G_Hw{)X=-ZI&7;%@b#w`^R3%6Dm@Xc6_P|}gsVF&DCn-7C$imnZ z!7(?mK;~FZw3B7zp1gojnw1l%M`&V=K9tJ}=AKbjlms$BhJy@d0b&g#z95jzFj;`H fpOJg>0>%VJ?&SR3g2a-{q?}ZSNz9s)O_;3#k{%;1 delta 163 zcmZ3?{+>BqfVk-iAO{^VLIoJpiW1XvQ}aq348S7HK#~Q- znm9q8k$vI@eMW|f4}h#mjLM39Kw*$Rm>O9mz95jTIoXA=AERB<#)y6?RsqW~=ahiaqV8 z$DW^#&qwH0niFafr82XZqmonZ8nF2bgKzi_V(QoM!E*+r$3Luzj@Q(*3CxbzwX!^17_-zYG0!p>Ar0j-;Jd zuinn=`6|tYjlD#&DuoS15NK%(_hph8HZbvntYa-B7H3v!UF6oVK)b05B#U^Kb35Z< e94b!fP;{4ec8wLbFf6|jS%A60y+3y8%l-g+DQ<`W literal 0 HcmV?d00001 diff --git a/buildroot-external/board/rpi2/barebox-env/overlay/rpi-v3d.dtbo b/buildroot-external/board/rpi2/barebox-env/overlay/rpi-v3d.dtbo new file mode 100644 index 0000000000000000000000000000000000000000..b598d50b95cc1d2174ba7572edd466c94d3dcb96 GIT binary patch literal 1744 zcmbW2xlY4C5QZmQ;t*FPkZ1u33alhfLIR?oqN1ZgqOjKMO=884Bd=pYML|PBLBWIN zMR)~Z#!j>*vXzCECVPGU*E@$Z-u(ImSQ!IA8~ZElPtkVKcF?GO;QCTJ{PkO!%oedf zp|Kru|IFsT*{(O$q*ZNaCl|?6rB2AYz8FN;)nrZ@bjHRvHtb856~rR+*pp=uK>N#R z<)F`=XaU>8#FSPoS=Z58L$d6+lG&bclBe?YOl`eYBoEN&oi@?*-nWiq%FercR)0%d zzws~qb#49Tzw{|@^!#(Ktxvf+^*{NF;y^LhJEw)@-{L@b(DxHomZtvv98c?q?nU=I zuE>B_9G}qv*z)Rzato{MnWB|bGf4rG-n<+nAK#!Iq8*`aqtRN9W>SbcnuYhZtd9FQ z8p^c%lQ{0-S$7rn;kb-g*cH)bask|<^N6`uOs$A{P>fl`bQM!CVx(dkMa;8ennlcu zV$O@0SH-l7m^a0=^O$|~&#hu=)ftFkh=c0kPol11}v%xc~qF literal 0 HcmV?d00001 diff --git a/buildroot-external/board/rpi2/barebox.config b/buildroot-external/board/rpi2/barebox.config index 14c2094d7..7e42ac1e0 100644 --- a/buildroot-external/board/rpi2/barebox.config +++ b/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 diff --git a/buildroot-external/fdt/barebox-state-efi.dtb b/buildroot-external/fdt/barebox-state-efi.dtb deleted file mode 100644 index 297ab8ba7243121a200d395ae0a00ceaec2996f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1075 zcmb7DSx&<+5S>!QCRPa!fDnQYBGMR2%MTSl+<^~}6FaR%nnboMTE001hv5*t2;v5a znJitPK(RELrSo3iOr7Dz#~Z*R1AqoV^%eaw+78+_8l6Y1Kj-1pvr=Rg9w~05p|py& zOu?zK+)9dI0j)Alvz|q)Em0kfFqH3o$@kx1uCI#UH_;#YTuVRcpUmL$zF;pkN7-ZU z8-T4L_4r9*XW)O*QZWN#W!IhL`mtBbE?2RN+xOfeD7B`Q0Sg@~=x>P#56xTd>bj?5 z%V>hJ-n$~sc9&|EXk`bjvr$jUMLhFx?P4Es<^M%CQ;o>V-T!AMyeHWqY^j6%JUR$C zJySrXOh?JJj`=)XYuGoMDdNW72c5*oxK+!yKB;f}7tWF+*TuC}RwZ$Eo&Veqy@S4$ zqfqswaMEe?_j`Ycy&+>BtDo1J&PB*P=S+m5({NqSVXW!;buVCUQ(zw*;-_6CX!Na2 zYF*9m@c|b?OJkfsMv;L7qn>0DcX?X{5G37{TjfU*d>%Z=Sd`wegLG7MjMYj=f`gWA V5HjSw$O6sO>nQ>3`9ox_e`hm>Gpul-tvjc=>UTH}IG<}!1)179JM zZHhjz;95yy9%Z5VGD)aR`(0Q^D9cA$3Myi?D+_#)um6W{2gr_@@umL*J#$_-<&?>6 zgW~`hoxA2dS<7kWi?Mo=qPOw)I^S&^M*~_wmpr@hm)3D7eaUn0Asn8Pf-k;U_q#zx z{p(q4A7+jl_`ftHjqf)2ptW7jM@HMA^%XGp{naH!{k8k(he<=&9MPW@yijJ5SG0b{ zWALVdcQACkm`FD)l_|9$%tOFLzhP9s#G4q>2>rE5xo(~U_0?FVZa=-XS|`wa)4f}s znbGwvEIZ>u6w=yWDz!#x)w8VP)Xa146y7V-d?Yn1r@o(WV&Je|o*)IRaAA+cg= MtYdJg@*O1m0tY#*(*OVf diff --git a/fdt/barebox-state-efi.dtb b/fdt/barebox-state-efi.dtb new file mode 100644 index 0000000000000000000000000000000000000000..c4bf99d08649968659d6a8fa427a4c426690c58a GIT binary patch literal 1177 zcmb7DSx&<+5On~tiCu62gi!e)B2C!J4;4S$fuG2Uoz^0oY*%gh=MHcy4!{)Xb zOUUNSSbhhw(G_Hw{)X=-ZI&7;%@b#w`^R3%6Dm@Xc6_P>|pFyKo^c!VM5G z<0N%cKEl#uK6&%(dG_n>#~UH77edGYd>{NN*gn`E7%oLf^Suab-$t3Wz@K0o<#BQr z#Yr$Yzi`QwH&{)sZC7KQ(@DZpGxBVX92;OepRm9;!caZ%T+&4tA^`ul!8%N68cEKu z2&-9|%26jW7LS~D*Sc5vMnT|v zxDai5w!rtbp@!R%t!+a%JVMo; diff --git a/fdt/rpi-dwc.dtbo b/fdt/rpi-dwc.dtbo new file mode 100644 index 0000000000000000000000000000000000000000..800d467738ea52df407ea785d57cf21a5f1e3754 GIT binary patch literal 636 zcmZ8e%SyvQ6rK10ixgB4T)0rWapBNf5leC5!f$XJCdniQlT4VIXshDJjSD}(Pw_MS z5y3A|&&|U$y>RB<#)y6?RsqW~=ahiaqV8 z$DW^#&qwH0niFafr82XZqmonZ8nF2bgKzi_V(QoM!E*+r$3Luzj@Q(*3CxbzwX!^17_-zYG0!p>Ar0j-;Jd zuinn=`6|tYjlD#&DuoS15NK%(_hph8HZbvntYa-B7H3v!UF6oVK)b05B#U^Kb35Z< e94b!fP;{4ec8wLbFf6|jS%A60y+3y8%l-g+DQ<`W literal 0 HcmV?d00001 diff --git a/fdt/rpi-dwc.dtso b/fdt/rpi-dwc.dtso new file mode 100644 index 000000000..7863c6cb9 --- /dev/null +++ b/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"; + }; + }; +}; + diff --git a/fdt/rpi-v3d.dtbo b/fdt/rpi-v3d.dtbo new file mode 100644 index 0000000000000000000000000000000000000000..b598d50b95cc1d2174ba7572edd466c94d3dcb96 GIT binary patch literal 1744 zcmbW2xlY4C5QZmQ;t*FPkZ1u33alhfLIR?oqN1ZgqOjKMO=884Bd=pYML|PBLBWIN zMR)~Z#!j>*vXzCECVPGU*E@$Z-u(ImSQ!IA8~ZElPtkVKcF?GO;QCTJ{PkO!%oedf zp|Kru|IFsT*{(O$q*ZNaCl|?6rB2AYz8FN;)nrZ@bjHRvHtb856~rR+*pp=uK>N#R z<)F`=XaU>8#FSPoS=Z58L$d6+lG&bclBe?YOl`eYBoEN&oi@?*-nWiq%FercR)0%d zzws~qb#49Tzw{|@^!#(Ktxvf+^*{NF;y^LhJEw)@-{L@b(DxHomZtvv98c?q?nU=I zuE>B_9G}qv*z)Rzato{MnWB|bGf4rG-n<+nAK#!Iq8*`aqtRN9W>SbcnuYhZtd9FQ z8p^c%lQ{0-S$7rn;kb-g*cH)bask|<^N6`uOs$A{P>fl`bQM!CVx(dkMa;8ennlcu zV$O@0SH-l7m^a0=^O$|~&#hu=)ftFkh=c0kPol11}v%xc~qF literal 0 HcmV?d00001 diff --git a/fdt/rpi-v3d.dtso b/fdt/rpi-v3d.dtso new file mode 100644 index 000000000..4ad0b70c9 --- /dev/null +++ b/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"; + }; + }; +}; diff --git a/scripts/update-dtb.sh b/scripts/update-dtb.sh index e634c75ca..aeebbb606 100755 --- a/scripts/update-dtb.sh +++ b/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/