Fix down the ESP Open SDK version used to build CircuitPython for consistency

[deshipu]

I'm trying to build my own version on the 2.2.3 CircuitPython for HUZZAH, but I'm getting the following error:

In file included from ./esp_mphal.h:73:0,
                 from ../py/mphal.h:32,
                 from ../py/mpprint.c:33:
./etshal.h:9:6: error: conflicting types for 'ets_delay_us'
 void ets_delay_us();
      ^
./etshal.h:9:1: note: an argument type that has a default promotion can't match an empty parameter name list declaration
 void ets_delay_us();
 ^
In file included from ./esp_mphal.h:66:0,
                 from ../py/mphal.h:32,
                 from ../py/mpprint.c:33:
/home/sheep/dev/micropython/esp-open-sdk/xtensa-lx106-elf/xtensa-lx106-elf/sysroot/usr/include/osapi.h:33:6: note: previous declaration of 'ets_delay_us' was here
 void ets_delay_us(uint16_t us);
      ^
../py/mkrules.mk:53: recipe for target 'build/py/mpprint.o' failed
make: *** [build/py/mpprint.o] Error 1

It seems like the esp-open-sdk that is mentioned in the README is no longer compatible? What version of esp-open-sdk should I be using?

[deshipu]

The following changes made it compile:

diff --git a/esp8266/etshal.h b/esp8266/etshal.h
index 34787779f..32942bcb2 100644
--- a/esp8266/etshal.h
+++ b/esp8266/etshal.h
@@ -6,14 +6,14 @@
 // see http://esp8266-re.foogod.com/wiki/Random_Number_Generator
 #define WDEV_HWRNG ((volatile uint32_t*)0x3ff20e44)
 
-void ets_delay_us();
+void ets_delay_us(uint16_t us);
 void ets_intr_lock(void);
 void ets_intr_unlock(void);
 void ets_isr_mask(uint32_t mask);
 void ets_isr_unmask(uint32_t mask);
 void ets_isr_attach(int irq_no, void (*handler)(void *), void *arg);
 void ets_install_putc1();
-void uart_div_modify();
+void uart_div_modify(uint8 uart_no, uint32 DivLatchValue);
 void ets_set_idle_cb(void (*handler)(void *), void *arg);
 
 void ets_timer_arm_new(os_timer_t *tim, uint32_t millis, bool repeat, bool is_milli_timer);
@@ -33,10 +33,10 @@ void MD5Update(MD5_CTX *context, const void *data, unsigned int len);
 void MD5Final(unsigned char digest[16], MD5_CTX *context);
 
 // These prototypes are for recent SDKs with "malloc tracking"
-void *pvPortMalloc(unsigned sz, const char *fname, int line);
-void *pvPortZalloc(unsigned sz, const char *fname, int line);
-void *pvPortRealloc(void *p, unsigned sz, const char *fname, int line);
-void vPortFree(void *p, const char *fname, int line);
+void *pvPortMalloc (size_t sz, const char *, unsigned);
+void *pvPortZalloc (size_t sz, const char *, unsigned);
+void *pvPortRealloc (void *p, size_t n, const char *, unsigned);
+void vPortFree (void *p, const char *, unsigned);
 
 uint32_t SPIRead(uint32_t offset, void *buf, uint32_t len);
 uint32_t SPIWrite(uint32_t offset, const void *buf, uint32_t len);

[deshipu]

Should I make a pull request?

[deshipu]

Even after that, I still get:

xtensa-lx106-elf-ld: build/firmware.elf section `.text' will not fit in region `iram1_0_seg'
xtensa-lx106-elf-ld: region `iram1_0_seg' overflowed by 61096 bytes

I guess the firmware grew too much?

[jerryneedell]

hmmm - I just did a fresh clone and checkout of 2.x and I get the following error for esp8266 BSP

make[2]: Leaving directory '/home/jerryneedell/projects/adafruit_github/circuitpython_2x/lib/axtls/ssl'
make[1]: Leaving directory '/home/jerryneedell/projects/adafruit_github/circuitpython_2x/lib/axtls'
cp ../lib/axtls/_stage/libaxtls.a build/libaxtls.a
make: *** No rule to make target 'drivers/dht/dht.c', needed by 'build/genhdr/qstr.i.last'.  Stop.

[jerryneedell]

It looks like the drivers/dht folder was removed with #632 - this breaks esp8266 build for 2.x as noted above.

[jerryneedell]

@deshipu my version of the SDK is pretty old - I have not updated it recent;y - perhaps I'll hold off...

ESP8266_NONOS_SDK_V2.0.0_16_07_19 release notes

[deshipu]

@jerryneedell you can always checkout an earlier version, the thing is, we need to know which one... can you tell me what is the last commit in yours?

[jerryneedell]

@deshipu how can I verify the version? I also see
ESP8266_NONOS_SDK_V2.0.0_16_08_10
in my build folder.

[jerryneedell]

looks like it is:
sdk -> ESP8266_NONOS_SDK_V2.0.0_16_08_10

[deshipu]

Oh, so it's the pre-krack one.

[jerryneedell]

It is the same version on my linux box (May 2017) and on a "vagrant" install I did on my Mac in January. I have not updated it since then. It looks like the vagrant install used the latest available at the time.

[jerryneedell]

does your 2.x clone have the "drivers/dht "folder ? #632 was applied 2 days ago - big update to 2.x

[deshipu]

No drivers in 2.x

[jerryneedell]

OK so do you also get the same error I am getting from the Makefile? Or don't you get that far.