u-boot: overlays more overrides

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

tools/setup_sdcard.sh

@@ -1165,24 +1165,41 @@ populate_rootfs () {
 			else
 				echo "#enable_uboot_overlays=1" >> ${wfile}
 			fi
+			echo "###" >> ${wfile}
 			echo "###Overide capes with eeprom" >> ${wfile}
 			echo "#uboot_overlay_addr0=/lib/firmware/<file0>.dtbo" >> ${wfile}
 			echo "#uboot_overlay_addr1=/lib/firmware/<file1>.dtbo" >> ${wfile}
 			echo "#uboot_overlay_addr2=/lib/firmware/<file2>.dtbo" >> ${wfile}
 			echo "#uboot_overlay_addr3=/lib/firmware/<file3>.dtbo" >> ${wfile}
+			echo "###" >> ${wfile}
+			echo "###Additional custom capes" >> ${wfile}
+			echo "#uboot_overlay_addr4=/lib/firmware/<file4>.dtbo" >> ${wfile}
+			echo "#uboot_overlay_addr5=/lib/firmware/<file5>.dtbo" >> ${wfile}
+			echo "#uboot_overlay_addr6=/lib/firmware/<file6>.dtbo" >> ${wfile}
+			echo "#uboot_overlay_addr7=/lib/firmware/<file7>.dtbo" >> ${wfile}
+			echo "###" >> ${wfile}
 			echo "###Custom Cape" >> ${wfile}
-			echo "#dtb_overlay=/lib/firmware/<file4>.dtbo" >> ${wfile}
+			echo "#dtb_overlay=/lib/firmware/<file8>.dtbo" >> ${wfile}
+			echo "###" >> ${wfile}
 			echo "###Disable auto loading of virtual capes (emmc/video/wireless)" >> ${wfile}
 			echo "#disable_uboot_overlay_emmc=1" >> ${wfile}
 			echo "#disable_uboot_overlay_video=1" >> ${wfile}
 			echo "#disable_uboot_overlay_audio=1" >> ${wfile}
 			echo "#disable_uboot_overlay_wireless=1" >> ${wfile}
+			echo "###" >> ${wfile}
 			echo "###Cape Universal Enable" >> ${wfile}
 			if [ "x${uboot_cape_overlays}" = "xenable" ] ; then
 				echo "enable_uboot_cape_universal=1" >> ${wfile}
 			else
 				echo "#enable_uboot_cape_universal=1" >> ${wfile}
 			fi
+			echo "###" >> ${wfile}
+			echo "###Debug: disable uboot autoload of Cape" >> ${wfile}
+			echo "#disable_uboot_overlay_addr0=1" >> ${wfile}
+			echo "#disable_uboot_overlay_addr1=1" >> ${wfile}
+			echo "#disable_uboot_overlay_addr2=1" >> ${wfile}
+			echo "#disable_uboot_overlay_addr3=1" >> ${wfile}
+			echo "###" >> ${wfile}
 			echo "###U-Boot fdt tweaks..." >> ${wfile}
 			echo "#uboot_fdt_buffer=0x60000" >> ${wfile}
 			echo "###U-Boot Overlays###" >> ${wfile}