code synchronization at 2018-07-01@18:52

alibaba · Jul 1, 2018 · 5e53c97 · 5e53c97
1 parent c4d06db
commit 5e53c97
Show file tree

Hide file tree

Showing 287 changed files with 11,352 additions and 46,700 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -45,6 +45,8 @@ before_script:
 - echo ${TRAVIS_JOB_NUMBER}
 script:
 - bash ./build/autobuild.sh
+- bash ./tools/ci/pvbuild.sh
+- ls -lh ./prebuild
 after_success:
 - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then DIRNAME=push MARK=push; else DIRNAME=pr
  MARK=${TRAVIS_PULL_REQUEST}; fi
diff --git a/board/amebaz_dev/amebaz_dev.mk b/board/amebaz_dev/amebaz_dev.mk
@@ -13,6 +13,8 @@ $(NAME)_SOURCES := board.c
 GLOBAL_INCLUDES += .
 GLOBAL_DEFINES += STDIO_UART=0
 
+GLOBAL_CFLAGS += -DON_PRE2=1
+
 CONFIG_SYSINFO_PRODUCT_MODEL := ALI_AOS_RTL8710BN
 CONFIG_SYSINFO_DEVICE_NAME := RTL8710BN
 

diff --git a/board/eml3047/inc/hw_conf.h b/board/eml3047/inc/hw_conf.h
@@ -97,8 +97,10 @@ extern "C" {
 /* --------Preprocessor compile swicth------------ */
 
 /* debug swicthes in debug.h */
+#ifdef CONFIG_LINKWAN_AT
 #define LORA_DEBUG
 #define LORA_TRACE
+#endif
 
 /* uncomment below line to never enter lowpower modes in main.c*/
 /* #define LOW_POWER_DISABLE */

diff --git a/board/eml3047/src/eml3047_hw.c b/board/eml3047/src/eml3047_hw.c
@@ -321,7 +321,7 @@ void HW_Init( void )
 
 #ifdef LORA_DEBUG
  DBG_Uart_Init( );
- SYS_LED_Init( );
+ // SYS_LED_Init( );
 #endif
 
  McuInitialized = SET;

diff --git a/board/esp8266/board.c b/board/esp8266/board.c
@@ -8,15 +8,15 @@
 
 #include "esp_system.h"
 
-/* Logic partition on flash devices */
-const hal_logic_partition_t hal_partitions[] =
+/* Logic partition on flash devices for 4M bytes 1024*1024 */
+const hal_logic_partition_t hal_partitions_4M_1024x1024[] =
 {
  [HAL_PARTITION_BOOTLOADER] =
  {
  .partition_owner = HAL_FLASH_EMBEDDED,
  .partition_description = "Bootloader",
- .partition_start_addr = 0x1000,
- .partition_length = 0x7000, //28k bytes
+ .partition_start_addr = 0x0000,
+ .partition_length = 0x1000, //4k bytes
  .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
  },
  [HAL_PARTITION_PARAMETER_1] =
@@ -39,15 +39,15 @@ const hal_logic_partition_t hal_partitions[] =
  {
  .partition_owner = HAL_FLASH_EMBEDDED,
  .partition_description = "Application",
- .partition_start_addr = 0x10000,
+ .partition_start_addr = 0x1000,
  .partition_length = 0x100000, //1MB bytes
  .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
  },
  [HAL_PARTITION_OTA_TEMP] =
  {
  .partition_owner = HAL_FLASH_EMBEDDED,
  .partition_description = "OTA Storage",
- .partition_start_addr = 0x110000,
+ .partition_start_addr = 0x101000,
  .partition_length = 0x100000, //1MB bytes
  .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
  },
@@ -69,6 +69,250 @@ const hal_logic_partition_t hal_partitions[] =
  },
 };
 
+/* Logic partition on flash devices for 2M bytes 1024*1024 */
+const hal_logic_partition_t hal_partitions_2M_1024x1024[] =
+{
+ [HAL_PARTITION_BOOTLOADER] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "Bootloader",
+ .partition_start_addr = 0x0000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
+ },
+ [HAL_PARTITION_PARAMETER_1] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER1",
+ .partition_start_addr = 0x1f6000,
+ .partition_length = 0x1000, // 4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_2] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER2",
+ .partition_start_addr = 0x1f7000,
+ .partition_length = 0x2000, //8k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_APPLICATION] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "Application",
+ .partition_start_addr = 0x1000,
+ .partition_length = 0xF4000, //976 bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_OTA_TEMP] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "OTA Storage",
+ .partition_start_addr = 0x101000,
+ .partition_length = 0xF4000, //976 bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_3] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER3",
+ .partition_start_addr = 0x1f9000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_4] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER4",
+ .partition_start_addr = 0x1FA000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+};
+
+/* Logic partition on flash devices for 1M bytes 512*512 */
+const hal_logic_partition_t hal_partitions_1M_512x512[] =
+{
+ [HAL_PARTITION_BOOTLOADER] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "Bootloader",
+ .partition_start_addr = 0x0000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
+ },
+ [HAL_PARTITION_PARAMETER_1] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER1",
+ .partition_start_addr = 0xF6000,
+ .partition_length = 0x1000, // 4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_2] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER2",
+ .partition_start_addr = 0xF7000,
+ .partition_length = 0x2000, //8k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_APPLICATION] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "Application",
+ .partition_start_addr = 0x1000,
+ .partition_length = 0x75000, //468 bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_OTA_TEMP] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "OTA Storage",
+ .partition_start_addr = 0x81000,
+ .partition_length = 0x75000, //468 bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_3] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER3",
+ .partition_start_addr = 0xF9000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_4] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER4",
+ .partition_start_addr = 0xFA000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+};
+
+/* Logic partition on flash devices for 2M bytes 512*512 */
+const hal_logic_partition_t hal_partitions_2M_512x512[] =
+{
+ [HAL_PARTITION_BOOTLOADER] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "Bootloader",
+ .partition_start_addr = 0x0000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
+ },
+ [HAL_PARTITION_PARAMETER_1] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER1",
+ .partition_start_addr = 0x1F6000,
+ .partition_length = 0x1000, // 4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_2] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER2",
+ .partition_start_addr = 0x1F7000,
+ .partition_length = 0x2000, //8k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_APPLICATION] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "Application",
+ .partition_start_addr = 0x1000,
+ .partition_length = 0x7B000, //492 bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_OTA_TEMP] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "OTA Storage",
+ .partition_start_addr = 0x81000,
+ .partition_length = 0x7B000, //492 bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_3] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER3",
+ .partition_start_addr = 0x1F9000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_4] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER4",
+ .partition_start_addr = 0x1FA000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+};
+
+/* Logic partition on flash devices for 4M bytes 512*512 */
+const hal_logic_partition_t hal_partitions_4M_512x512[] =
+{
+ [HAL_PARTITION_BOOTLOADER] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "Bootloader",
+ .partition_start_addr = 0x0000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_DIS,
+ },
+ [HAL_PARTITION_PARAMETER_1] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER1",
+ .partition_start_addr = 0x3F6000,
+ .partition_length = 0x1000, // 4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_2] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER2",
+ .partition_start_addr = 0x3F7000,
+ .partition_length = 0x2000, //8k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_APPLICATION] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "Application",
+ .partition_start_addr = 0x1000,
+ .partition_length = 0x7B000, //492 bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_OTA_TEMP] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "OTA Storage",
+ .partition_start_addr = 0x81000,
+ .partition_length = 0x7B000, //492 bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_3] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER3",
+ .partition_start_addr = 0x3F9000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+ [HAL_PARTITION_PARAMETER_4] =
+ {
+ .partition_owner = HAL_FLASH_EMBEDDED,
+ .partition_description = "PARAMETER4",
+ .partition_start_addr = 0x3FA000,
+ .partition_length = 0x1000, //4k bytes
+ .partition_options = PAR_OPT_READ_EN | PAR_OPT_WRITE_EN,
+ },
+};
+
 uint32_t user_rf_cal_sector_set(void)
 {
  flash_size_map size_map = system_get_flash_size_map();

diff --git a/board/esp8266/k_config.h b/board/esp8266/k_config.h
@@ -35,6 +35,9 @@
 #ifndef RHINO_CONFIG_MM_BLK
 #define RHINO_CONFIG_MM_BLK 1
 #endif
+#ifndef RHINO_CONFIG_MM_BLK_SIZE
+#define RHINO_CONFIG_MM_BLK_SIZE 16
+#endif
 #ifndef RHINO_CONFIG_MM_TLF
 #define RHINO_CONFIG_MM_TLF 1
 #endif

diff --git a/board/linuxhost/ucube.py b/board/linuxhost/ucube.py
@@ -30,6 +30,6 @@
 component.set_global_testcases(testcases)
 aos_global_config.set('MESHLOWPOWER',1)
 
-linux_only_targets="networkapp helloworld linuxapp yts"
+linux_only_targets="networkapp helloworld linuxapp yts linkkitapp"
 build_types="release debug"
 
diff --git a/board/mk3060/ucube.py b/board/mk3060/ucube.py
@@ -3,6 +3,6 @@
 component = aos_board_component('board_mk3060', 'moc108', src)
 aos_global_config.add_ld_files('memory.ld.S')
 
-supported_targets="helloworld linuxapp meshapp uDataapp networkapp linkkitapp"
+supported_targets=="helloworld linuxapp meshapp uDataapp networkapp linkkitapp"
 build_types="release"