uenv: r4: use own sd/emmc overlays for r4pro

Author: frank-w

uEnv_r4.txt

@@ -69,10 +69,10 @@ checkspi=if sf probe; then echo "NOR available";spidev="nor";else echo "NAND ava
 checksata=if test -n "$sata_en" && test $sata_en -eq 1;then setenv satacfg "#sata"; fi
 checkwifi=if test -n "$wifi_en" && test $wifi_en -eq 1;then setenv wificfg "#wifi"; fi
 check2g5=if test -n "$is2g5" && test $is2g5 -eq 1;then setenv variant "-2g5"; fi
-checkr4pro=if test -n "$isr4pro" && test $isr4pro -eq 1;then setenv variant "-r4pro"; fi
+checkr4pro=if test -n "$isr4pro" && test $isr4pro -eq 1;then setenv variant "-r4pro";setenv ovmmc "#ov-pro-$mmcdev"; fi
 #r4lite needs different mmc-overlays based on shematic
 checkr4lite=if test -n "$isr4lite" && test $isr4lite -eq 1;then setenv variant "-r4lite";setenv ovmmc "#ov-lite-$mmcdev";run checkspi;setenv ovspi "#ov-lite-$spidev";fi
-setbootconf=run check2g5;run checkr4pro;run checkmmc;run checksata;run checkwifi;run checkr4lite;setenv bootconf "#conf-base$variant$version$ovmmc$ovspi$wificfg$satacfg";printenv bootconf
+setbootconf=run check2g5;run checkmmc;run checksata;run checkwifi;run checkr4lite;run checkr4pro;setenv bootconf "#conf-base$variant$version$ovmmc$ovspi$wificfg$satacfg";printenv bootconf
 
 wrspimnand=if printenv bl2file;then if fatload $device $partition $loadaddr $bl2file;then mtd erase spi-nand0 0x0 0x100000;mtd write spi-nand0 $loadaddr 0x0 0x100000;else echo "loading bl2 $bl2file failed";fi;else echo "bl2file not defined";fi;if printenv fipfile;then if fatload $device $partition $loadaddr $fipfile;then mtd erase spi-nand0 0x580000 0x200000;mtd write spi-nand0 $loadaddr 0x580000 0x200000;else echo "loading fip $fipfile failed";fi;else echo "fipfile not defined";fi
 wremmc=if printenv bl2file;then mmc partconf 0 1 1 1;if fatload $device $partition $loadaddr $bl2file;then mmc erase 0x0 0x400;mmc write ${loadaddr} 0x0 0x400;else echo "loading bl2 $bl2file failed";fi;else echo "bl2file not defined";fi;mmc partconf 0 1 1 0;if printenv fipfile;then if fatload $device $partition $loadaddr $fipfile;then mmc erase 0x3400 0x1000;mmc write ${loadaddr} 0x3400 0x1000;else echo "loading fip $fipfile failed";fi;else echo "fipfile not defined";fi