Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
c8037568
Commit
c8037568
authored
Dec 28, 2015
by
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
Changes
62
Show whitespace changes
Inline
Side-by-side
app/wofs/romfs.c
View file @
c8037568
...
...
@@ -521,7 +521,7 @@ int romfs_init( void )
#if defined( BUILD_WOFS )
// 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
.
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
);
#endif // ifdef BUILD_WOFS
return
0
;
...
...
ld/nodemcu.ld
View file @
c8037568
...
...
@@ -79,6 +79,16 @@ SECTIONS
*(.rodata*)
*(.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 */
*/libc.a:lib_a-isalnum.o(.text* .literal*)
*/libc.a:lib_a-isalpha.o(.text* .literal*)
...
...
Prev
1
2
3
4
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment