From 98555b24f8a33791fa26e630ae9c5f6ee4be0c14 Mon Sep 17 00:00:00 2001
From: CTCaer <ctcaer@gmail.com>
Date: Sat, 15 Aug 2020 13:12:41 +0300
Subject: [PATCH] l4t: Clear boot mode if user canceled autoboot

---
 bdk/soc/hw_init.c | 3 ---
 bdk/soc/pmc.h     | 1 +
 bootloader/main.c | 3 +++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bdk/soc/hw_init.c b/bdk/soc/hw_init.c
index 6c92251..3c346a3 100644
--- a/bdk/soc/hw_init.c
+++ b/bdk/soc/hw_init.c
@@ -384,9 +384,6 @@ void hw_init()
 	sdram_init();
 
 	bpmp_mmu_enable();
-
-	// L4T: Clear flags from PMC_SCRATCH0.
-	PMC(APBDEV_PMC_SCRATCH0) &= ~PMC_SCRATCH0_MODE_PAYLOAD;
 }
 
 void hw_reinit_workaround(bool extra_reconfig, u32 magic)
diff --git a/bdk/soc/pmc.h b/bdk/soc/pmc.h
index 597e6cd..f2ea107 100644
--- a/bdk/soc/pmc.h
+++ b/bdk/soc/pmc.h
@@ -37,6 +37,7 @@
 #define  PMC_SCRATCH0_MODE_PAYLOAD  (1 << 29)
 #define  PMC_SCRATCH0_MODE_RCM      (1 << 1)
 #define  PMC_SCRATCH0_MODE_WARMBOOT (1 << 0)
+#define  PMC_SCRATCH0_MODE_CUSTOM_ALL (PMC_SCRATCH0_MODE_RECOVERY | PMC_SCRATCH0_MODE_FASTBOOT | PMC_SCRATCH0_MODE_PAYLOAD)
 #define APBDEV_PMC_SCRATCH1 0x54
 #define APBDEV_PMC_SCRATCH20 0xA0
 #define APBDEV_PMC_PWR_DET_VAL 0xE4
diff --git a/bootloader/main.c b/bootloader/main.c
index 5e5caa5..098c16f 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -1080,6 +1080,9 @@ out:
 	b_cfg.boot_cfg &= BOOT_CFG_SEPT_RUN;
 	h_cfg.emummc_force_disable = false;
 
+	// L4T: Clear custom boot mode flags from PMC_SCRATCH0.
+	PMC(APBDEV_PMC_SCRATCH0) &= ~PMC_SCRATCH0_MODE_CUSTOM_ALL;
+
 	nyx_load_run();
 
 	sd_end();