feature: add ram loadable app support

components/bootloader_support/src/bootloader_init.c

@@ -33,7 +33,7 @@ esp_err_t bootloader_read_bootloader_header(void)
 {
     /* load bootloader image header */
     if (bootloader_flash_read(ESP_BOOTLOADER_OFFSET, &bootloader_image_hdr, sizeof(esp_image_header_t), true) != ESP_OK) {
-        ESP_LOGE(TAG, "failed to load bootloader image header!");
+        ESP_EARLY_LOGE(TAG, "failed to load bootloader image header!");
         return ESP_FAIL;
     }
     return ESP_OK;
@@ -44,7 +44,7 @@ esp_err_t bootloader_check_bootloader_validity(void)
     unsigned int revision = efuse_hal_chip_revision();
     unsigned int major = revision / 100;
     unsigned int minor = revision % 100;
-    ESP_LOGI(TAG, "chip revision: v%d.%d", major, minor);
+    ESP_EARLY_LOGI(TAG, "chip revision: v%d.%d", major, minor);
     /* compare with the one set in bootloader image header */
     if (bootloader_common_check_chip_validity(&bootloader_image_hdr, ESP_IMAGE_BOOTLOADER) != ESP_OK) {
         return ESP_FAIL;
@@ -72,7 +72,7 @@ void bootloader_config_wdt(void)
 
 #ifdef CONFIG_BOOTLOADER_WDT_ENABLE
     //Initialize and start RWDT to protect the  for bootloader if configured to do so
-    ESP_LOGD(TAG, "Enabling RTCWDT(%d ms)", CONFIG_BOOTLOADER_WDT_TIME_MS);
+    ESP_EARLY_LOGD(TAG, "Enabling RTCWDT(%d ms)", CONFIG_BOOTLOADER_WDT_TIME_MS);
     wdt_hal_init(&rwdt_ctx, WDT_RWDT, 0, false);
     uint32_t stage_timeout_ticks = (uint32_t)((uint64_t)CONFIG_BOOTLOADER_WDT_TIME_MS * rtc_clk_slow_freq_get_hz() / 1000);
     wdt_hal_write_protect_disable(&rwdt_ctx);
@@ -90,14 +90,14 @@ void bootloader_config_wdt(void)
 
 void bootloader_enable_random(void)
 {
-    ESP_LOGI(TAG, "Enabling RNG early entropy source...");
+    ESP_EARLY_LOGI(TAG, "Enabling RNG early entropy source...");
     bootloader_random_enable();
 }
 
 void bootloader_print_banner(void)
 {
-    ESP_LOGI(TAG, "ESP-IDF %s 2nd stage bootloader", IDF_VER);
+    ESP_EARLY_LOGI(TAG, "ESP-IDF %s 2nd stage bootloader", IDF_VER);
 #ifndef CONFIG_APP_REPRODUCIBLE_BUILD
-    ESP_LOGI(TAG, "compile time " __DATE__ " " __TIME__);
+    ESP_EARLY_LOGI(TAG, "compile time " __DATE__ " " __TIME__);
 #endif
 }

components/bootloader_support/src/esp32/bootloader_esp32.c

@@ -357,6 +357,8 @@ esp_err_t bootloader_init(void)
     WSR(MEMCTL, memctl);
 #endif // XCHAL_ERRATUM_572
 
+// In RAM_APP, memory will be initialized in `call_start_cpu0`
+#if !CONFIG_APP_BUILD_TYPE_RAM
     bootloader_init_mem();
 
     // check that static RAM is after the stack
@@ -371,6 +373,8 @@ esp_err_t bootloader_init(void)
 #endif
     // clear bss section
     bootloader_clear_bss_section();
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // init eFuse virtual mode (read eFuses to RAM)
 #ifdef CONFIG_EFUSE_VIRTUAL
     ESP_LOGW(TAG, "eFuse virtual mode is enabled. If Secure boot or Flash encryption is enabled then it does not provide any security. FOR TESTING ONLY!");
@@ -380,11 +384,9 @@ esp_err_t bootloader_init(void)
 #endif
     // bootst up vddsdio
     bootloader_common_vddsdio_configure();
-    // reset MMU
-    bootloader_reset_mmu();
     // check rated CPU clock
     if ((ret = bootloader_check_rated_cpu_clock()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // config clock
     bootloader_clock_configure();
@@ -392,31 +394,36 @@ esp_err_t bootloader_init(void)
     bootloader_console_init();
     /* print 2nd bootloader banner */
     bootloader_print_banner();
+
+#if !CONFIG_APP_BUILD_TYPE_RAM
+    // reset MMU
+    bootloader_reset_mmu();
     // update flash ID
     bootloader_flash_update_id();
     // Check and run XMC startup flow
     if ((ret = bootloader_flash_xmc_startup()) != ESP_OK) {
         ESP_LOGE(TAG, "failed when running XMC startup flow, reboot!");
-        goto err;
+        return ret;
     }
     // read bootloader header
     if ((ret = bootloader_read_bootloader_header()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // read chip revision and check if it's compatible to bootloader
     if ((ret = bootloader_check_bootloader_validity()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // initialize spi flash
     if ((ret = bootloader_init_spi_flash()) != ESP_OK) {
-        goto err;
+        return ret;
     }
+#endif // #if !CONFIG_APP_BUILD_TYPE_RAM
+
     // check whether a WDT reset happend
     bootloader_check_wdt_reset();
     // config WDT
     bootloader_config_wdt();
     // enable RNG early entropy source
     bootloader_enable_random();
-err:
     return ret;
 }

components/bootloader_support/src/esp32c2/bootloader_esp32c2.c

@@ -245,6 +245,9 @@ esp_err_t bootloader_init(void)
     esp_err_t ret = ESP_OK;
 
     bootloader_super_wdt_auto_feed();
+
+// In RAM_APP, memory will be initialized in `call_start_cpu0`
+#if !CONFIG_APP_BUILD_TYPE_RAM
     // protect memory region
     bootloader_init_mem();
     /* check that static RAM is after the stack */
@@ -252,6 +255,8 @@ esp_err_t bootloader_init(void)
     assert(&_data_start <= &_data_end);
     // clear bss section
     bootloader_clear_bss_section();
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // init eFuse virtual mode (read eFuses to RAM)
 #ifdef CONFIG_EFUSE_VIRTUAL
     ESP_LOGW(TAG, "eFuse virtual mode is enabled. If Secure boot or Flash encryption is enabled then it does not provide any security. FOR TESTING ONLY!");
@@ -259,38 +264,41 @@ esp_err_t bootloader_init(void)
     esp_efuse_init_virtual_mode_in_ram();
 #endif
 #endif
-    //init cache hal
-    cache_hal_init();
-    //reset mmu
-    mmu_hal_init();
-    // config mmu page size
-    mmu_ll_set_page_size(0, SPI_FLASH_MMU_PAGE_SIZE);
     // config clock
     bootloader_clock_configure();
     // initialize console, from now on, we can use esp_log
     bootloader_console_init();
     /* print 2nd bootloader banner */
     bootloader_print_banner();
+
+#if !CONFIG_APP_BUILD_TYPE_RAM
+    //init cache hal
+    cache_hal_init();
+    //reset mmu
+    mmu_hal_init();
+    // config mmu page size
+    mmu_ll_set_page_size(0, SPI_FLASH_MMU_PAGE_SIZE);
     // update flash ID
     bootloader_flash_update_id();
     // read bootloader header
     if ((ret = bootloader_read_bootloader_header()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // read chip revision and check if it's compatible to bootloader
     if ((ret = bootloader_check_bootloader_validity()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // initialize spi flash
     if ((ret = bootloader_init_spi_flash()) != ESP_OK) {
-        goto err;
+        return ret;
     }
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // check whether a WDT reset happend
     bootloader_check_wdt_reset();
     // config WDT
     bootloader_config_wdt();
     // enable RNG early entropy source
     bootloader_enable_random();
-err:
     return ret;
 }

components/bootloader_support/src/esp32c3/bootloader_esp32c3.c

@@ -297,6 +297,9 @@ esp_err_t bootloader_init(void)
     bootloader_hardware_init();
     bootloader_ana_reset_config();
     bootloader_super_wdt_auto_feed();
+
+// In RAM_APP, memory will be initialized in `call_start_cpu0`
+#if !CONFIG_APP_BUILD_TYPE_RAM
     // protect memory region
     bootloader_init_mem();
     /* check that static RAM is after the stack */
@@ -304,6 +307,8 @@ esp_err_t bootloader_init(void)
     assert(&_data_start <= &_data_end);
     // clear bss section
     bootloader_clear_bss_section();
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // init eFuse virtual mode (read eFuses to RAM)
 #ifdef CONFIG_EFUSE_VIRTUAL
     ESP_LOGW(TAG, "eFuse virtual mode is enabled. If Secure boot or Flash encryption is enabled then it does not provide any security. FOR TESTING ONLY!");
@@ -311,41 +316,45 @@ esp_err_t bootloader_init(void)
     esp_efuse_init_virtual_mode_in_ram();
 #endif
 #endif
-    //init cache hal
-    cache_hal_init();
-    //reset mmu
-    mmu_hal_init();
     // config clock
     bootloader_clock_configure();
     // initialize console, from now on, we can use esp_log
     bootloader_console_init();
     /* print 2nd bootloader banner */
     bootloader_print_banner();
+
+#if !CONFIG_APP_BUILD_TYPE_RAM
+    //init cache hal
+    cache_hal_init();
+    //reset mmu
+    mmu_hal_init();
     // update flash ID
     bootloader_flash_update_id();
     // Check and run XMC startup flow
     if ((ret = bootloader_flash_xmc_startup()) != ESP_OK) {
         ESP_LOGE(TAG, "failed when running XMC startup flow, reboot!");
-        goto err;
+        return ret;
     }
     // read bootloader header
     if ((ret = bootloader_read_bootloader_header()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // read chip revision and check if it's compatible to bootloader
     if ((ret = bootloader_check_bootloader_validity()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // initialize spi flash
     if ((ret = bootloader_init_spi_flash()) != ESP_OK) {
-        goto err;
+        return ret;
     }
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // check whether a WDT reset happend
     bootloader_check_wdt_reset();
     // config WDT
     bootloader_config_wdt();
     // enable RNG early entropy source
     bootloader_enable_random();
-err:
+
     return ret;
 }

components/bootloader_support/src/esp32c6/bootloader_esp32c6.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -229,7 +229,7 @@ static void bootloader_super_wdt_auto_feed(void)
 static inline void bootloader_hardware_init(void)
 {
     // In 80MHz flash mode, ROM sets the mspi module clk divider to 2, fix it here
-#if CONFIG_ESPTOOLPY_FLASHFREQ_80M
+#if CONFIG_ESPTOOLPY_FLASHFREQ_80M && !CONFIG_APP_BUILD_TYPE_RAM
     clk_ll_mspi_fast_set_hs_divider(6);
     esp_rom_spiflash_config_clk(1, 0);
     esp_rom_spiflash_config_clk(1, 1);
@@ -280,6 +280,9 @@ esp_err_t bootloader_init(void)
     bootloader_hardware_init();
     bootloader_ana_reset_config();
     bootloader_super_wdt_auto_feed();
+
+// In RAM_APP, memory will be initialized in `call_start_cpu0`
+#if !CONFIG_APP_BUILD_TYPE_RAM
     // protect memory region
     bootloader_init_mem();
     /* check that static RAM is after the stack */
@@ -287,6 +290,8 @@ esp_err_t bootloader_init(void)
     assert(&_data_start <= &_data_end);
     // clear bss section
     bootloader_clear_bss_section();
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // init eFuse virtual mode (read eFuses to RAM)
 #ifdef CONFIG_EFUSE_VIRTUAL
     ESP_LOGW(TAG, "eFuse virtual mode is enabled. If Secure boot or Flash encryption is enabled then it does not provide any security. FOR TESTING ONLY!");
@@ -294,41 +299,45 @@ esp_err_t bootloader_init(void)
     esp_efuse_init_virtual_mode_in_ram();
 #endif
 #endif
-    //init cache hal
-    cache_hal_init();
-    //reset mmu
-    mmu_hal_init();
     // config clock
     bootloader_clock_configure();
     // initialize console, from now on, we can use esp_log
     bootloader_console_init();
     /* print 2nd bootloader banner */
     bootloader_print_banner();
+
+#if !CONFIG_APP_BUILD_TYPE_RAM
+    //init cache hal
+    cache_hal_init();
+    //reset mmu
+    mmu_hal_init();
     // update flash ID
     bootloader_flash_update_id();
     // Check and run XMC startup flow
     if ((ret = bootloader_flash_xmc_startup()) != ESP_OK) {
         ESP_LOGE(TAG, "failed when running XMC startup flow, reboot!");
-        goto err;
+        return ret;
     }
     // read bootloader header
     if ((ret = bootloader_read_bootloader_header()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // read chip revision and check if it's compatible to bootloader
     if ((ret = bootloader_check_bootloader_validity()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // initialize spi flash
     if ((ret = bootloader_init_spi_flash()) != ESP_OK) {
-        goto err;
+        return ret;
     }
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // check whether a WDT reset happend
     bootloader_check_wdt_reset();
     // config WDT
     bootloader_config_wdt();
     // enable RNG early entropy source
     bootloader_enable_random();
-err:
+
     return ret;
 }

components/bootloader_support/src/esp32h2/bootloader_esp32h2.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -267,6 +267,9 @@ esp_err_t bootloader_init(void)
     bootloader_hardware_init();
     bootloader_ana_reset_config();
     bootloader_super_wdt_auto_feed();
+
+// In RAM_APP, memory will be initialized in `call_start_cpu0`
+#if !CONFIG_APP_BUILD_TYPE_RAM
     // protect memory region
     bootloader_init_mem();
     /* check that static RAM is after the stack */
@@ -274,6 +277,8 @@ esp_err_t bootloader_init(void)
     assert(&_data_start <= &_data_end);
     // clear bss section
     bootloader_clear_bss_section();
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // init eFuse virtual mode (read eFuses to RAM)
 #ifdef CONFIG_EFUSE_VIRTUAL
     ESP_LOGW(TAG, "eFuse virtual mode is enabled. If Secure boot or Flash encryption is enabled then it does not provide any security. FOR TESTING ONLY!");
@@ -281,41 +286,46 @@ esp_err_t bootloader_init(void)
     esp_efuse_init_virtual_mode_in_ram();
 #endif
 #endif
-    //init cache hal
-    cache_hal_init();
-    //reset mmu
-    mmu_hal_init();
     // config clock
     bootloader_clock_configure();
     // initialize console, from now on, we can use esp_log
     bootloader_console_init();
     /* print 2nd bootloader banner */
     bootloader_print_banner();
+
+#if !CONFIG_APP_BUILD_TYPE_RAM
+    //init cache hal
+    cache_hal_init();
+    //reset mmu
+    mmu_hal_init();
+
     // update flash ID
     bootloader_flash_update_id();
     // Check and run XMC startup flow
     if ((ret = bootloader_flash_xmc_startup()) != ESP_OK) {
         ESP_LOGE(TAG, "failed when running XMC startup flow, reboot!");
-        goto err;
+        return ret;
     }
     // read bootloader header
     if ((ret = bootloader_read_bootloader_header()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // read chip revision and check if it's compatible to bootloader
     if ((ret = bootloader_check_bootloader_validity()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // initialize spi flash
     if ((ret = bootloader_init_spi_flash()) != ESP_OK) {
-        goto err;
+        return ret;
     }
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // check whether a WDT reset happend
     bootloader_check_wdt_reset();
     // config WDT
     bootloader_config_wdt();
     // enable RNG early entropy source
     bootloader_enable_random();
-err:
+
     return ret;
 }

components/bootloader_support/src/esp32h4/bootloader_esp32h4.c

@@ -263,6 +263,9 @@ esp_err_t bootloader_init(void)
     bootloader_hardware_init();
     bootloader_ana_reset_config();
     bootloader_super_wdt_auto_feed();
+
+// In RAM_APP, memory will be initialized in `call_start_cpu0`
+#if !CONFIG_APP_BUILD_TYPE_RAM
     // protect memory region
     bootloader_init_mem();
     /* check that static RAM is after the stack */
@@ -270,41 +273,46 @@ esp_err_t bootloader_init(void)
     assert(&_data_start <= &_data_end);
     // clear bss section
     bootloader_clear_bss_section();
-    //init cache hal
-    cache_hal_init();   //TODO IDF-4649
-    //reset mmu
-    mmu_hal_init();
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // config clock
     bootloader_clock_configure();
     // initialize console, from now on, we can use esp_log
     bootloader_console_init();
     /* print 2nd bootloader banner */
     bootloader_print_banner();
+
+#if !CONFIG_APP_BUILD_TYPE_RAM
+    //init cache hal
+    cache_hal_init();   //TODO IDF-4649
+    //reset mmu
+    mmu_hal_init();
     // update flash ID
     bootloader_flash_update_id();
     // Check and run XMC startup flow
     if ((ret = bootloader_flash_xmc_startup()) != ESP_OK) {
         ESP_LOGE(TAG, "failed when running XMC startup flow, reboot!");
-        goto err;
+        return ret;
     }
     // read bootloader header
     if ((ret = bootloader_read_bootloader_header()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // read chip revision and check if it's compatible to bootloader
     if ((ret = bootloader_check_bootloader_validity()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // initialize spi flash
     if ((ret = bootloader_init_spi_flash()) != ESP_OK) {
-        goto err;
+        return ret;
     }
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // check whether a WDT reset happend
     bootloader_check_wdt_reset();
     // config WDT
     bootloader_config_wdt();
     // enable RNG early entropy source
     bootloader_enable_random();
-err:
     return ret;
 }

components/bootloader_support/src/esp32s2/bootloader_esp32s2.c

@@ -287,6 +287,8 @@ esp_err_t bootloader_init(void)
     bootloader_super_wdt_auto_feed();
     // protect memory region
 
+// In RAM_APP, memory will be initialized in `call_start_cpu0`
+#if !CONFIG_APP_BUILD_TYPE_RAM
     bootloader_init_mem();
 
     /* check that static RAM is after the stack */
@@ -298,6 +300,8 @@ esp_err_t bootloader_init(void)
 #endif
     // clear bss section
     bootloader_clear_bss_section();
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // init eFuse virtual mode (read eFuses to RAM)
 #ifdef CONFIG_EFUSE_VIRTUAL
     ESP_LOGW(TAG, "eFuse virtual mode is enabled. If Secure boot or Flash encryption is enabled then it does not provide any security. FOR TESTING ONLY!");
@@ -305,43 +309,48 @@ esp_err_t bootloader_init(void)
     esp_efuse_init_virtual_mode_in_ram();
 #endif
 #endif
-    // init cache hal
-    cache_hal_init();
-    // reset mmu
-    mmu_hal_init();
-    // Workaround: normal ROM bootloader exits with DROM0 cache unmasked, but 2nd bootloader exits with it masked.
-    REG_CLR_BIT(EXTMEM_PRO_ICACHE_CTRL1_REG, EXTMEM_PRO_ICACHE_MASK_DROM0);
+
     // config clock
     bootloader_clock_configure();
     // initialize console, from now on, we can use esp_log
     bootloader_console_init();
     /* print 2nd bootloader banner */
     bootloader_print_banner();
+
+#if !CONFIG_APP_BUILD_TYPE_RAM
+    // init cache hal
+    cache_hal_init();
+    // reset mmu
+    mmu_hal_init();
+    // Workaround: normal ROM bootloader exits with DROM0 cache unmasked, but 2nd bootloader exits with it masked.
+    REG_CLR_BIT(EXTMEM_PRO_ICACHE_CTRL1_REG, EXTMEM_PRO_ICACHE_MASK_DROM0);
     // update flash ID
     bootloader_flash_update_id();
     // Check and run XMC startup flow
     if ((ret = bootloader_flash_xmc_startup()) != ESP_OK) {
         ESP_LOGE(TAG, "failed when running XMC startup flow, reboot!");
-        goto err;
+        return ret;
     }
     // read bootloader header
     if ((ret = bootloader_read_bootloader_header()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // read chip revision and check if it's compatible to bootloader
     if ((ret = bootloader_check_bootloader_validity()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // initialize spi flash
     if ((ret = bootloader_init_spi_flash()) != ESP_OK) {
-        goto err;
+        return ret;
     }
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // check whether a WDT reset happend
     bootloader_check_wdt_reset();
     // config WDT
     bootloader_config_wdt();
     // enable RNG early entropy source
     bootloader_enable_random();
-err:
+
     return ret;
 }

components/bootloader_support/src/esp32s3/bootloader_esp32s3.c

@@ -333,6 +333,9 @@ esp_err_t bootloader_init(void)
 
     bootloader_ana_reset_config();
     bootloader_super_wdt_auto_feed();
+
+// In RAM_APP, memory will be initialized in `call_start_cpu0`
+#if !CONFIG_APP_BUILD_TYPE_RAM
     // protect memory region
     bootloader_init_mem();
     /* check that static RAM is after the stack */
@@ -344,6 +347,8 @@ esp_err_t bootloader_init(void)
 #endif
     // clear bss section
     bootloader_clear_bss_section();
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // init eFuse virtual mode (read eFuses to RAM)
 #ifdef CONFIG_EFUSE_VIRTUAL
     ESP_LOGW(TAG, "eFuse virtual mode is enabled. If Secure boot or Flash encryption is enabled then it does not provide any security. FOR TESTING ONLY!");
@@ -351,41 +356,44 @@ esp_err_t bootloader_init(void)
     esp_efuse_init_virtual_mode_in_ram();
 #endif
 #endif
-    //init cache hal
-    cache_hal_init();
-    //reset mmu
-    mmu_hal_init();
     // config clock
     bootloader_clock_configure();
     // initialize console, from now on, we can use esp_log
     bootloader_console_init();
     /* print 2nd bootloader banner */
     bootloader_print_banner();
+
+#if !CONFIG_APP_BUILD_TYPE_RAM
+    //init cache hal
+    cache_hal_init();
+    //reset mmu
+    mmu_hal_init();
     // update flash ID
     bootloader_flash_update_id();
     // Check and run XMC startup flow
     if ((ret = bootloader_flash_xmc_startup()) != ESP_OK) {
         ESP_LOGE(TAG, "failed when running XMC startup flow, reboot!");
-        goto err;
+        return ret;
     }
     // read bootloader header
     if ((ret = bootloader_read_bootloader_header()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // read chip revision and check if it's compatible to bootloader
     if ((ret = bootloader_check_bootloader_validity()) != ESP_OK) {
-        goto err;
+        return ret;
     }
     // initialize spi flash
     if ((ret = bootloader_init_spi_flash()) != ESP_OK) {
-        goto err;
+        return ret;
     }
+#endif // !CONFIG_APP_BUILD_TYPE_RAM
+
     // check whether a WDT reset happend
     bootloader_check_wdt_reset();
     // config WDT
     bootloader_config_wdt();
     // enable RNG early entropy source
     bootloader_enable_random();
-err:
     return ret;
 }