From d784ba8c365d45ab3b34d037eac0bb87639b19ce Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sun, 27 May 2018 11:43:24 +0000 Subject: [PATCH] Add overlay for state to rpi --- buildroot-external/barebox-env/overlay/load | 2 +- .../rpi2/barebox-env/barebox-state-rpi.dtbo | Bin 0 -> 879 bytes .../board/rpi2/barebox-env/init/dt-sdcard | 3 -- buildroot-external/board/rpi2/barebox.config | 3 +- buildroot-external/fdt/barebox-state-efi.dtb | Bin 1097 -> 1075 bytes buildroot-external/fdt/barebox-state-rpi.dtbo | Bin 0 -> 879 bytes buildroot-external/fdt/barebox-state-rpi.dtso | 37 ++++++++++++++++++ scripts/update-dtb.sh | 4 +- 8 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 buildroot-external/board/rpi2/barebox-env/barebox-state-rpi.dtbo delete mode 100644 buildroot-external/board/rpi2/barebox-env/init/dt-sdcard create mode 100644 buildroot-external/fdt/barebox-state-rpi.dtbo create mode 100644 buildroot-external/fdt/barebox-state-rpi.dtso diff --git a/buildroot-external/barebox-env/overlay/load b/buildroot-external/barebox-env/overlay/load index 9a4bfe153..577f85111 100644 --- a/buildroot-external/barebox-env/overlay/load +++ b/buildroot-external/barebox-env/overlay/load @@ -1,5 +1,5 @@ #!/bin/sh -for i in /env/overlay/*.dbto; do +for i in /env/overlay/*.dtbo; do oftree -o $i done diff --git a/buildroot-external/board/rpi2/barebox-env/barebox-state-rpi.dtbo b/buildroot-external/board/rpi2/barebox-env/barebox-state-rpi.dtbo new file mode 100644 index 0000000000000000000000000000000000000000..99106b64956c0be88a4f8d12e984a528d0b522d2 GIT binary patch literal 879 zcma)4yH3L}6m`p^bO6D?$N~!tRhtMQ)B!Ou@&!nd8@sJlH;!T#Q6@f*kssj~fODOs zZpuSgy15UZoa=k+xBZWI#>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 literal 0 HcmV?d00001 diff --git a/buildroot-external/board/rpi2/barebox-env/init/dt-sdcard b/buildroot-external/board/rpi2/barebox-env/init/dt-sdcard deleted file mode 100644 index 7173a84c3..000000000 --- a/buildroot-external/board/rpi2/barebox-env/init/dt-sdcard +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -of_fixup_status /soc/mmc@7e202000/ diff --git a/buildroot-external/board/rpi2/barebox.config b/buildroot-external/board/rpi2/barebox.config index 7e21c077e..1cca2014f 100644 --- a/buildroot-external/board/rpi2/barebox.config +++ b/buildroot-external/board/rpi2/barebox.config @@ -37,9 +37,10 @@ CONFIG_CMD_GETOPT=y CONFIG_CMD_MENUTREE=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_DETECT=y -CONFIG_CMD_OF_FIXUP_STATUS=y +CONFIG_CMD_OFTREE=y CONFIG_CMD_STATE=y CONFIG_CMD_BOOTCHOOSER=y +CONFIG_OFTREE_OVERLAY=y CONFIG_SERIAL_AMBA_PL011=y # CONFIG_SPI is not set CONFIG_MCI=y diff --git a/buildroot-external/fdt/barebox-state-efi.dtb b/buildroot-external/fdt/barebox-state-efi.dtb index fc1ead0ccf8780baad5e1276f0b4106a3e9b01fc..297ab8ba7243121a200d395ae0a00ceaec2996f3 100644 GIT binary patch delta 62 zcmX@fv6(~T0`I@K3=AyB3=9kw3=GVBfV2h>3j(nK5Q9KDP`qWMMmzK5{meBS1sREX IDLJVO0FBWN3IG5A delta 78 zcmdnYagsyh0`I@K3=Axu3=9kw3=GU?fV2h>3j(nK5Q9K1P<+Zpjdo^EW+0CRh)XB0 WU~cBi$;>OQ&?(4B%uC5hWdHzB8xS1; diff --git a/buildroot-external/fdt/barebox-state-rpi.dtbo b/buildroot-external/fdt/barebox-state-rpi.dtbo new file mode 100644 index 0000000000000000000000000000000000000000..99106b64956c0be88a4f8d12e984a528d0b522d2 GIT binary patch literal 879 zcma)4yH3L}6m`p^bO6D?$N~!tRhtMQ)B!Ou@&!nd8@sJlH;!T#Q6@f*kssj~fODOs zZpuSgy15UZoa=k+xBZWI#>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 literal 0 HcmV?d00001 diff --git a/buildroot-external/fdt/barebox-state-rpi.dtso b/buildroot-external/fdt/barebox-state-rpi.dtso new file mode 100644 index 000000000..907baf32b --- /dev/null +++ b/buildroot-external/fdt/barebox-state-rpi.dtso @@ -0,0 +1,37 @@ +/dts-v1/; +/plugin/; + +/ { + + fragment@0 { + target = <&sdhci>; + __overlay__ { + status = "disabled"; + }; + }; + + fragment@1 { + target = <&sdhost>; + __overlay__ { + status = "okay"; + partitions { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fixed-partitions"; + + backend_state_sdhost: partition@22100000 { + label = "state"; + reg = <0x22100000 0x800000>; + }; + }; + }; + }; + + fragment@2 { + target = <&state>; + __overlay__ { + backend = <&backend_state_sdhost>; + }; + }; +}; + diff --git a/scripts/update-dtb.sh b/scripts/update-dtb.sh index 2b1406320..e634c75ca 100755 --- a/scripts/update-dtb.sh +++ b/scripts/update-dtb.sh @@ -1,3 +1,5 @@ #!/bin/sh -dtc -O dtb -o buildroot-external/fdt/barebox-state-efi.dtb buildroot-external/fdt/barebox-state-efi.dts +dtc -I dts -O dtb -o buildroot-external/fdt/barebox-state-efi.dtb buildroot-external/fdt/barebox-state-efi.dts + +dtc -@ -I dts -O dtb -o buildroot-external/fdt/barebox-state-rpi.dtbo buildroot-external/fdt/barebox-state-rpi.dtso