[LTD mergeup] Merge 'zephyrproject-rtos/master' into ltd-17.06

Summary ------- There's a variety of rework going on in different subsystems, with a small number of new features. The Bluetooth stack has grown significantly (1KB+). An additional ARM SoC (TI's CC2650) was added, and there are a small number of other fixes in that architecture, as well as in the net subsystem. There are API breaks in Bluetooth related to two new routines, bt_gatt_register_service() and bt_gatt_unregister_service(). There are some minor kernel and board changes. In drivers, there are new pinmux and GPIO drivers for the CC2650, fixes to the STM32 flash driver, and some other minor changes. The documentation, samples, and boards are being reorganized. The documentation reorganization is mostly for the 1.8 release. In the samples, examples of how to use the new KBUILD_ZEPHYR_APP Makefile variable have been added, and some other reorganization was done. Many test cases have seen code style fixes, and various test directories have been renamed. In DTS, partition tables have started to be merged describing device flash layout for use with mcuboot, along with some fixes to the Python scripts that manage Zephyr device trees. There is a fix to the NXP MPU. Upstream Changes ---------------- Arches: - sam4x: report correct number of IRQ priority bits - arm: Add support for TI's CC2650 SoC. - arm: Modify linker script to accomodate need for flash footer. - arch: same70: Fix ERASE pin configuration - arm: Add build time consistency check for irq priority defines Net: - net: context: Close connection fast if TIME_WAIT support is off - net: buf: Move net_buf_pool objects to dedicated linker area - net: pkt: Fix net_pkt_split() Bluetooth: - Bluetooth: controller: Fix OCF data size - Bluetooth: controller: Fix directed adv timeout and disable - Bluetooth: controller: Add connect ind PDU address fields check - Bluetooth: controller: Fix conn context leak under directed adv - Bluetooth: GATT: Fix aligment of bt_gatt_ccc_cfg and _bt_gatt_ccc - Bluetooth: controller: Refactor whitelist handling (v2) - Bluetooth: GATT: Rename bt_gatt_unregister_service - Bluetooth: controller: Add inital support for Controller-based privacy - Bluetooth: Correctly select RPA and TINYCRYPT options - Bluetooth: controller: Rename mem function that checks all-zero mem - Bluetooth: controller: Use find_lsb_set instead of custom ffs - bluetooth: hci: Kconfig: Fix dependency - Bluetooth: Shell: Add gatt-show-db command - Bluetooth: Shell: Add gatt-unregister-service command - Bluetooth: GATT: Add bt_gatt_unregister_service - Bluetooth: GATT: Add bt_gatt_register_service - Bluetooth: GATT: Indicate Service Changed when a service is added - Bluetooth: GATT: Add GATT service by default - Bluetooth: GATT: Add GAP service by default - Bluetooth: Kconfig: Add CONFIG_BLUETOOTH_DEVICE_APPEARANCE - Bluetooth: Remove CONFIG_BLUETOOTH_GATT_DYNAMIC_DB - Bluetooth: ATT: Fix adding timeout for NULL request - Bluetooth: controller: Move scan response data swap outside tIFS Kernel: - kernel: remove gdb_server - linker: move all linker headers to include/linker - slist: Make sys_slist_find_and_remove return bool Boards: - sensortag: Add TI's SensorTag board. - boards: arm: olimex_stm32_e407: Initial Olimex STM32-E407 BSP - boards: stm32373c_eval: fix trailing whitespace in docs Drivers: - drivers: remove unused headers for nsim serial - cc2650: Add pinmux driver. - cc2650: Add GPIO driver. - uart: Use DTS labels for Stellaris driver. - flash: stm32: distinguish read/write for flash range valid - flash: stm32: fix for l4 writing wrong data - drivers: serial: uart_stellaris: Remove UART_IRQ_FLAGS - pinmux: pinmux_dev_k64 driver and related references are removed. - rts: Kconfig: Add QMSI dependency on RTC options Documentation: - doc: fix references to moved files - doc: add MPU samples to index - doc: fix headings in device tree doc - eoc: move non-board docs from boards TOC list - doc: update release-notes index page - doc: add 1.8 release notes - doc: change UTF-8 chars to sphinx inline replaces - doc: Add link to v1.8 documentation - doc: fix doxygen errors in bt include files Samples: - samples: appdev: static_lib: added "make flash" - samples: demonstrate the use of KBUILD_ZEPHYR_APP - samples: move app developemnt samples samples/appdev - samples: move all MPU samples into one directory - samples: move quark se power samples to boards/ - samples: move environment sensing to boards - samples: gpio: Add support for SensorTag board. Tests: - tests: pipe: fix style - tests: pipe: rename test directory - tests: timer_monotonic: fix style - tests: timer_api: fix style - tests: schedule_api: fix style - tests: thread_init: fix style - tests: rename cdata -> custom_data - tests: threads_scheduling -> threads/scheduling - tests: threads_lifecycle/ -> threads/lifecycle - tests: threads_customdata/ -> threads/customdata - tests: queue: fix code style - tests: profiling_api: fix code style - tests: poll: fix code style - tests: pending: fix code style - tests: obj_tracing: fix code style - tests: mutex_api: fix code style - tests: mutex: fix code style - tests: mbox: fix code style - tests: move ipm test to drivers - tests: ipm: fix code style - tests: fp_sharing: fix code style - tests: fifo: fix code style - tests: critical: fix code style - tests: common: fix code style - tests: bitfield: fix code style - tests: arm_runtime_nmi: fix code style - tests: arm_irq_vector_table: fix code style - tests: alert_api: fix code style - tests: sleep: rename test directory - tests: put tickless tests together - tests: workq_api: rename test directory - tests: work_queue: fix code style - tests: workq_api: fix code style - tests: mem_heap: fix code style - tests: mem_pool_threadsafe: fix code style - tests: mem_pool_api: fix code style - tests: mem_pool: fix code style - tests: mslab_threadsafe: fix code style - tests: mslab_concept: fix code style - tests: mslab_api: fix style - tests: rename test directory for mem_pool - tests: rename test directory for mem_slab - tests: rename test directory for fifo - tests: rename test directory for lifo - tests: rename test directory for alert - test: fix misspellings - tests: rename test directory test_bluetooth -> bluetooth - tests: rename test directory test_loop_transfer -> loop_transfer - tests: rename test directory test_chan_blen_transfer - tests: rename test directory test_sha256 -> sha256 - tests: rename test directory test_mbedtls -> mbedtls - tests: rename test directory test_hmac_prng -> hmac_prng - tests: rename test directory test_hmac -> hmac - tests: rename test directory test_ecc_dh -> ecc_dh - tests: rename test directory test_ecc_dsa -> ecc_dsa - tests: rename test directory test_ctr_prng -> ctr_prng - tests: rename test directory test_ctr_mode -> ctr_mode - tests: rename test directory test_cmac_mode -> cmac_mode - tests: rename test directory test_ccm_mode -> ccm_mode - tests: rename test directory test_cbc_mode -> cbc_mode - tests: rename test directory test_aes -> aes - tests: benchmark: boot_time: Reading time stamps made arch agnostic - tests: benchmarks: footprint: really enable floating point on arm - tests: benchmarks: footprint: build on ARM - tests: benchmarks: footprint: fix tag typo - ci: if script fails, report error - tests: net: ipv6_fragment: Fix llvm compiler warning - scripts: sanitycheck: Clean up help text. - scripts: sanitycheck: Switch config target - scripts: sanitycheck: more spelliing fixes - Makefile: Add config-sanitycheck target DTS: - arm: nxp: k6x: Fix typo in partition offset - scripts: extract_dts_includes.py: Correct LOAD_OFFSET - arm: nxp: k6x: Add default partition table. Memory management and protection: - arm: nxp: mpu: Fix region descriptor 0 attributes Signed-off-by: Marti Bolivar <[email protected]>
rsalveti · Jun 22, 2017 · c2a529b · c2a529b
2 parents d9ec7da + 851b214
commit c2a529b
Show file tree

Hide file tree

Showing 695 changed files with 6,451 additions and 5,385 deletions.
diff --git a/.shippable.yml b/.shippable.yml
@@ -49,9 +49,12 @@ build:
             echo "Building a Pull Request";
             echo "- Building Documentation";
             echo "Commit range:" ${COMMIT_RANGE}
-            sudo pip install sphinx==1.5.5
             make htmldocs > doc.log 2>&1;
-            ./scripts/filter-known-issues.py --config-dir .known-issues/doc/ doc.log > doc.warnings;
+            python2 ./scripts/filter-known-issues.py --config-dir .known-issues/doc/ doc.log > doc.warnings;
+            if [ "$?" != 0 ]; then
+              echo " ==> Error running filter script"
+              exit 1
+            fi;
             if [ -s doc.warnings ]; then
               echo " => New documentation warnings/errors";
             fi;

diff --git a/Makefile b/Makefile
@@ -1008,6 +1008,17 @@ endif
 
 dts: include/generated/generated_dts_board.h
 
+define filechk_.config-sanitycheck
+	(cat .config; \
+	 grep -e '^CONFIG' include/generated/generated_dts_board.conf | cat; \
+	)
+endef
+
+.config-sanitycheck: include/generated/generated_dts_board.conf FORCE
+	$(call filechk,.config-sanitycheck)
+
+config-sanitycheck: .config-sanitycheck
+
 # The actual objects are generated when descending,
 # make sure no implicit rule kicks in
 $(sort $(zephyr-deps)): $(zephyr-dirs) zephyr-app-dir ;
@@ -1124,6 +1135,7 @@ CLEAN_DIRS  += $(MODVERDIR)
 
 CLEAN_FILES += 	include/generated/generated_dts_board.conf \
 		include/generated/generated_dts_board.h \
+		.config-sanitycheck \
 		.old_version .tmp_System.map .tmp_version \
 		.tmp_* System.map *.lnk *.map *.elf *.lst \
 		*.bin *.hex *.stat *.strip staticIdt.o linker.cmd \

diff --git a/Makefile.inc b/Makefile.inc
@@ -125,6 +125,9 @@ outputexports: initconfig
 dts: initconfig
 	$(Q)$(call zephyrmake,$(O),$@)
 
+config-sanitycheck: dts
+	$(Q)$(call zephyrmake,$(O),$@)
+
 menuconfig: initconfig
 	$(Q)$(call zephyrmake,$(O),$@)
 

diff --git a/arch/arc/core/atomic.S b/arch/arc/core/atomic.S
@@ -17,7 +17,7 @@
  */
 
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 
 /* exports */
 

diff --git a/arch/arc/core/cache.c b/arch/arc/core/cache.c
@@ -18,7 +18,7 @@
 #include <misc/util.h>
 #include <toolchain.h>
 #include <cache.h>
-#include <linker-defs.h>
+#include <linker/linker-defs.h>
 #include <arch/arc/v2/aux_regs.h>
 #include <nano_internal.h>
 #include <misc/__assert.h>

diff --git a/arch/arc/core/cpu_idle.S b/arch/arc/core/cpu_idle.S
@@ -14,7 +14,7 @@
 #include <kernel_structs.h>
 #include <offsets_short.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <arch/cpu.h>
 
 GTEXT(k_cpu_idle)

diff --git a/arch/arc/core/fault.c b/arch/arc/core/fault.c
@@ -12,7 +12,7 @@
  */
 
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <inttypes.h>
 
 #include <kernel.h>

diff --git a/arch/arc/core/fault_s.S b/arch/arc/core/fault_s.S
@@ -12,7 +12,7 @@
  */
 
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <arch/cpu.h>
 #include <swap_macros.h>
 

diff --git a/arch/arc/core/irq_manage.c b/arch/arc/core/irq_manage.c
@@ -21,7 +21,7 @@
 #include <arch/cpu.h>
 #include <misc/__assert.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <sw_isr_table.h>
 #include <irq.h>
 

diff --git a/arch/arc/core/isr_wrapper.S b/arch/arc/core/isr_wrapper.S
@@ -15,7 +15,7 @@
 
 #include <offsets_short.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <sw_isr_table.h>
 #include <kernel_structs.h>
 #include <arch/cpu.h>

diff --git a/arch/arc/core/prep_c.c b/arch/arc/core/prep_c.c
@@ -18,7 +18,7 @@
 
 #include <zephyr/types.h>
 #include <toolchain.h>
-#include <linker-defs.h>
+#include <linker/linker-defs.h>
 #include <arch/arc/v2/aux_regs.h>
 #include <kernel_structs.h>
 #include <nano_internal.h>

diff --git a/arch/arc/core/reset.S b/arch/arc/core/reset.S
@@ -13,7 +13,7 @@
 
 // #include <board.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <arch/cpu.h>
 
 GDATA(_interrupt_stack)

diff --git a/arch/arc/core/sys_fatal_error_handler.c b/arch/arc/core/sys_fatal_error_handler.c
@@ -13,7 +13,7 @@
 
 #include <kernel.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <kernel_structs.h>
 #include <misc/printk.h>
 

diff --git a/arch/arc/core/thread_entry_wrapper.S b/arch/arc/core/thread_entry_wrapper.S
@@ -12,7 +12,7 @@
  */
 
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 
 GTEXT(_thread_entry_wrapper)
 GTEXT(_thread_entry)

diff --git a/arch/arc/include/kernel_arch_data.h b/arch/arc/include/kernel_arch_data.h
@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <arch/cpu.h>
 #include <vector_table.h>
 #include <kernel_arch_thread.h>

diff --git a/arch/arc/include/vector_table.h b/arch/arc/include/vector_table.h
@@ -31,7 +31,7 @@ extern "C" {
 
 #include <board.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 
 GTEXT(__start)
 GTEXT(_VectorTable)

diff --git a/arch/arm/core/cortex_m/nmi.c b/arch/arm/core/cortex_m/nmi.c
@@ -18,7 +18,7 @@
 #include <misc/printk.h>
 #include <misc/reboot.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 
 extern void _SysNmiOnReset(void);
 #if !defined(CONFIG_RUNTIME_NMI)

diff --git a/arch/arm/core/cortex_m/nmi_on_reset.S b/arch/arm/core/cortex_m/nmi_on_reset.S
@@ -16,7 +16,7 @@
  */
 
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 

diff --git a/arch/arm/core/cortex_m/prep_c.c b/arch/arm/core/cortex_m/prep_c.c
@@ -19,7 +19,7 @@
 #include <kernel.h>
 #include <zephyr/types.h>
 #include <toolchain.h>
-#include <linker-defs.h>
+#include <linker/linker-defs.h>
 #include <nano_internal.h>
 #include <arch/arm/cortex_m/cmsis.h>
 

diff --git a/arch/arm/core/cortex_m/reset.S b/arch/arm/core/cortex_m/reset.S
@@ -13,7 +13,7 @@
 
 #include <board.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <arch/cpu.h>
 #include <offsets_short.h>
 #include "vector_table.h"

diff --git a/arch/arm/core/cortex_m/vector_table.S b/arch/arm/core/cortex_m/vector_table.S
@@ -18,7 +18,7 @@
 
 #include <board.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <drivers/system_timer.h>
 #include "vector_table.h"
 

diff --git a/arch/arm/core/cortex_m/vector_table.h b/arch/arm/core/cortex_m/vector_table.h
@@ -29,7 +29,7 @@ extern "C" {
 
 #include <board.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <misc/util.h>
 
 GTEXT(__start)

diff --git a/arch/arm/core/cpu_idle.S b/arch/arm/core/cpu_idle.S
@@ -12,7 +12,7 @@
 
 #include <offsets_short.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <arch/cpu.h>
 #ifdef CONFIG_TICKLESS_IDLE
 #include <kernel_structs.h>

diff --git a/arch/arm/core/fatal.c b/arch/arm/core/fatal.c
@@ -12,7 +12,7 @@
  */
 
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <inttypes.h>
 
 #include <kernel.h>

diff --git a/arch/arm/core/fault.c b/arch/arm/core/fault.c
@@ -12,7 +12,7 @@
  */
 
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 
 #include <kernel.h>
 #include <kernel_structs.h>

diff --git a/arch/arm/core/fault_s.S b/arch/arm/core/fault_s.S
@@ -12,7 +12,7 @@
  */
 
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <arch/cpu.h>
 
 _ASM_FILE_PROLOGUE

diff --git a/arch/arm/core/irq_init.c b/arch/arm/core/irq_init.c
@@ -17,7 +17,7 @@
  */
 
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <kernel.h>
 #include <arch/cpu.h>
 #include <arch/arm/cortex_m/cmsis.h>

diff --git a/arch/arm/core/irq_manage.c b/arch/arm/core/irq_manage.c
@@ -19,7 +19,7 @@
 #include <arch/arm/cortex_m/cmsis.h>
 #include <misc/__assert.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <sw_isr_table.h>
 #include <irq.h>
 #include <kernel_structs.h>

diff --git a/arch/arm/core/isr_wrapper.S b/arch/arm/core/isr_wrapper.S
@@ -14,7 +14,7 @@
 
 #include <offsets_short.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <sw_isr_table.h>
 #include <kernel_structs.h>
 #include <arch/cpu.h>

diff --git a/arch/arm/core/sys_fatal_error_handler.c b/arch/arm/core/sys_fatal_error_handler.c
@@ -14,7 +14,7 @@
 
 #include <kernel.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <kernel_structs.h>
 #include <misc/printk.h>
 

diff --git a/arch/arm/core/thread_abort.c b/arch/arm/core/thread_abort.c
@@ -19,7 +19,7 @@
 #include <kernel.h>
 #include <kernel_structs.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <ksched.h>
 #include <wait_q.h>
 

diff --git a/arch/arm/include/kernel_arch_data.h b/arch/arm/include/kernel_arch_data.h
@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <arch/cpu.h>
 #include <kernel_arch_thread.h>
 

diff --git a/arch/arm/soc/atmel_sam/same70/soc_config.c b/arch/arm/soc/atmel_sam/same70/soc_config.c
@@ -22,7 +22,7 @@
  */
 static int atmel_same70_config(struct device *dev)
 {
-#ifdef SOC_ATMEL_SAME70_DISABLE_ERASE_PIN
+#ifdef CONFIG_SOC_ATMEL_SAME70_DISABLE_ERASE_PIN
 	/* Disable ERASE function on PB12 pin, this is controlled by Bus Matrix */
 	MATRIX->CCFG_SYSIO |= CCFG_SYSIO_SYSIO12;
 #endif

diff --git a/arch/arm/soc/nxp_kinetis/k6x/nxp_mpu_regions.c b/arch/arm/soc/nxp_kinetis/k6x/nxp_mpu_regions.c
@@ -15,7 +15,7 @@ static struct nxp_mpu_region mpu_regions[] = {
 	MPU_REGION_ENTRY("DEBUGGER_0",
 			 0,
 			 0xFFFFFFFF,
-			 0),
+			 REGION_DEBUG_ATTR),
 	/* Region 1 */
 	MPU_REGION_ENTRY("FLASH_0",
 			 CONFIG_FLASH_BASE_ADDRESS,

diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc.c b/arch/arm/soc/nxp_kinetis/k6x/soc.c
@@ -18,7 +18,7 @@
 #include <init.h>
 #include <soc.h>
 #include <uart.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
 #include <arch/cpu.h>

diff --git a/arch/arm/soc/nxp_kinetis/k6x/wdog.S b/arch/arm/soc/nxp_kinetis/k6x/wdog.S
@@ -13,7 +13,7 @@
 
 #include <soc.h>
 #include <toolchain.h>
-#include <sections.h>
+#include <linker/sections.h>
 
 _ASM_FILE_PROLOGUE
 

diff --git a/arch/arm/soc/nxp_kinetis/kl2x/soc.c b/arch/arm/soc/nxp_kinetis/kl2x/soc.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <init.h>
 #include <soc.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
 #include <arch/cpu.h>

diff --git a/arch/arm/soc/nxp_kinetis/kwx/soc.c b/arch/arm/soc/nxp_kinetis/kwx/soc.c
@@ -9,7 +9,7 @@
 #include <init.h>
 #include <soc.h>
 #include <uart.h>
-#include <sections.h>
+#include <linker/sections.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
 #include <arch/cpu.h>

diff --git a/arch/arm/soc/ti_lm3s6965/soc.h b/arch/arm/soc/ti_lm3s6965/soc.h
@@ -78,8 +78,6 @@ extern "C" {
 /* uart configuration settings */
 #if defined(CONFIG_UART_STELLARIS)
 
-#define UART_IRQ_FLAGS 0
-
 #define UART_STELLARIS_CLK_FREQ		SYSCLK_DEFAULT_IOSC_HZ
 
 #endif /* CONFIG_UART_STELLARIS */

diff --git a/arch/arm/soc/ti_simplelink/cc2650/Kconfig.defconfig.series b/arch/arm/soc/ti_simplelink/cc2650/Kconfig.defconfig.series
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Kconfig.defconfig.series - TI SimpleLink CC2650
+#
+
+if SOC_SERIES_CC2650
+
+config SOC_SERIES
+	default cc2650
+
+config SYS_CLOCK_HW_CYCLES_PER_SEC
+	default 48000000
+
+config NUM_IRQS
+	default 34
+
+endif # SOC_SERIES_CC2650