.gitlab-ci.yml

@@ -21,32 +21,174 @@ stages:
     - echo -e "Host gitlab.espressif.cn\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
 
 
-build_ssc:
+# build_ssc:
+#   <<: *build_template
+#   artifacts:
+#     paths:
+#       - ./SSC/ssc_bin
+#     expire_in: 6 mos
+#   script:
+#     - git clone $GITLAB_SSH_SERVER/yinling/SSC.git
+#     - cd SSC
+#     # ssc master branch does not support nonos any more, now checkout to the reserved branch
+#     - git checkout ${SSC_DEFAULT_BRANCH}
+#     - chmod +x gen_misc_non_os.sh
+#     - ./gen_misc_non_os.sh
+
+build_at:
   <<: *build_template
   artifacts:
     paths:
-      - ./SSC/ssc_bin
+      - ./bin/upgrade
+      - ./bin/*.bin
     expire_in: 6 mos
   script:
-    - git clone $GITLAB_SSH_SERVER/yinling/SSC.git
-    - cd SSC
-    # try checkout same branch
-    - git checkout ${CI_BUILD_REF_NAME} || git checkout ${SSC_DEFAULT_BRANCH}
-    - chmod +x gen_misc_non_os.sh
-    - ./gen_misc_non_os.sh
+    - cp -rf examples/at at
+    - cd at
+    - make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
 
-build_at:
+build_at_espconn:
   <<: *build_template
   artifacts:
     paths:
       - ./bin/upgrade
       - ./bin/*.bin
     expire_in: 6 mos
   script:
-    - cp -rf examples/at at
-    - cd at
+    - cp -rf examples/at_espconn at_espconn
+    - cd at_espconn
+    - make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
+
+build_at_nano:
+  <<: *build_template
+  artifacts:
+    paths:
+      - ./bin/upgrade
+      - ./bin/*.bin
+    expire_in: 6 mos
+  script:
+    - cp -rf examples/at_nano at_nano
+    - cd at_nano
+    - make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
+
+build_at_sdio:
+  <<: *build_template
+  artifacts:
+    paths:
+      - ./bin/upgrade
+      - ./bin/*.bin
+    expire_in: 6 mos
+  script:
+    - cp -rf examples/at_sdio at_sdio
+    - cd at_sdio
+    - make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
+
+build_esp_mqtt_proj:
+  <<: *build_template
+  artifacts:
+    paths:
+      - ./bin/upgrade
+      - ./bin/*.bin
+    expire_in: 6 mos
+  script:
+    - cp -rf examples/esp_mqtt_proj esp_mqtt_proj
+    - cd esp_mqtt_proj
+    - make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
+
+# build_IoT_Demo:
+#   <<: *build_template
+#   artifacts:
+#     paths:
+#       - ./bin/upgrade
+#       - ./bin/*.bin
+#     expire_in: 6 mos
+#   script:
+#     - cp -rf examples/IoT_Demo IoT_Demo
+#     - cd IoT_Demo
+#     - make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
+
+build_peripheral_test:
+  <<: *build_template
+  artifacts:
+    paths:
+      - ./bin/upgrade
+      - ./bin/*.bin
+    expire_in: 6 mos
+  script:
+    - cp -rf examples/peripheral_test peripheral_test
+    - cd peripheral_test
     - make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
 
+build_simple_pair:
+  <<: *build_template
+  artifacts:
+    paths:
+      - ./bin/upgrade
+      - ./bin/*.bin
+    expire_in: 6 mos
+  script:
+    - cp -rf examples/simple_pair simple_pair
+    - cd simple_pair
+    - make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
+
+build_smart_config:
+  <<: *build_template
+  artifacts:
+    paths:
+      - ./bin/upgrade
+      - ./bin/*.bin
+    expire_in: 6 mos
+  script:
+    - cp -rf examples/smart_config smart_config
+    - cd smart_config
+    - make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
+
+build_wpa2_enterprise:
+  <<: *build_template
+  artifacts:
+    paths:
+      - ./bin/upgrade
+      - ./bin/*.bin
+    expire_in: 6 mos
+  script:
+    - cp -rf examples/wpa2_enterprise wpa2_enterprise
+    - cd wpa2_enterprise
+    - make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
+
+build_wps:
+  <<: *build_template
+  artifacts:
+    paths:
+      - ./bin/upgrade
+      - ./bin/*.bin
+    expire_in: 6 mos
+  script:
+    - cp -rf examples/wps wps
+    - cd wps
+    - make COMPILE=gcc BOOT=new APP=1 SPI_SPEED=40 SPI_MODE=QIO SPI_SIZE_MAP=5
+
+build_gen_patch_bin:
+  <<: *build_template
+  artifacts:
+    paths:
+      - ./bin/*.h
+    expire_in: 6 mos
+  script:
+    - cp -rf examples/gen_patch_bin gen_patch_bin
+    - cd gen_patch_bin
+    - python2 gen_patch_bin.py
+    - cp patch_array.h  ../bin/
+
+build_driver_lib:
+  <<: *build_template
+  artifacts:
+    paths:
+      - ./lib
+    expire_in: 6 mos
+  script:
+    - cd driver_lib
+    - ./make_lib.sh driver
+
 push_master_to_github:
   stage: deploy
   only:

Makefile

@@ -22,6 +22,7 @@ else
 	OBJDUMP = xt-objdump
 endif
 
+PYTHON?=python2
 BOOT?=none
 APP?=0
 SPI_SPEED?=40
@@ -209,6 +210,7 @@ OBINS := $(GEN_BINS:%=$(BINODIR)/%)
 
 CCFLAGS += 			\
 	-g			\
+	-Os     \
 	-Wpointer-arith		\
 	-Wundef			\
 	-Wl,-EL			\
@@ -219,6 +221,7 @@ CCFLAGS += 			\
 	-ffunction-sections \
 	-fdata-sections	\
 	-fno-builtin-printf \
+	-fno-jump-tables \
 	-fno-guess-branch-probability \
 	-freorder-blocks-and-partition \
 	-fno-cse-follow-jumps
@@ -279,7 +282,7 @@ endif
 	@echo "!!!"
 
 ifeq ($(app), 0)
-	@python ../tools/gen_appbin.py $< 0 $(mode) $(freqdiv) $(size_map) $(app)
+	@$(PYTHON) ../tools/gen_appbin.py $< 0 $(mode) $(freqdiv) $(size_map) $(app)
 	@mv eagle.app.flash.bin ../bin/eagle.flash.bin
 	@mv eagle.app.v6.irom0text.bin ../bin/eagle.irom0text.bin
 	@rm eagle.app.v6.*
@@ -289,10 +292,10 @@ ifeq ($(app), 0)
 	@echo "eagle.irom0text.bin---->0x10000"
 else
     ifneq ($(boot), new)
-		@python ../tools/gen_appbin.py $< 1 $(mode) $(freqdiv) $(size_map) $(app)
+		@$(PYTHON) ../tools/gen_appbin.py $< 1 $(mode) $(freqdiv) $(size_map) $(app)
 		@echo "Support boot_v1.1 and +"
     else
-		@python ../tools/gen_appbin.py $< 2 $(mode) $(freqdiv) $(size_map) $(app)
+		@$(PYTHON) ../tools/gen_appbin.py $< 2 $(mode) $(freqdiv) $(size_map) $(app)
 
     	ifeq ($(size_map), 6)
 		@echo "Support boot_v1.4 and +"

VERSION

@@ -1,21 +1,21 @@
 gwen:
-    at          :   b29dcd3
-    crypto      :   b29dcd3
-    espnow      :   b29dcd3
-    main        :   b29dcd3
-    net80211    :   b29dcd3
-    pp          :   b29dcd3
-    ssl         :   b29dcd3
-    upgrade     :   b29dcd3
-    wpa         :   b29dcd3
-    wpa2        :   b29dcd3
-    wps         :   b29dcd3
+    at          :   a5c6adc
+    crypto      :   a5c6adc
+    espnow      :   a5c6adc
+    main        :   a5c6adc
+    net80211    :   a5c6adc
+    pp          :   a5c6adc
+    ssl         :   a5c6adc
+    upgrade     :   a5c6adc
+    wpa         :   a5c6adc
+    wpa2        :   a5c6adc
+    wps         :   a5c6adc
 
 phy:
     phy         :   1156_0
 
 gitlab:
-    driver      :   5a2a54b4
+    driver      :   12aadf20
     json        :   f55d5fee
     lwip        :   5623f48f
     mbedtls     :   82b93fe5

driver_lib/Makefile

@@ -53,7 +53,7 @@ LINKFLAGS_eagle.app.v6 = \
     -nostdlib    \
     -T$(LD_FILE)   \
     -Wl,--no-check-sections    \
-    -u call_user_start    \
+    -u call_user_start1    \
     -Wl,-static                        \
     -Wl,--start-group                    \
     -lc                    \

driver_lib/driver/system_patch_apply.c

@@ -0,0 +1,56 @@
+#include "osapi.h"
+#include "patch_array.h"
+#include "mem.h"
+#include "eagle_soc.h"
+
+#if 0
+typedef int (*__ets_printf_t)(const char *fmt, ...); 
+#define ROM_PRINTF(_fmt, ...)   ((__ets_printf_t)(0x400024cc))(_fmt, ##__VA_ARGS__)
+#else
+#define ROM_PRINTF(_fmt, ...)   ets_printf(_fmt, ##__VA_ARGS__)
+#endif
+
+extern void call_user_start(void);
+extern char _heap_start;
+
+int patch_apply(void)
+{
+    uint32_t flash_id;
+    int ret = __INT_MAX__;
+
+    WRITE_PERI_REG(0x60000240, 0);
+    WRITE_PERI_REG(0x60000200, 0x01 << 28);
+    while(READ_PERI_REG(0x60000200) != 0);
+    flash_id = READ_PERI_REG(0x60000240) & 0xffffff;
+    ROM_PRINTF("flash_id=0x%x\r\n", flash_id);
+    if (flash_id == 0x1560eb) {
+        ROM_PRINTF("apply...\r\n");
+        uint32 len = 0;
+        uint8* data = patch_data + 8;
+        uint32* addr = 0;
+        uint8 loop = 0;
+
+        ROM_PRINTF("data %p %d...\r\n", data, patch_data[1]);
+        for (loop = 0; loop < patch_data[1] && (data - patch_data < sizeof(patch_data) - 8); loop++) {
+          addr = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3]<<24);
+          len = data[4] | (data[5] << 8) | (data[6] << 16) | (data[7]<<24);
+          data += 8;
+          ets_memcpy(addr, data, len);
+          data += len;
+          ROM_PRINTF("addr=0x%x, len=%d\r\n",addr, len);
+        }
+        int (*apply_patch)(uint8_t *buffer1024);
+        apply_patch = patch_data[4] | (patch_data[5] << 8) | (patch_data[6] << 16) | (patch_data[7]<<24);
+        ROM_PRINTF("apply_patch=0x%08x...\r\n", *(uint32*)apply_patch);
+        ret = apply_patch(&_heap_start);
+        ROM_PRINTF("apply done...\r\n");
+    }
+    return ret;
+}
+
+void call_user_start1(void)
+{
+  int32 ret = patch_apply();
+  ROM_PRINTF("ret=%d\r\n", ret);
+  call_user_start();
+}