Skip to content

Commit 93537f9

Browse files
metarutaigamcspr
andauthoredDec 6, 2022
Added NONOS SDK 3.0.0 ~ 3.0.5 (again) (#8736)
* Added NONOS SDK 3.0.0 ~ 3.0.5 * Added user_pre_init * rf_cal[0] !=0x05,is 0x00 * # Remove mem_manager.o from libmain.a to use custom heap implementation, and time.o to fix redefinition of time-related functions # Rename `hostname` and `default_hostname` symbols * user_rf_pre_init * Add system_func1() called by system_restart_local() * Add commit log text * Fixed user_rf_pre_init * Style * pio sdks Co-authored-by: TAiGA <> Co-authored-by: Maxim Prokhorov <prokhorov.max@outlook.com>
1 parent ed6b957 commit 93537f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2889
-57
lines changed
 

‎boards.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,18 @@ generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
365365
generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
366366
generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
367367
generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
368+
generic.menu.sdk.nonosdk300=nonos-sdk 3.0.0
369+
generic.menu.sdk.nonosdk300.build.sdk=NONOSDK300
370+
generic.menu.sdk.nonosdk301=nonos-sdk 3.0.1
371+
generic.menu.sdk.nonosdk301.build.sdk=NONOSDK301
372+
generic.menu.sdk.nonosdk302=nonos-sdk 3.0.2
373+
generic.menu.sdk.nonosdk302.build.sdk=NONOSDK302
374+
generic.menu.sdk.nonosdk303=nonos-sdk 3.0.3
375+
generic.menu.sdk.nonosdk303.build.sdk=NONOSDK303
376+
generic.menu.sdk.nonosdk304=nonos-sdk 3.0.4
377+
generic.menu.sdk.nonosdk304.build.sdk=NONOSDK304
378+
generic.menu.sdk.nonosdk305=nonos-sdk 3.0.5
379+
generic.menu.sdk.nonosdk305.build.sdk=NONOSDK305
368380
generic.menu.ip.lm2f=v2 Lower Memory
369381
generic.menu.ip.lm2f.build.lwip_include=lwip2/include
370382
generic.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -710,6 +722,18 @@ esp8285.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
710722
esp8285.menu.sdk.nonosdk221.build.sdk=NONOSDK221
711723
esp8285.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
712724
esp8285.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
725+
esp8285.menu.sdk.nonosdk300=nonos-sdk 3.0.0
726+
esp8285.menu.sdk.nonosdk300.build.sdk=NONOSDK300
727+
esp8285.menu.sdk.nonosdk301=nonos-sdk 3.0.1
728+
esp8285.menu.sdk.nonosdk301.build.sdk=NONOSDK301
729+
esp8285.menu.sdk.nonosdk302=nonos-sdk 3.0.2
730+
esp8285.menu.sdk.nonosdk302.build.sdk=NONOSDK302
731+
esp8285.menu.sdk.nonosdk303=nonos-sdk 3.0.3
732+
esp8285.menu.sdk.nonosdk303.build.sdk=NONOSDK303
733+
esp8285.menu.sdk.nonosdk304=nonos-sdk 3.0.4
734+
esp8285.menu.sdk.nonosdk304.build.sdk=NONOSDK304
735+
esp8285.menu.sdk.nonosdk305=nonos-sdk 3.0.5
736+
esp8285.menu.sdk.nonosdk305.build.sdk=NONOSDK305
713737
esp8285.menu.ip.lm2f=v2 Lower Memory
714738
esp8285.menu.ip.lm2f.build.lwip_include=lwip2/include
715739
esp8285.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat

‎cores/esp8266/core_esp8266_main.cpp

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,77 @@ extern "C" void flashinit (void);
404404
uint32_t __flashindex;
405405
#endif
406406

407+
#if (NONOSDK >= (0x30000))
408+
409+
extern "C" void ICACHE_FLASH_ATTR user_pre_init(void)
410+
{
411+
uint32_t rf_cal = 0;
412+
uint32_t phy_data = 0;
413+
uint32_t system_parameter = 0;
414+
415+
switch (system_get_flash_size_map())
416+
{
417+
case FLASH_SIZE_2M:
418+
rf_cal = 0x3b000;
419+
phy_data = 0x3c000;
420+
system_parameter = 0x3d000;
421+
break;
422+
case FLASH_SIZE_4M_MAP_256_256:
423+
rf_cal = 0x7b000;
424+
phy_data = 0x7c000;
425+
system_parameter = 0x7d000;
426+
break;
427+
case FLASH_SIZE_8M_MAP_512_512:
428+
rf_cal = 0xfb000;
429+
phy_data = 0xfc000;
430+
system_parameter = 0xfd000;
431+
break;
432+
case FLASH_SIZE_16M_MAP_512_512:
433+
case FLASH_SIZE_16M_MAP_1024_1024:
434+
rf_cal = 0x1fb000;
435+
phy_data = 0x1fc000;
436+
system_parameter = 0x1fd000;
437+
break;
438+
case FLASH_SIZE_32M_MAP_512_512:
439+
case FLASH_SIZE_32M_MAP_1024_1024:
440+
case FLASH_SIZE_32M_MAP_2048_2048:
441+
rf_cal = 0x3fb000;
442+
phy_data = 0x3fc000;
443+
system_parameter = 0x3fd000;
444+
break;
445+
case FLASH_SIZE_64M_MAP_1024_1024:
446+
rf_cal = 0x7fb000;
447+
phy_data = 0x7fc000;
448+
system_parameter = 0x7fd000;
449+
break;
450+
case FLASH_SIZE_128M_MAP_1024_1024:
451+
rf_cal = 0xffb000;
452+
phy_data = 0xffc000;
453+
system_parameter = 0xffd000;
454+
break;
455+
}
456+
457+
extern uint32_t user_rf_cal_sector_set(void);
458+
user_rf_cal_sector_set();
459+
460+
const partition_item_t at_partition_table[] =
461+
{
462+
{ SYSTEM_PARTITION_RF_CAL, rf_cal, 0x1000 },
463+
{ SYSTEM_PARTITION_PHY_DATA, phy_data, 0x1000 },
464+
{ SYSTEM_PARTITION_SYSTEM_PARAMETER, system_parameter, 0x3000 },
465+
};
466+
system_partition_table_regist(at_partition_table, sizeof(at_partition_table) / sizeof(at_partition_table[0]), system_get_flash_size_map());
467+
}
468+
469+
#endif
470+
407471
extern "C" void user_init(void) {
472+
473+
#if (NONOSDK >= (0x30000))
474+
extern void user_rf_pre_init();
475+
user_rf_pre_init();
476+
#endif
477+
408478
struct rst_info *rtc_info_ptr = system_get_rst_info();
409479
memcpy((void *) &resetInfo, (void *) rtc_info_ptr, sizeof(resetInfo));
410480

0 commit comments

Comments
 (0)