For SDK v3.0+, early system calls that were called from user_rf_pre_init

(SDK v2.2) need to now be called from user_pre_init.

Moved user_rf_pre_init() call to the end of user_pre_init() so we
can still perform early calls like: system_phy_set_rfoption(rf_mode),
system_phy_set_powerup_option(2), etc.

Author: mhightower83

cores/esp8266/core_esp8266_main.cpp

@@ -424,6 +424,8 @@ extern "C" uint8_t uart_rx_one_char_block();
 #include "flash_hal.h"
 #endif
 
+extern "C" void user_rf_pre_init();
+
 extern "C" void ICACHE_FLASH_ATTR user_pre_init(void)
 {
     const char *flash_map_str = NULL;
@@ -623,14 +625,29 @@ extern "C" void ICACHE_FLASH_ATTR user_pre_init(void)
             uart_rx_one_char_block(); // Someone said hello - repeat message
         } while(true);
     }
+    /*
+      The function user_rf_pre_init() is no longer called from SDK 3.0 and up.
+      The SDK manual and release notes skipped this detail. The 2023 ESP-FAQ
+      hints at the change with "* Call system_phy_set_powerup_option(3) in
+      function user_pre_init or user_rf_pre_init"
+      https://docs.espressif.com/_/downloads/espressif-esp-faq/en/latest/pdf/#page=14
+
+      Add call to user_rf_pre_init(), so we can still perform early calls like
+      system_phy_set_rfoption(rf_mode), system_phy_set_powerup_option(2), etc.
+
+      Placement, should this be at the beginning or end of user_pre_init()?
+      By the end, we have already registered the PHY_DATA partition.
+      SDK v2.2 called user_rf_pre_init() after reading PHY_DATA.
+    */
+    user_rf_pre_init();
 }
 #endif // #if (NONOSDK >= (0x30000))
 
 extern "C" void user_init(void) {
 
 #if (NONOSDK >= (0x30000))
-    extern void user_rf_pre_init();
-    user_rf_pre_init(); // Stop spoofing logic
+    extern void sdk3_end_phy_data_spoof(void);
+    sdk3_end_phy_data_spoof();
 #endif
 
     struct rst_info *rtc_info_ptr = system_get_rst_info();

cores/esp8266/core_esp8266_phy.cpp

@@ -348,6 +348,11 @@ void sdk3_begin_phy_data_spoof(void)
 {
    spoof_init_data = true;
 }
+
+void sdk3_end_phy_data_spoof(void)
+{
+   spoof_init_data = false;
+}
 #else
 uint32_t user_rf_cal_sector_set(void)
 {
@@ -359,7 +364,9 @@ uint32_t user_rf_cal_sector_set(void)
 void user_rf_pre_init()
 {
     // *((volatile uint32_t*) 0x60000710) = 0;
+#if (NONOSDK < (0x30000))
     spoof_init_data = false;
+#endif
 
     int rf_mode = __get_rf_mode();
     if (rf_mode >= 0) {