esp32: Fix FiPy os.uname() crash and weird P19 and P20 behaviour.

Author: Daniel Campora

esp32/bootloader/bootloader.c

@@ -878,14 +878,6 @@ static void clock_configure(void)
     clk_cfg.slow_freq = rtc_clk_slow_freq_get();
     clk_cfg.fast_freq = rtc_clk_fast_freq_get();
     rtc_clk_init(clk_cfg);
-    /* As a slight optimization, if 32k XTAL was enabled in sdkconfig, we enable
-     * it here. Usually it needs some time to start up, so we amortize at least
-     * part of the start up time by enabling 32k XTAL early.
-     * App startup code will wait until the oscillator has started up.
-     */
-    if (!rtc_clk_32k_enabled()) {
-        rtc_clk_32k_bootstrap();
-    }
 }
 
 static void uart_console_configure(void)

esp32/mods/machrtc.c

@@ -155,7 +155,14 @@ STATIC mp_obj_t mach_rtc_make_new(const mp_obj_type_t *type, mp_uint_t n_args, m
     if (args[2].u_obj != mp_const_none) {
         struct timeval now;
         gettimeofday(&now, NULL);
-        select_rtc_slow_clk(mp_obj_get_int(args[2].u_obj));
+
+        uint32_t clk_src = mp_obj_get_int(args[2].u_obj);
+        if (clk_src == RTC_SOURCE_EXTERNAL_XTAL) {
+            if (!rtc_clk_32k_enabled()) {
+                rtc_clk_32k_bootstrap();
+            }
+        }
+        select_rtc_slow_clk(clk_src);
         settimeofday(&now, NULL);
     }
 

esp32/mods/moduos.c

@@ -224,12 +224,13 @@ STATIC void unmount (os_fs_mount_t *mount_obj) {
 
 STATIC const qstr os_uname_info_fields[] = {
     MP_QSTR_sysname, MP_QSTR_nodename,
-    MP_QSTR_release, MP_QSTR_version,
-    MP_QSTR_machine,
+    MP_QSTR_release, MP_QSTR_version
+    ,MP_QSTR_machine
 #if defined(LOPY) || defined(FIPY)
-    MP_QSTR_lorawan
-#elif defined(SIPY)
-    MP_QSTR_sigfox
+    ,MP_QSTR_lorawan
+#endif
+#if defined(SIPY) || defined(FIPY)
+    ,MP_QSTR_sigfox
 #endif
 };
 STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);