ROS: switch over to v4.19.x-ti-rt by default

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

publish/rcn-ee_bb.org-stable.sh

@@ -35,7 +35,7 @@ if [ ! -f jenkins.build ] ; then
 ./RootStock-NG.sh -c bb.org-debian-buster-iot-v4.14
 ./RootStock-NG.sh -c bb.org-debian-buster-efi-iot-v4.14
 
-./RootStock-NG.sh -c bb.org-ubuntu-bionic-ros-iot-v4.14
+./RootStock-NG.sh -c bb.org-ubuntu-bionic-ros-iot-v4.19
 
 else
 	mkdir -p ${DIR}/deploy/ || true
@@ -75,6 +75,7 @@ xz_tar="xz -T3 -z -8"
 beaglebone="--dtb beaglebone --rootfs_label rootfs --hostname beaglebone"
 pru_rproc_v44ti="--enable-uboot-pru-rproc-44ti"
 pru_rproc_v414ti="--enable-uboot-pru-rproc-414ti"
+pru_rproc_mainline="--enable-mainline-pru-rproc"
 
 beagle_xm="--dtb omap3-beagle-xm --rootfs_label rootfs --hostname beagleboard"
 
@@ -306,7 +307,7 @@ options="--img-4gb bone-\${base_rootfs}      ${beaglebone} ${pru_rproc_v414ti} -
 ###ros iot image (bionic):
 base_rootfs="${ubuntu_bionic_ros_iot}" ; blend="bionic-ros-iot" ; extract_base_rootfs
 
-options="--img-6gb bone-\${base_rootfs}      ${beaglebone} ${pru_rproc_v414ti}"  ; generate_img
+options="--img-6gb bone-\${base_rootfs}      ${beaglebone} ${pru_rproc_mainline}"  ; generate_img
 options="--img-6gb bbx15-\${base_rootfs}     ${beagle_x15}"                      ; generate_img
 
 ###archive *.tar

tools/setup_sdcard.sh

@@ -1276,6 +1276,15 @@ populate_rootfs () {
 				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-UIO-00A0.dtbo" >> ${wfile}
 				use_pru_uio="blocked"
 			fi
+			if [ "x${mainline_pru_rproc}" = "xenable" ] ; then
+				echo "###pru_rproc (4.4.x-ti kernel)" >> ${wfile}
+				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-4-TI-00A0.dtbo" >> ${wfile}
+				echo "###pru_rproc (4.14.x-ti kernel)" >> ${wfile}
+				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-14-TI-00A0.dtbo" >> ${wfile}
+				echo "###pru_uio (4.4.x-ti, 4.14.x-ti & mainline/bone kernel)" >> ${wfile}
+				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-UIO-00A0.dtbo" >> ${wfile}
+				use_pru_uio="blocked"
+			fi
 			if [ "x${use_pru_uio}" = "x" ] ; then
 				echo "###pru_rproc (4.4.x-ti kernel)" >> ${wfile}
 				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-4-TI-00A0.dtbo" >> ${wfile}
@@ -2008,6 +2017,9 @@ while [ ! -z "$1" ] ; do
 	--enable-uboot-pru-rproc-414ti)
 		uboot_pru_rproc_414ti="enable"
 		;;
+	--enable-mainline-pru-rproc)
+		mainline_pru_rproc="enable"
+		;;
 	--efi)
 		uboot_efi_mode="enable"
 		;;