Organize device tree overlays to simplify finding them

Author: fhunleth

fwup.conf

@@ -7,97 +7,45 @@ include("${NERVES_SDK_IMAGES:-.}/fwup_include/fwup-common.conf")
 # File resources are listed in the order that they are included in the .fw file
 # This is important, since this is the order that they're written on a firmware
 # update due to the event driven nature of the update system.
-file-resource fixup4.dat {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/fixup4x.dat"
-}
-file-resource start4.elf {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/start4x.elf"
-}
-file-resource config.txt {
-    host-path = "${NERVES_SYSTEM}/images/config.txt"
-}
-file-resource cmdline.txt {
-    host-path = "${NERVES_SYSTEM}/images/cmdline.txt"
-}
-file-resource kernel8.img {
-    host-path = "${NERVES_SYSTEM}/images/Image"
-}
-file-resource bcm2712-rpi-5-b.dtb {
-    host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-5-b.dtb"
-}
-file-resource bcm2712-rpi-cm5-cm4io.dtb {
-    host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5-cm4io.dtb"
-}
-file-resource bcm2712-rpi-cm5-cm5io.dtb {
-    host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5-cm5io.dtb"
-}
-file-resource bcm2712-rpi-cm5l-cm4io.dtb {
-    host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5l-cm4io.dtb"
-}
-file-resource bcm2712-rpi-cm5l-cm5io.dtb {
-    host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5l-cm5io.dtb"
-}
-file-resource overlay_map.dtb {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/overlay_map.dtb"
-}
-file-resource bcm2712d0.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/bcm2712d0.dtbo"
-}
-file-resource rpi-ft5406.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/rpi-ft5406.dtbo"
-}
-file-resource rpi-backlight.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/rpi-backlight.dtbo"
-}
-file-resource w1-gpio-pullup.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/w1-gpio-pullup.dtbo"
-}
-file-resource miniuart-bt.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/miniuart-bt.dtbo"
-}
-file-resource vc4-kms-v3d.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/vc4-kms-v3d.dtbo"
-}
-file-resource vc4-kms-dsi-7inch.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/vc4-kms-dsi-7inch.dtbo"
-}
-file-resource tc358743.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/tc358743.dtbo"
-}
-file-resource dwc2.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/dwc2.dtbo"
-}
-file-resource ramoops.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/ramoops.dtb"
-}
-file-resource imx219.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/imx219.dtbo"
-}
-file-resource imx296.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/imx296.dtbo"
-}
-file-resource imx477.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/imx477.dtbo"
-}
-file-resource imx708.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/imx708.dtbo"
-}
-file-resource ov5647.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/ov5647.dtbo"
-}
-file-resource i2c-mux.dtbo {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/i2c-mux.dtbo"
-}
+file-resource fixup4.dat { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/fixup4x.dat" }
+file-resource start4.elf { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/start4x.elf" }
+file-resource config.txt { host-path = "${NERVES_SYSTEM}/images/config.txt" }
+file-resource cmdline.txt { host-path = "${NERVES_SYSTEM}/images/cmdline.txt" }
+file-resource kernel8.img { host-path = "${NERVES_SYSTEM}/images/Image" }
+file-resource bcm2712-rpi-5-b.dtb { host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-5-b.dtb" }
+file-resource bcm2712-rpi-cm5-cm4io.dtb { host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5-cm4io.dtb" }
+file-resource bcm2712-rpi-cm5-cm5io.dtb { host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5-cm5io.dtb" }
+file-resource bcm2712-rpi-cm5l-cm4io.dtb { host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5l-cm4io.dtb" }
+file-resource bcm2712-rpi-cm5l-cm5io.dtb { host-path = "${NERVES_SYSTEM}/images/bcm2712-rpi-cm5l-cm5io.dtb" }
+
+file-resource overlay_map.dtb { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/overlay_map.dtb" }
+
+file-resource bcm2712d0.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/bcm2712d0.dtbo" }
+file-resource dwc2.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/dwc2.dtbo" }
+file-resource i2c-mux.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/i2c-mux.dtbo" }
 file-resource i2c0-pi5.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/i2c0-pi5.dtbo" }
 file-resource i2c1-pi5.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/i2c1-pi5.dtbo" }
 file-resource i2c2-pi5.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/i2c2-pi5.dtbo" }
 file-resource i2c3-pi5.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/i2c3-pi5.dtbo" }
-file-resource vc4-kms-v3d-pi5.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/vc4-kms-v3d-pi5.dtbo" }
+file-resource imx219.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/imx219.dtbo" }
+file-resource imx296.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/imx296.dtbo" }
+file-resource imx477.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/imx477.dtbo" }
+file-resource imx708.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/imx708.dtbo" }
+file-resource miniuart-bt.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/miniuart-bt.dtbo" }
+file-resource ov5647.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/ov5647.dtbo" }
+file-resource ramoops.dtbo { host-path = "${NERVES_SYSTEM}/images/ramoops.dtb" }
+file-resource rpi-ft5406.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/rpi-ft5406.dtbo" }
+file-resource rpi-backlight.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/rpi-backlight.dtbo" }
+file-resource tc358743.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/tc358743.dtbo" }
 file-resource uart0-pi5.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/uart0-pi5.dtbo" }
 file-resource uart1-pi5.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/uart1-pi5.dtbo" }
 file-resource uart2-pi5.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/uart2-pi5.dtbo" }
 file-resource uart3-pi5.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/uart3-pi5.dtbo" }
 file-resource uart4-pi5.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/uart4-pi5.dtbo" }
+file-resource vc4-kms-dsi-7inch.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/vc4-kms-dsi-7inch.dtbo" }
+file-resource vc4-kms-v3d.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/vc4-kms-v3d.dtbo" }
+file-resource vc4-kms-v3d-pi5.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/vc4-kms-v3d-pi5.dtbo" }
+file-resource w1-gpio-pullup.dtbo { host-path = "${NERVES_SYSTEM}/images/rpi-firmware/overlays/w1-gpio-pullup.dtbo" }
 
 file-resource rootfs.img {
     host-path = ${ROOTFS}