sept: fix undefined behavior with emummc

sept/sept-primary/src/main.c

@@ -190,7 +190,7 @@ int load_tsec_fw(void) {
 int main(void) {    
     /* Setup vectors */
     setup_exception_vectors();
-    
+
     volatile tegra_pmc_t *pmc = pmc_get_regs();
     volatile tegra_car_t *car = car_get_regs();
     

sept/sept-primary/src/start.s

@@ -93,6 +93,10 @@ ipatch_word:
 .global jump_to_main
 .type   jump_to_main, %function
 jump_to_main:
+    /* Insert 0x40 of NOPs, for version compatibility. */
+.rept 16
+    nop
+.endr
     /* Just jump to main */
     ldr sp, =__stack_top__
     b main

sept/sept-primary/src/utils.c

@@ -27,12 +27,6 @@
 
 #include <inttypes.h>
 
-#define u8 uint8_t
-#define u32 uint32_t
-#include "rebootstub_bin.h"
-#undef u8
-#undef u32
-
 void wait(uint32_t microseconds) {
     uint32_t old_time = TIMERUS_CNTR_1US_0;
     while (TIMERUS_CNTR_1US_0 - old_time <= microseconds) {
@@ -63,29 +57,12 @@ __attribute__((noreturn)) void pmc_reboot(uint32_t scratch0) {
     }
 }
 
-__attribute__((noreturn)) void reboot_to_self(void) {
-    /* Patch SDRAM init to perform an SVC immediately after second write */
-    APBDEV_PMC_SCRATCH45_0 = 0x2E38DFFF;
-    APBDEV_PMC_SCRATCH46_0 = 0x6001DC28;
-    /* Set SVC handler to jump to reboot stub in IRAM. */
-    APBDEV_PMC_SCRATCH33_0 = 0x4003F000;
-    APBDEV_PMC_SCRATCH40_0 = 0x6000F208;
-    
-    /* Copy reboot stub into IRAM high. */
-    for (size_t i = 0; i < rebootstub_bin_size; i += sizeof(uint32_t)) {
-        write32le((void *)0x4003F000, i, read32le(rebootstub_bin, i));
-    }
-    
-    /* Trigger warm reboot. */
-    pmc_reboot(1 << 0);
-}
-
 __attribute__((noreturn)) void wait_for_button_and_reboot(void) {
     uint32_t button;
     while (true) {
         button = btn_read();
         if (button & BTN_POWER) {
-            reboot_to_self();
+            pmc_reboot(2);
         }
     }
 }

sept/sept-primary/src/utils.h

@@ -121,7 +121,6 @@ void hexdump(const void* data, size_t size, uintptr_t addrbase);
 
 __attribute__((noreturn)) void watchdog_reboot(void);
 __attribute__((noreturn)) void pmc_reboot(uint32_t scratch0);
-__attribute__((noreturn)) void reboot_to_self(void);
 __attribute__((noreturn)) void wait_for_button_and_reboot(void);
 
 __attribute__((noreturn)) void generic_panic(void);