Commit c8037568 authored by Terry Ellison's avatar Terry Ellison
Browse files

Merge pull request #883 from nodemcu/dev

Resync master to dev prior to upgrading Dev to SDK 1.5
parents 93421f27 a8359f1d
...@@ -521,7 +521,7 @@ int romfs_init( void ) ...@@ -521,7 +521,7 @@ int romfs_init( void )
#if defined( BUILD_WOFS ) #if defined( BUILD_WOFS )
// Get the start address and size of WOFS and register it // Get the start address and size of WOFS and register it
wofs_fsdata.pbase = ( uint8_t* )platform_flash_get_first_free_block_address( NULL ); wofs_fsdata.pbase = ( uint8_t* )platform_flash_get_first_free_block_address( NULL );
wofs_fsdata.max_size = INTERNAL_FLASH_SIZE - ( ( uint32_t )wofs_fsdata.pbase - INTERNAL_FLASH_START_ADDRESS ); wofs_fsdata.max_size = INTERNAL_FLASH_SIZE - ( ( uint32_t )wofs_fsdata.pbase );
NODE_DBG("wofs.pbase:%x,max:%x\n",wofs_fsdata.pbase,wofs_fsdata.max_size); NODE_DBG("wofs.pbase:%x,max:%x\n",wofs_fsdata.pbase,wofs_fsdata.max_size);
#endif // ifdef BUILD_WOFS #endif // ifdef BUILD_WOFS
return 0; return 0;
......
...@@ -79,6 +79,16 @@ SECTIONS ...@@ -79,6 +79,16 @@ SECTIONS
*(.rodata*) *(.rodata*)
*(.sdk.version) *(.sdk.version)
/* Link-time arrays containing the defs for the included modules */
. = ALIGN(4);
lua_libs = ABSOLUTE(.);
/* Allow either empty define or defined-to-1 to include the module */
KEEP(*(.lua_libs))
LONG(0) LONG(0) /* Null-terminate the array */
lua_rotable = ABSOLUTE(.);
KEEP(*(.lua_rotable))
LONG(0) LONG(0) /* Null-terminate the array */
/* These are *only* pulled in by Lua, and therefore safe to put in flash */ /* These are *only* pulled in by Lua, and therefore safe to put in flash */
*/libc.a:lib_a-isalnum.o(.text* .literal*) */libc.a:lib_a-isalnum.o(.text* .literal*)
*/libc.a:lib_a-isalpha.o(.text* .literal*) */libc.a:lib_a-isalpha.o(.text* .literal*)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment