esp8266: Add per-board configs, following other ports. #5118

mcauser · 2019-09-18T05:08:44Z

Defaults to BOARD=GENERIC.

Added /boards
Added /boards/GENERIC
Added /boards/GENERIC_512K
Moved ld files to /boards
Remove 512k from Makefile
Remove mpconfigport_512k.h - it's now in /boards/GENERIC_512K
Update the README.md - 512KB FlashROM version
Add other boards to test in .travis.yml

For later:

Update whatever builds the 512k firmware on http://micropython.org/download
Add OTA 1M board definition

mcauser · 2019-09-18T05:46:58Z

Inspired by #4991

jimmo · 2019-09-18T05:50:53Z

ports/esp8266/Makefile

+ifeq ($(wildcard $(BOARD_DIR)/.),)
+$(error Invalid BOARD specified: $(BOARD_DIR))
+endif
+
 include ../../py/mkenv.mk

 # qstr definitions (must come before including py.mk)


To match other ports, can you also add:

-include $(BOARD_DIR)/mpconfigboard.mk

Note the - on the front to make it optional.

Although it won't be used for the generic board, it's possible another board might want it (e.g. to reference additional code outside the board dir (e.g. extmod) or to change compiler/linker flags).

mcauser · 2019-09-18T06:21:21Z

Failing when trying to load build/main.o in /ports/esp8266/esp8266_common.ld
Should be build-GENERIC/main.o

mcauser · 2019-09-18T07:27:26Z

So, what are the most popular boards?

Adafruit Feather HUZZAH
Adafruit HUZZAH
NodeMCU DevKit
SparkFun Thing
Wemos D1 Mini
Wemos D1 Mini Lite
Wemos D1 Mini Pro
WiFi Witty
Wio Link

nevercast · 2019-09-26T05:01:45Z

So, what are the most popular boards

I think we can add those as seperate PRs, right?

@jimmo Are you happy with this PR? Can you say it is reviewed?

dpgeorge · 2019-09-26T07:17:19Z

Looks good to me.

I agree other boards can be added later. First thing to do would be convert the 512k build to a board.

mcauser · 2019-09-30T05:36:13Z

Had a crack at adding the 512K board. A few things I'm not sure about

a) Can board names start with a number? /boards/512K

b) Not sure about these 3x in mpconfigport_512k.h:

#undef mp_import_stat
#undef mp_builtin_open
#undef mp_builtin_open_obj

It used to run after #include <mpconfigport.h> but now /boards/512K/mpconfigboard.h runs before. Add a custom #define in the *board.h and perform the #undef's in the *port.h if defined?

c) Should esp8266_512k.ld be moved into the /ports/esp8266/boards/512K dir? Like the nrf particle_xenon does in #5158

d) Should every #define in /ports/esp8266/mpconfigport.h be wrapped in a #ifndef so boards can define them (first)? Or only add when first needed?

dpgeorge · 2019-09-30T07:13:00Z

Can board names start with a number?

Good question! Probably best not to. In this case it could be GENERIC_512K

b) Not sure about these 3x in mpconfigport_512k.h...

Are they needed at all? What happens with these just removed?

Should esp8266_512k.ld be moved

Maybe moved to ports/esp8266/boards/ dir, so it can be reused by other 512k boards if needed.

Should every #define in /ports/esp8266/mpconfigport.h be wrapped in a #ifndef so boards can define them (first)? Or only add when first needed?

Only add when first needed.

dpgeorge · 2019-10-04T06:15:47Z

@mcauser is this ready to review, or do you plan to tick all the boxes in the first post?

mcauser · 2019-10-04T06:31:20Z

@dpgeorge I’ll cleanup the 512k bits first then push the other tasks to separate PRs

mcauser · 2019-10-04T07:04:03Z

Hi @dpgeorge , Over to you for review.

mcauser · 2019-10-04T22:45:07Z

$ tools/check_code_size.sh
Old size: 68848 new size: 68852
Validation failure: Core code size increased
The command "tools/check_code_size.sh" exited with 1.

Not sure what increased the minimal build by 4 (bytes?).

nevercast · 2019-10-04T23:39:52Z

Not sure what increased the minimal build by 4 (bytes?).

Did the board or MCU name change ?

mcauser · 2019-10-05T00:13:02Z

@nevercast on the 512K board it did.

#define MICROPY_HW_BOARD_NAME "ESP module"
#define MICROPY_HW_BOARD_NAME "ESP module (512K)"

Not sure how that impacts the minimal build though

mcauser · 2019-10-07T09:13:22Z

Rebased off master, CI now passes 👌

dpgeorge

Great work! Just a few comments inline.

ports/esp8266/boards/esp8266_common.ld

dpgeorge · 2019-10-10T03:37:58Z

ports/esp8266/mpconfigport.h

 #define MICROPY_PERSISTENT_CODE_LOAD (1)
+#endif


I think with all these options that have guards added in this file, it'd be much simple to just not configure them at all here. Instead, the mpconfigboard.h file should enable the features it wants. So in GENERIC_512K/mpconfigboard.h it'd be pretty much empty. And in GENERIC/mpconfigboard.h it'd enable all the extra features.

Then this file here would be almost unchanged.

That would bring it closer in line with the STM32 port, where features are off by default and enabled in board specific mpconfigboard.h's

Updated as per your recommendations.
Defaults in /py/mpconfig.h, with common features enabled in /ports/esp8266/mpconfigboard.h, and board specific features enabled in /ports/esp8266/boards/GENERIC/mpconfigboard.h.

Looks good!

In the STM32 port, there's an additional mpconfigboard_common.h, which sets defaults for boards which do not provide enough config.

That extra complexity isn't needed here, at least not now.

Defaults to BOARD=GENERIC.

dpgeorge · 2019-10-10T04:41:30Z

Not sure why the 512k build fails...

dpgeorge · 2019-10-10T04:47:36Z

Not sure why the 512k build fails...

Looks like it has to do with the changes I suggested to esp8266_common.ld, removing build-*.

Can you please revert that, ie use build-*/main.o ... etc?

mcauser · 2019-10-10T04:48:56Z

xtensa-lx106-elf-ld: build-GENERIC_512K/firmware.elf section `.irom0.text' will not fit in region `irom0_0_seg'
xtensa-lx106-elf-ld: region `irom0_0_seg' overflowed by 1544 bytes
make: *** [build-GENERIC_512K/firmware.elf] Error 1

Undo, Abort, Retry

Instead of disabling features in boards/GENERIC_512K

mcauser · 2019-10-10T04:53:29Z

Rolled back changes to esp8266_common.ld. Builds locally now.

LINK build-GENERIC_512K/firmware.elf
   text	   data	    bss	    dec	    hex	filename
 498124	   1024	  65960	 565108	  89f74	build-GENERIC_512K/firmware.elf
Create build-GENERIC_512K/firmware-combined.bin
esptool.py v1.2
flash     33088
padding   3776
irom0text 466104
total     502968
md5       06617a4ca7a2046cbf55ddb860564949

mcauser · 2019-10-10T04:58:20Z

GENERIC also builds successfully on my local.

LINK build-GENERIC/firmware.elf
   text	   data	    bss	    dec	    hex	filename
 586988	   1040	  66520	 654548	  9fcd4	build-GENERIC/firmware.elf
Create build-GENERIC/firmware-combined.bin
esptool.py v1.2
flash     33104
padding   3760
irom0text 554968
total     591832
md5       e75afe51f0f8e91323cc8df065baaf33

mcauser · 2019-10-10T05:26:32Z

Found an old ESP-01 with 512K flash (25Q40BT). Deployed GENERIC_512K to it. Works!

MicroPython v1.11-422-g2941879e0-dirty on 2019-10-10; ESP module (512K) with ESP8266
Type "help()" for more information.
>>> import micropython
>>> micropython.mem_info()
stack: 2112 out of 8192
GC: total: 37952, used: 688, free: 37264
 No. of 1-blocks: 14, 2-blocks: 7, max blk sz: 5, max free sz: 2325
>>> import gc
>>> gc.mem_free()
37104
>>> gc.mem_alloc()
960

dpgeorge · 2019-10-10T05:34:09Z

Really great work, thank you very much!

Rebased, squashed and merged in 53a9b45 and 3117fde

nevercast · 2019-10-10T05:38:07Z

Nice work!

jimmo reviewed Sep 18, 2019

View reviewed changes

mcauser force-pushed the esp8266-boards branch from 02c31f4 to e78d8d9 Compare September 18, 2019 06:05

dpgeorge added the port-esp8266 label Sep 26, 2019

mcauser force-pushed the esp8266-boards branch from 01e7b2c to f8f3e8e Compare September 30, 2019 05:31

mcauser force-pushed the esp8266-boards branch from 4fce96e to 33336fc Compare October 7, 2019 08:04

nevercast mentioned this pull request Oct 9, 2019

ESP32 RMT Implementation #5184

Closed

dpgeorge reviewed Oct 10, 2019

View reviewed changes

mcauser added 9 commits October 10, 2019 15:40

esp8266: Add per-board configs, following other ports.

020953c

Defaults to BOARD=GENERIC.

Add optional include mpconfigboard.mk

4f68a73

More hard coded build references

50d9324

esp8266: Add 512K board.

3d10484

esp8266: Renamed 512K board to GENERIC_512K.

31fc07e

esp8266: Moved ld files to /boards

194e87f

esp8266: Add GENERIC_512K to Travis

65031fa

esp8266: Move ld files to /boards

7c8e4b1

esp8266: Cleanup 512K board

2ab7dec

esp8266: Enable features in boards/GENERIC

2941879

Instead of disabling features in boards/GENERIC_512K

mcauser force-pushed the esp8266-boards branch from 4b088bf to 2941879 Compare October 10, 2019 04:50

dpgeorge closed this Oct 10, 2019

jimmo mentioned this pull request Feb 27, 2020

Add in a esp_my9291_write() function #5702

Closed

mcauser deleted the esp8266-boards branch June 18, 2021 02:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

esp8266: Add per-board configs, following other ports. #5118

esp8266: Add per-board configs, following other ports. #5118

mcauser commented Sep 18, 2019 •

edited

Loading

mcauser commented Sep 18, 2019

jimmo Sep 18, 2019

mcauser commented Sep 18, 2019

mcauser commented Sep 18, 2019

nevercast commented Sep 26, 2019 •

edited

Loading

dpgeorge commented Sep 26, 2019

mcauser commented Sep 30, 2019 •

edited

Loading

dpgeorge commented Sep 30, 2019

dpgeorge commented Oct 4, 2019

mcauser commented Oct 4, 2019

mcauser commented Oct 4, 2019

mcauser commented Oct 4, 2019

nevercast commented Oct 4, 2019

mcauser commented Oct 5, 2019 •

edited

Loading

mcauser commented Oct 7, 2019

dpgeorge left a comment

dpgeorge Oct 10, 2019

mcauser Oct 10, 2019

mcauser Oct 10, 2019

dpgeorge Oct 10, 2019

mcauser Oct 10, 2019

dpgeorge Oct 10, 2019

dpgeorge commented Oct 10, 2019

dpgeorge commented Oct 10, 2019

mcauser commented Oct 10, 2019

mcauser commented Oct 10, 2019

mcauser commented Oct 10, 2019 •

edited

Loading

mcauser commented Oct 10, 2019 •

edited

Loading

dpgeorge commented Oct 10, 2019

nevercast commented Oct 10, 2019

esp8266: Add per-board configs, following other ports. #5118

esp8266: Add per-board configs, following other ports. #5118

Conversation

mcauser commented Sep 18, 2019 • edited Loading

mcauser commented Sep 18, 2019

jimmo Sep 18, 2019

Choose a reason for hiding this comment

mcauser commented Sep 18, 2019

mcauser commented Sep 18, 2019

nevercast commented Sep 26, 2019 • edited Loading

dpgeorge commented Sep 26, 2019

mcauser commented Sep 30, 2019 • edited Loading

dpgeorge commented Sep 30, 2019

dpgeorge commented Oct 4, 2019

mcauser commented Oct 4, 2019

mcauser commented Oct 4, 2019

mcauser commented Oct 4, 2019

nevercast commented Oct 4, 2019

mcauser commented Oct 5, 2019 • edited Loading

mcauser commented Oct 7, 2019

dpgeorge left a comment

Choose a reason for hiding this comment

dpgeorge Oct 10, 2019

Choose a reason for hiding this comment

mcauser Oct 10, 2019

Choose a reason for hiding this comment

mcauser Oct 10, 2019

Choose a reason for hiding this comment

dpgeorge Oct 10, 2019

Choose a reason for hiding this comment

mcauser Oct 10, 2019

Choose a reason for hiding this comment

dpgeorge Oct 10, 2019

Choose a reason for hiding this comment

dpgeorge commented Oct 10, 2019

dpgeorge commented Oct 10, 2019

mcauser commented Oct 10, 2019

mcauser commented Oct 10, 2019

mcauser commented Oct 10, 2019 • edited Loading

mcauser commented Oct 10, 2019 • edited Loading

dpgeorge commented Oct 10, 2019

nevercast commented Oct 10, 2019

mcauser commented Sep 18, 2019 •

edited

Loading

nevercast commented Sep 26, 2019 •

edited

Loading

mcauser commented Sep 30, 2019 •

edited

Loading

mcauser commented Oct 5, 2019 •

edited

Loading

mcauser commented Oct 10, 2019 •

edited

Loading

mcauser commented Oct 10, 2019 •

edited

Loading