Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
4aad3415
Commit
4aad3415
authored
Jun 26, 2016
by
moononournation
Committed by
Marcel Stör
Jun 26, 2016
Browse files
add 64m and 128m flash support (#1367)
* update esptool.py to v1.2-dev * add 64 Mbit and 128 Mbit support
parent
6c96c4dc
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
app/platform/flash_api.c
View file @
4aad3415
...
@@ -118,6 +118,18 @@ uint32_t flash_rom_get_size_byte(void)
...
@@ -118,6 +118,18 @@ uint32_t flash_rom_get_size_byte(void)
// 32Mbit, 4MByte
// 32Mbit, 4MByte
flash_size
=
4
*
1024
*
1024
;
flash_size
=
4
*
1024
*
1024
;
break
;
break
;
case
SIZE_32MBIT_16M_16M
:
// 32Mbit, 4MByte
flash_size
=
4
*
1024
*
1024
;
break
;
case
SIZE_64MBIT
:
// 64Mbit, 8MByte
flash_size
=
8
*
1024
*
1024
;
break
;
case
SIZE_128MBIT
:
// 128Mbit, 16MByte
flash_size
=
16
*
1024
*
1024
;
break
;
default:
default:
// Unknown flash size, fall back mode.
// Unknown flash size, fall back mode.
flash_size
=
512
*
1024
;
flash_size
=
512
*
1024
;
...
@@ -184,18 +196,16 @@ bool flash_rom_set_size_byte(uint32_t size)
...
@@ -184,18 +196,16 @@ bool flash_rom_set_size_byte(uint32_t size)
flash_size
=
SIZE_32MBIT
;
flash_size
=
SIZE_32MBIT
;
flash_rom_set_size_type
(
flash_size
);
flash_rom_set_size_type
(
flash_size
);
break
;
break
;
/*
case
8
*
1024
*
1024
:
case
8
*
1024
*
1024
:
// 64Mbit, 8MByte
// 64Mbit, 8MByte
flash_size = SIZE_
1
6MBIT
_8M_8M
;
flash_size
=
SIZE_6
4
MBIT
;
flash_rom_set_size_type
(
flash_size
);
flash_rom_set_size_type
(
flash_size
);
break
;
break
;
case
16
*
1024
*
1024
:
case
16
*
1024
*
1024
:
// 128Mbit, 16MByte
// 128Mbit, 16MByte
flash_size = SIZE_
32
MBIT
_8M_8M
;
flash_size
=
SIZE_
128
MBIT
;
flash_rom_set_size_type
(
flash_size
);
flash_rom_set_size_type
(
flash_size
);
break
;
break
;
*/
default:
default:
// Unknown flash size.
// Unknown flash size.
result
=
false
;
result
=
false
;
...
...
app/platform/flash_api.h
View file @
4aad3415
...
@@ -80,6 +80,9 @@ typedef struct
...
@@ -80,6 +80,9 @@ typedef struct
SIZE_32MBIT
=
4
,
SIZE_32MBIT
=
4
,
SIZE_16MBIT_8M_8M
=
5
,
SIZE_16MBIT_8M_8M
=
5
,
SIZE_32MBIT_8M_8M
=
6
,
SIZE_32MBIT_8M_8M
=
6
,
SIZE_32MBIT_16M_16M
=
7
,
SIZE_64MBIT
=
8
,
SIZE_128MBIT
=
9
,
}
size
:
4
;
}
size
:
4
;
uint32_t
entry_point
;
uint32_t
entry_point
;
uint32_t
memory_offset
;
uint32_t
memory_offset
;
...
...
tools/esptool.py
View file @
4aad3415
This diff is collapsed.
Click to expand it.
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