[LTD mergeup] Merge pull request zephyrproject-rtos#9 from mbolivar/l…

…td-17.06 Upstream merge 21 June 2017
rsalveti · Jun 29, 2017 · 79f53d0 · 79f53d0
2 parents c38c4c8 + c2a529b
commit 79f53d0
Show file tree

Hide file tree

Showing 694 changed files with 6,422 additions and 5,383 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