diff --git a/mainline_boot.txt b/mainline_boot.txt
index 838a513..bbb2a8c 100644
--- a/mainline_boot.txt
+++ b/mainline_boot.txt
@@ -71,9 +71,7 @@ else
     if part start mmc ${mmcnum} recovery boot_start; then echo Recovery partition found
     else echoe Recovery partition not found!; echoe Rebooting in 10s..; sleep 10; reset; fi
     part size mmc ${mmcnum} recovery boot_size
-
-    echo Applying WAR: USB3 required for recovery
-    setenv usb3_enable 1
+    echoe Recovery
 fi
 mmc read ${kernload} ${boot_start} ${boot_size};
 
@@ -123,7 +121,6 @@ if   test ${uart_port} = 1; then
 	setenv bootargs_extra ${bootargs_extra} ${uarta}
 	#fdt set /serial@70006000 compatible nvidia,tegra20-uart
 	fdt set /serial@70006000 status okay
-
 	if test ${earlycon} = 1; then
 		echoe Early  logging enabled
 		setenv bootargs_extra ${bootargs_extra} ${uarta_early}
@@ -229,14 +226,12 @@ fdt set /chosen nvidia,bluetooth-mac ${bt_mac}
 
 # Set kernel cmdline.
 setenv bootargs ${bootargs_extra} "ro init=/init firmware_class.path=/vendor/firmware \
- pmc_r2p.enabled=1 pmc_r2p.action=${r2p_action} \
- pmc_r2p.param1=${autoboot} pmc_r2p.param2=${autoboot_list} \
+ r2p-tegra.enabled=1 r2p-tegra.action=${r2p_action} \
+ r2p-tegra.param1=${autoboot} r2p-tegra.param2=${autoboot_list} \
  fbcon=map:${fbconsole} consoleblank=0 \
- latency_allowance.ptsa_rework \
- nvdec_enabled=0 tegra_fbmem=0x800000@0xf5a00000 \
  androidboot.bootloader=${blver} androidboot.hardware=nx \
  androidboot.hardware.sku=${variant} androidboot.serialno=${device_serial_restricted} \
- androidboot.modem=none androidboot.dtb_idx=${sku} "
+ androidboot.modem=none androidboot.dtb_idx=${sku} androidboot.verifiedbootstate=orange "
 
 # Boot kernel.
 echo Launching Kernel!