release: Update VERSION for v1.10 release

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>

.checkpatch.conf

@@ -5,6 +5,7 @@
 --show-types
 --max-line-length=80
 --min-conf-desc-length=1
+--typedefsfile=scripts/checkpatch/typedefsfile
 
 --ignore BRACES
 --ignore PRINTK_WITHOUT_KERN_LEVEL

.gitignore

@@ -7,6 +7,7 @@
 *.swp
 *.swo
 *~
+build
 cscope.*
 .dir
 outdir
@@ -30,6 +31,7 @@ sanity-out/
 scripts/grub
 doc/reference/kconfig/CONFIG_*
 doc/reference/kconfig/index.rst
+doc/doc.warnings
 tags
 .project
 .cproject

.gitlint

@@ -25,7 +25,7 @@ regex = ^(([^:]+):)(\s([^:]+):)*\s(.+)$
 # Comma-separated list of words that should not occur in the title. Matching is case
 # insensitive. It's fine if the keyword occurs as part of a larger word (so "WIPING"
 # will not cause a violation, but "WIP: my title" will.
-words=wip,title
+words=wip
 
 [title-match-regex]
 # python like regex (https://docs.python.org/2/library/re.html) that the

.known-issues/doc/bluetooth.conf

@@ -37,6 +37,14 @@
 ^.*bt_gatt_read_params.__unnamed__.*
 ^[- \t]*\^
 #
-# Bluetooth packed
+# Bluetooth mesh unnamed struct definition
 #
-^(?P<filename>[-._/\w]+/doc/api/bluetooth.rst):(?P<lineno>[0-9]+): WARNING: cpp:typeOrConcept targets a member \(__packed\).$
+^(?P<filename>[-._/\w]+/doc/api/bluetooth.rst):(?P<lineno>[0-9]+): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^[ \t]*
+^[ \t]*\^
+^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^[ \t]*
+^[ \t]*\^
+^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected end of definition. \[error at [0-9]+]
+^.*bt_mesh_model.__unnamed__.*
+^[- \t]*\^

.known-issues/doc/display.conf

@@ -0,0 +1,15 @@
+#
+# Display
+#
+#
+# include
+#
+^(?P<filename>[-._/\w]+/doc/api/display_api.rst):(?P<lineno>[0-9]+): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^[ \t]*
+^[ \t]*\^
+^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^[ \t]*
+^[ \t]*\^
+^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected end of definition. \[error at [0-9]+]
+^.*mb_image.__unnamed__
+^[- \t]*\^

.known-issues/doc/header_footer.conf

@@ -1,18 +0,0 @@
-#
-# KERNELVERSION not being defined in local builds, kill that warning,
-# can ignore it
-#
-^.*/Kconfig.zephyr:[0-9]+: warning: The symbol KERNELVERSION references the non-existent environment variable KERNELVERSION.*
-#
-# Documentation generation, early message
-#
-^cd .* && doxygen doc/doxygen.config
-^srctree=.* SRCARCH=\w+ python scripts/genrest/genrest.py .*$
-# This cuts the sphinx build line; has to be separate because in the
-# middle, we have removed the KERNELVERSION one and a full regex won't match
-^sphinx-build -t \w+ -b html .*
-#
-# Documentation generation, footer message
-#
-^[ \t]*
-^Build finished. The HTML pages are in [-._/\w]+

.known-issues/doc/kernel.conf

@@ -1,14 +1,24 @@
 #
-# Kernel unnamed struct definition
+# Kernel
 #
-# FIXME: all these should match the relative filename
 #
-^(?P<filename>[-._/\w]+/doc/api/kernel_api.rst):(?P<lineno>[0-9]+): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]$
-^[ \t]*$
-^[ \t]*\^$
-^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]$
-^[ \t]*$
-^[ \t]*\^$
-^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected end of definition. \[error at [0-9]+]$
-^.*k_msg.extra.*$
-^[- \t]*\^$
+# include/kernel.h warnings
+#
+^(?P<filename>[-._/\w]+/doc/api/kernel_api.rst):(?P<lineno>[0-9]+): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^[ \t]*
+^[ \t]*\^
+^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^[ \t]*
+^[ \t]*\^
+^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^[ \t]*
+^[ \t]*\^
+^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^[ \t]*
+^[ \t]*\^
+^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^[ \t]*
+^[ \t]*\^
+^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected end of definition. \[error at [0-9]+]
+^.*k_poll_event.__unnamed__
+^[- \t]*\^

.known-issues/doc/misc.conf

@@ -0,0 +1,15 @@
+#
+# Display
+#
+#
+# include
+#
+^(?P<filename>[-._/\w]+/doc/api/misc_api.rst):(?P<lineno>[0-9]+): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^[ \t]*
+^[ \t]*\^
+^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
+^[ \t]*
+^[ \t]*\^
+^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected end of definition. \[error at [0-9]+]
+^.*json_obj_descr.__unnamed__
+^[- \t]*\^

.known-issues/doc/networking.conf

@@ -17,25 +17,6 @@
 ^.*in[_6]+addr.in[46]_u
 ^[- \t]*\^
 #
-# include/net/net_if.h warnings
-#
-^(?P<filename>[-._/\w]+/doc/api/networking.rst):(?P<lineno>[0-9]+): WARNING: Error when parsing function declaration.
-^\If the function has no return type:
-^[ \t]*Error in declarator or parameters and qualifiers
-^[ \t]*Invalid definition: Expected identifier in nested name, got keyword: struct \[error at [0-9]+]
-^.*struct net_if __aligned\(32\)
-^[- \t]*\^
-^\If the function has a return type:
-^[ \t]*Error in declarator or parameters and qualifiers
-^[ \t]*If pointer to member declarator:
-^[ \t]*Invalid definition: Expected \'::\' in pointer to member \(function\). \[error at [0-9]+]
-^.*struct net_if __aligned\(32\)
-^[- \t]*\^
-^[ \t]*If declarator-id:
-^[ \t]*Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
-^.*struct net_if __aligned\(32\)
-^[- \t]*\^
-#
 # include/net/net_mgmt.h
 #
 ^(?P<filename>[-._/\w]+/doc/api/networking.rst):(?P<lineno>[0-9]+): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
@@ -71,43 +52,3 @@
 ^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected end of definition. \[error at [0-9]+]
 ^.*ieee802154_req_params.__unnamed__
 ^[- \t]*\^
-#
-# Various warning about net_mgmt declarations
-#
-^(?P<filename>[-._/\w]+/doc/api/networking.rst):(?P<lineno>[0-9]+): WARNING: Error when parsing function declaration\.
-^If the function has no return type\:
-^[ \t]*Error in declarator or parameters and qualifiers
-^[ \t]*Invalid definition: Expected identifier in nested name\. \[error at [0-9]+\]
-^[ \t]*NET_MGMT_DEFINE_.*?$
-^[- \t]*\^
-#
-^If the function has a return type\:
-^[ \t]*Error in declarator
-^[ \t]*If pointer to member declarator:
-^[ \t]*Invalid definition: Expected identifier in nested name\. \[error at [0-9]+\]
-^[ \t]*NET_MGMT_DEFINE_.*?$
-^[- \t]*\^
-#
-^[ \t]*If declId, parameters, and qualifiers\:
-^[ \t]*Invalid definition: Expected identifier in nested name\. \[error at [0-9]+\]
-^[ \t]*NET_MGMT_DEFINE_.*?$
-^[- \t]*\^
-#
-^[ \t]*If parenthesis in noptr-declarator\:
-^[ \t]*Error in declarator
-^[ \t]*If pointer to member declarator:
-^[ \t]*Invalid definition: Expected identifier in nested name\. \[error at [0-9]+\]
-^[ \t]*NET_MGMT_DEFINE_.*?$
-^[- \t]*\^
-#
-^[ \t]*If parenthesis in noptr-declarator\:
-^[ \t]*Error in declarator or parameters and qualifiers
-^[ \t]*If pointer to member declarator:
-^[ \t]*Invalid definition: Expected \'\:\:\' in pointer to member \(function\)\. \[error at [0-9]+\]
-^[ \t]*NET_MGMT_DEFINE_.*?$
-^[- \t]*\^
-#
-^[ \t]*If declarator-id:
-^[ \t]*Invalid definition: Expecting \"\(\" in parameters_and_qualifiers\. \[error at [0-9]+\]
-^[ \t]*NET_MGMT_DEFINE_.*?$
-^[- \t]*\^

.known-issues/doc/sensor.conf

@@ -1,12 +0,0 @@
-#
-# Sensor value unnamed struct definition
-#
-^(?P<filename>[-._/\w]+/doc/api/io_interfaces.rst):(?P<lineno>[0-9]+): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
-^[ \t]*
-^[ \t]*\^
-^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected identifier in nested name. \[error at [0-9]+]
-^[ \t]*
-^[ \t]*\^
-^(?P=filename):(?P=lineno): WARNING: Invalid definition: Expected end of definition. \[error at [0-9]+]
-^.*sensor_value.__unnamed__.*
-^[- \t]*\^

.shippable.yml

@@ -4,18 +4,18 @@ compiler: gcc
 
 env:
     global:
-        - SDK=0.9.1
+        - SDK=0.9.2
         - SANITYCHECK_OPTIONS=" --inline-logs -R"
         - SANITYCHECK_OPTIONS_RETRY="${SANITYCHECK_OPTIONS} --only-failed --outdir=out-2nd-pass"
-        - ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.9.1
+        - ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.9.2
         - ZEPHYR_GCC_VARIANT=zephyr
-        - USE_CCACHE=1
-        - MATRIX_BUILDS="2"
-        - MATRIX_BUILDS_EXTRA="3"
+        - MATRIX_BUILDS="4"
+        - MATRIX_BUILDS_EXTRA="4"
     matrix:
         - MATRIX_BUILD="1"
         - MATRIX_BUILD="2"
         - MATRIX_BUILD="3"
+        - MATRIX_BUILD="4"
 
 build:
     cache: true
@@ -23,54 +23,48 @@ build:
         - ${SHIPPABLE_BUILD_DIR}/ccache
     pre_ci_boot:
         image_name: zephyrprojectrtos/ci
-        image_tag: master.27
+        image_tag: v0.2
         pull: true
         options: "-e HOME=/home/buildslave --privileged=true --tty --net=bridge --user buildslave"
 
     ci:
       - export CCACHE_DIR=${SHIPPABLE_BUILD_DIR}/ccache/.ccache
-      - git rebase origin/${PULL_REQUEST_BASE_BRANCH}
+      - >
+        if [ "$IS_PULL_REQUEST" = "true" ]; then
+          git rebase origin/${PULL_REQUEST_BASE_BRANCH};
+        fi
       - source zephyr-env.sh
       - ccache -c -s --max-size=2000M
-      - make host-tools
-      - export PREBUILT_HOST_TOOLS=${ZEPHYR_BASE}/bin
       - >
-          if [ "$MATRIX_BUILD" = "3" -a "$IS_PULL_REQUEST" = "true" ]; then
+          if [ "$MATRIX_BUILD" = "4" -a "$IS_PULL_REQUEST" = "true" ]; then
             export COMMIT_RANGE=origin/${PULL_REQUEST_BASE_BRANCH}..HEAD
             echo "Building a Pull Request";
             echo "- Building Documentation";
             echo "Commit range:" ${COMMIT_RANGE}
-            make htmldocs > doc.log 2>&1;
-            ./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
+            make htmldocs
+            if [ -s doc/doc.warnings ]; then
               echo " => New documentation warnings/errors";
+              cp doc/doc.warnings doc.warnings
             fi;
-            echo "- Verify commit message and coding style";
+            echo "- Verify commit message, coding style, doc build";
             ./scripts/ci/check-compliance.py --commits ${COMMIT_RANGE} || true;
           fi;
       - >
-          sudo pip3 install sh;
-          ./scripts/ci/get_modified_tests.py --commits origin/${PULL_REQUEST_BASE_BRANCH}..HEAD > modified_tests.args;
-          ./scripts/ci/get_modified_boards.py --commits origin/${PULL_REQUEST_BASE_BRANCH}..HEAD > modified_boards.args;
+          if [ "$IS_PULL_REQUEST" = "true" ]; then
+            ./scripts/ci/get_modified_tests.py --commits origin/${PULL_REQUEST_BASE_BRANCH}..HEAD > modified_tests.args;
+            ./scripts/ci/get_modified_boards.py --commits origin/${PULL_REQUEST_BASE_BRANCH}..HEAD > modified_boards.args;
 
-          if [ -s modified_boards.args ]; then
-            ./scripts/sanitycheck --subset ${MATRIX_BUILD}/${MATRIX_BUILDS_EXTRA} +modified_boards.args || ./scripts/sanitycheck +modified_boards.args --only-failed;
-            cp ./scripts/sanity_chk/last_sanity.xml modified_boards.xml;
-          fi;
-          if [ -s modified_tests.args ]; then
-            ./scripts/sanitycheck --subset ${MATRIX_BUILD}/${MATRIX_BUILDS_EXTRA} +modified_tests.args || ./scripts/sanitycheck +modified_tests.args --only-failed
-            cp ./scripts/sanity_chk/last_sanity.xml modified_tests.xml;
-          fi;
-          rm -f modified_tests.args modified_boards.args;
-      - >
-          if [ "$MATRIX_BUILD" != "3" ]; then
-             ./scripts/sanitycheck ${PLATFORMS} --subset ${MATRIX_BUILD}/${MATRIX_BUILDS} ${COVERAGE} ${SANITYCHECK_OPTIONS} || ./scripts/sanitycheck ${PLATFORMS} ${COVERAGE} ${SANITYCHECK_OPTIONS_RETRY} || ./scripts/sanitycheck ${PLATFORMS} ${COVERAGE} ${SANITYCHECK_OPTIONS_RETRY}
+            if [ -s modified_boards.args ]; then
+              ./scripts/sanitycheck +modified_boards.args --save-tests test_file.txt;
+            fi;
+            if [ -s modified_tests.args ]; then
+              ./scripts/sanitycheck +modified_tests.args --save-tests test_file.txt;
+            fi;
+            rm -f modified_tests.args modified_boards.args;
           fi;
+      - ./scripts/sanitycheck ${SANITYCHECK_OPTIONS} --save-tests test_file.txt
+      - ./scripts/sanitycheck  --load-tests test_file.txt --subset ${MATRIX_BUILD}/${MATRIX_BUILDS} || ./scripts/sanitycheck ${SANITYCHECK_OPTIONS_RETRY} || ./scripts/sanitycheck ${SANITYCHECK_OPTIONS_RETRY}
+      - rm test_file.txt
       - ccache -s
     on_failure:
       - rm -rf sanity-out out-2nd-pass
@@ -83,10 +77,6 @@ build:
           if [ -e ./scripts/sanity_chk/last_sanity.xml ]; then
             cp ./scripts/sanity_chk/last_sanity.xml shippable/testresults/;
           fi;
-      - >
-          if [ -e ./modified_tests.xml ]; then
-            cp ./modified_tests.xml shippable/testresults/;
-          fi;
     on_success:
       - rm -rf sanity-out out-2nd-pass
       - mkdir -p shippable/testresults
@@ -98,10 +88,6 @@ build:
           if [ -e ./scripts/sanity_chk/last_sanity.xml ]; then
             cp ./scripts/sanity_chk/last_sanity.xml shippable/testresults/;
           fi;
-      - >
-          if [ -e ./modified_tests.xml ]; then
-            cp ./modified_tests.xml shippable/testresults/;
-          fi;
 
 integrations:
   notifications:

CMakeLists.txt

@@ -0,0 +1,783 @@
+project(Zephyr-Kernel VERSION ${PROJECT_VERSION})
+enable_language(C CXX ASM)
+
+# *DOCUMENTATION*
+#
+# Note that this is *NOT* the top-level CMakeLists.txt. That's in the
+# application. See the Application Development Primer documentation
+# for details.
+#
+# To see a list of typical targets execute "make usage"
+# More info can be located in ./README.rst
+# Comments in this file are targeted only to the developer, do not
+# expect to learn how to build the kernel reading this file.
+
+# Verify that the toolchain can compile a dummy file, if it is not we
+# won't be able to test for compatiblity with certain C flags.
+check_c_compiler_flag("" toolchain_is_ok)
+assert(toolchain_is_ok "The toolchain is unable to build a dummy C file. See CMakeError.log.")
+
+# Do not generate make install target.
+set(CMAKE_SKIP_INSTALL_RULES ON)
+
+set(CMAKE_EXECUTABLE_SUFFIX .elf)
+
+set(SOC_NAME ${CONFIG_SOC})
+set(SOC_SERIES ${CONFIG_SOC_SERIES})
+set(SOC_FAMILY ${CONFIG_SOC_FAMILY})
+
+if("${SOC_SERIES}" STREQUAL "")
+  set(SOC_PATH ${SOC_NAME})
+else()
+  set(SOC_PATH ${SOC_FAMILY}/${SOC_SERIES})
+endif()
+
+if(NOT PROPERTY_LINKER_SCRIPT_DEFINES)
+  set_property(GLOBAL PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES -D__GCC_LINKER_CMD__)
+endif()
+
+define_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT BRIEF_DOCS " " FULL_DOCS " ")
+set_property(   GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT elf32-little${ARCH})
+
+# zephyr_interface is a source-less library that has all the global
+# compiler options needed by all source files. All zephyr libraries,
+# including the library named "zephyr" link with this library to
+# obtain these flags.
+add_library(zephyr_interface INTERFACE)
+
+# zephyr is a catchall CMake library for source files that can be
+# built purely with the include paths, defines, and other compiler
+# flags that come with zephyr_interface.
+zephyr_library_named(zephyr)
+
+zephyr_include_directories(
+  kernel/include
+  arch/${ARCH}/include
+  arch/${ARCH}/soc/${SOC_PATH}
+  arch/${ARCH}/soc/${SOC_PATH}/include
+  arch/${ARCH}/soc/${SOC_FAMILY}/include
+  ${BOARD_DIR}
+  include
+  include/drivers
+  ${PROJECT_BINARY_DIR}/include/generated
+  ${USERINCLUDE}
+  ${STDINCLUDE}
+)
+
+
+zephyr_compile_definitions(
+  KERNEL
+  __ZEPHYR__=1
+  _FORTIFY_SOURCE=2
+)
+
+# We need to set an optimization level.
+# Default to -Os
+# unless CONFIG_DEBUG is set, then it is -Og
+#
+# also, some toolchain's break with -Os, and some toolchain's break
+# with -Og so allow them to override what flag to use
+#
+# Finally, the user can use Kconfig to add compiler options that will
+# come after these options and override them
+set_ifndef(OPTIMIZE_FOR_SIZE_FLAG  "-Os")
+set_ifndef(OPTIMIZE_FOR_DEBUG_FLAG "-Og")
+if(CONFIG_DEBUG)
+  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_DEBUG_FLAG})
+else()
+  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SIZE_FLAG}) # Default
+endif()
+
+zephyr_compile_options(
+  ${OPTIMIZATION_FLAG} # Usually -Os
+  -g # TODO: build configuration enough?
+  -Wall
+  -Wformat
+  -Wformat-security
+  -Wno-format-zero-length
+  -Wno-main
+  -ffreestanding
+  -include ${AUTOCONF_H}
+)
+
+zephyr_compile_options(
+  $<$<COMPILE_LANGUAGE:C>:-std=c99>
+
+  $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>
+  $<$<COMPILE_LANGUAGE:CXX>:-fcheck-new>
+  $<$<COMPILE_LANGUAGE:CXX>:-ffunction-sections>
+  $<$<COMPILE_LANGUAGE:CXX>:-fdata-sections>
+  $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
+  $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
+
+  $<$<COMPILE_LANGUAGE:ASM>:-xassembler-with-cpp>
+  $<$<COMPILE_LANGUAGE:ASM>:-D_ASMLANGUAGE>
+)
+
+zephyr_ld_options(
+  -nostartfiles
+  -nodefaultlibs
+  -nostdlib
+  -static
+  -no-pie
+  )
+
+# ==========================================================================
+#
+# cmake -DW=... settings
+#
+# W=1 - warnings that may be relevant and does not occur too often
+# W=2 - warnings that occur quite often but may still be relevant
+# W=3 - the more obscure warnings, can most likely be ignored
+# ==========================================================================
+if(W MATCHES "1")
+  zephyr_compile_options(
+    -Wextra
+    -Wunused
+    -Wno-unused-parameter
+    -Wmissing-declarations
+    -Wmissing-format-attribute
+    -Wold-style-definition
+    )
+  zephyr_cc_option(
+    -Wmissing-prototypes
+    -Wmissing-include-dirs
+    -Wunused-but-set-variable
+    -Wno-missing-field-initializers
+    )
+endif()
+
+if(W MATCHES "2")
+  zephyr_compile_options(
+    -Waggregate-return
+    -Wcast-align
+    -Wdisabled-optimization
+    -Wnested-externs
+    -Wshadow
+    )
+  zephyr_cc_option(
+    -Wlogical-op
+    -Wmissing-field-initializers
+    )
+endif()
+
+if(W MATCHES "3")
+  zephyr_compile_options(
+    -Wbad-function-cast
+    -Wcast-qual
+    -Wconversion
+    -Wpacked
+    -Wpadded
+    -Wpointer-arith
+    -Wredundant-decls
+    -Wswitch-default
+    )
+  zephyr_cc_option(
+    -Wpacked-bitfield-compat
+    -Wvla
+    )
+endif()
+
+# Allow the user to inject options when calling cmake, e.g.
+# 'cmake -DEXTRA_CFLAGS="-Werror -Wno-deprecated-declarations" ..'
+include(cmake/extra_flags.cmake)
+
+if(CONFIG_READABLE_ASM)
+  zephyr_cc_option(-fno-reorder-blocks)
+  zephyr_cc_option(-fno-ipa-cp-clone)
+  zephyr_cc_option(-fno-partial-inlining)
+endif()
+
+zephyr_cc_option(-fno-asynchronous-unwind-tables)
+zephyr_cc_option(-fno-pie)
+zephyr_cc_option(-fno-pic)
+zephyr_cc_option(-fno-strict-overflow)
+zephyr_cc_option(-Wno-pointer-sign)
+
+zephyr_compile_options_ifdef(CONFIG_STACK_CANARIES -fstack-protector-all)
+
+if(CONFIG_OVERRIDE_FRAME_POINTER_DEFAULT)
+  if(CONFIG_OMIT_FRAME_POINTER)
+    zephyr_cc_option(-fomit-frame-pointer)
+  else()
+    zephyr_cc_option(-fno-omit-frame-pointer)
+  endif()
+endif()
+
+zephyr_compile_options(${CONFIG_COMPILER_OPT})
+
+# TODO: Include arch compiler options at this point.
+
+# TODO: This Clang check is broken
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+  zephyr_cc_option(
+    -Wno-unknown-warning-option
+    -Wno-unused-variable
+    -Wno-format-invalid-specifier
+    -Wno-gnu
+    # comparison of unsigned expression < 0 is always false
+    -Wno-tautological-compare
+    )
+else() # GCC assumed
+  zephyr_cc_option(
+    -Wno-unused-but-set-variable
+    -fno-reorder-functions
+    )
+  if(NOT ${ZEPHYR_GCC_VARIANT} STREQUAL "xcc")
+    zephyr_cc_option(-fno-defer-pop)
+  endif()
+endif()
+
+zephyr_cc_option_ifdef(CONFIG_DEBUG_SECTION_MISMATCH -fno-inline-functions-called-once)
+zephyr_cc_option_ifdef(CONFIG_STACK_USAGE            -fstack-usage)
+
+zephyr_compile_options(-nostdinc)
+zephyr_system_include_directories(${NOSTDINC})
+
+# Force an error when things like SYS_INIT(foo, ...) occur with a missing header.
+zephyr_cc_option(-Werror=implicit-int)
+
+# Prohibit date/time macros, which would make the build non-deterministic
+# cc-option(-Werror=date-time)
+
+# TODO: Archiver arguments
+# ar_option(D)
+
+if(IS_TEST)
+  add_subdirectory(cmake/test)
+endif()
+
+set_ifndef(LINKERFLAGPREFIX -Wl)
+zephyr_ld_options(
+  ${LINKERFLAGPREFIX},-X
+  ${LINKERFLAGPREFIX},-N
+  ${LINKERFLAGPREFIX},--gc-sections
+  ${LINKERFLAGPREFIX},--build-id=none
+  )
+
+if(CONFIG_HAVE_CUSTOM_LINKER_SCRIPT)
+  set(LINKER_SCRIPT ${APPLICATION_SOURCE_DIR}/${CONFIG_CUSTOM_LINKER_SCRIPT})
+  if(NOT EXISTS LINKER_SCRIPT)
+    set(LINKER_SCRIPT ${CONFIG_CUSTOM_LINKER_SCRIPT})
+    if(NOT EXISTS LINKER_SCRIPT)
+      message(FATAL_ERROR "CONFIG_HAVE_CUSTOM_LINKER_SCRIPT was set, but no linker script was found at '${CONFIG_CUSTOM_LINKER_SCRIPT}'")
+    endif()
+  endif()
+else()
+  # Try a board specific linker file
+  set(LINKER_SCRIPT ${BOARD_DIR}/linker.ld)
+  if(NOT EXISTS ${LINKER_SCRIPT})
+    # If not available, try an SoC specific linker file
+    set(LINKER_SCRIPT $ENV{ZEPHYR_BASE}/arch/${ARCH}/soc/${SOC_PATH}/linker.ld)
+  endif()
+endif()
+
+if(NOT EXISTS ${LINKER_SCRIPT})
+  message(FATAL_ERROR "Could not find linker script: '${LINKER_SCRIPT}'. Corrupted configuration?")
+endif()
+
+configure_file(version.h.in ${PROJECT_BINARY_DIR}/include/generated/version.h)
+
+add_subdirectory(lib)
+add_subdirectory(misc)
+# We use include instead of add_subdirectory to avoid creating a new directory scope.
+# This is because source file properties are directory scoped, including the GENERATED
+# property which is set implicitly for custom command outputs
+include(misc/generated/CMakeLists.txt)
+add_subdirectory(boards)
+add_subdirectory(ext)
+add_subdirectory(subsys)
+add_subdirectory(arch)
+add_subdirectory(drivers)
+add_subdirectory(tests)
+
+set(syscall_macros_h ${ZEPHYR_BINARY_DIR}/include/generated/syscall_macros.h)
+
+add_custom_target(syscall_macros_h_target DEPENDS ${syscall_macros_h})
+add_custom_command(                       OUTPUT  ${syscall_macros_h}
+  COMMAND
+  ${PYTHON_EXECUTABLE}
+  ${PROJECT_SOURCE_DIR}/scripts/gen_syscall_header.py
+  > ${syscall_macros_h}
+  DEPENDS ${PROJECT_SOURCE_DIR}/scripts/gen_syscall_header.py
+  )
+
+# This command is a hack to support commands that are always run. Any
+# target that depends on always_rebuild will always be rebuilt.
+add_custom_command(OUTPUT always_rebuild COMMAND cmake -E echo Building for board ${BOARD})
+
+set(syscall_list_h ${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscall_list.h)
+set(syscalls_json  ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/syscalls.json)
+
+add_custom_command(
+  OUTPUT
+  ${syscalls_json}
+  COMMAND
+  ${PYTHON_EXECUTABLE}
+  ${PROJECT_SOURCE_DIR}/scripts/parse_syscalls.py
+  --include          ${PROJECT_SOURCE_DIR}/include        # Read files from this dir
+  --json-file        ${syscalls_json}                     # Write this file
+  DEPENDS always_rebuild
+  )
+
+add_custom_target(syscall_list_h_target DEPENDS                ${syscall_list_h})
+add_custom_command(OUTPUT include/generated/syscall_dispatch.c ${syscall_list_h}
+  # Also, some files are written to include/generated/syscalls/
+  COMMAND
+  ${PYTHON_EXECUTABLE}
+  ${PROJECT_SOURCE_DIR}/scripts/gen_syscalls.py
+  --json-file        ${syscalls_json}                     # Read this file
+  --base-output      include/generated/syscalls           # Write to this dir
+  --syscall-dispatch include/generated/syscall_dispatch.c # Write this file
+  > ${syscall_list_h}                                     # Write stdout to this file
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  DEPENDS ${syscalls_json}
+  )
+
+# Generate offsets.c.obj from offsets.c
+# Generate offsets.h     from offsets.c.obj
+
+set(OFFSETS_C_PATH $ENV{ZEPHYR_BASE}/arch/${ARCH}/core/offsets/offsets.c)
+set(OFFSETS_O_PATH ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/offsets.dir/arch/${ARCH}/core/offsets/offsets.c.obj)
+set(OFFSETS_H_PATH ${PROJECT_BINARY_DIR}/include/generated/offsets.h)
+
+add_library(          offsets STATIC ${OFFSETS_C_PATH})
+target_link_libraries(offsets zephyr_interface)
+add_dependencies(     offsets
+  syscall_list_h_target
+  syscall_macros_h_target
+  )
+
+add_custom_command(
+  OUTPUT ${OFFSETS_H_PATH}
+  COMMAND ${PYTHON_EXECUTABLE} $ENV{ZEPHYR_BASE}/scripts/gen_offset_header.py
+  -i ${OFFSETS_O_PATH}
+  -o ${OFFSETS_H_PATH}
+  DEPENDS offsets
+)
+add_custom_target(offsets_h DEPENDS ${OFFSETS_H_PATH})
+
+zephyr_include_directories(${TOOLCHAIN_INCLUDES})
+
+zephyr_get_include_directories_for_lang(C ZEPHYR_INCLUDES)
+
+add_subdirectory(kernel)
+
+# Read list content
+get_property(ZEPHYR_LIBS_PROPERTY GLOBAL PROPERTY ZEPHYR_LIBS)
+
+foreach(zephyr_lib ${ZEPHYR_LIBS_PROPERTY})
+  # TODO: Could this become an INTERFACE property of zephyr_interface?
+  add_dependencies(${zephyr_lib} offsets_h)
+endforeach()
+
+get_property(OUTPUT_FORMAT        GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT)
+
+# Run the pre-processor on the linker script
+#
+# Deal with the un-preprocessed linker scripts differently with
+# different generators.
+if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+  # Note that the IMPLICIT_DEPENDS option is currently supported only
+  # for Makefile generators and will be ignored by other generators.
+  set(LINKER_SCRIPT_DEP IMPLICIT_DEPENDS C ${LINKER_SCRIPT})
+elseif(CMAKE_GENERATOR STREQUAL "Ninja")
+  # Using DEPFILE with other generators than Ninja is an error.
+  set(LINKER_SCRIPT_DEP DEPFILE ${PROJECT_BINARY_DIR}/linker.cmd.dep)
+else()
+  # TODO: How would the linker script dependencies work for non-linker
+  # script generators.
+  message(STATUS "Warning; this generator is not well supported. The
+  Linker script may not be regenerated when it should.")
+  set(LINKER_SCRIPT_DEP "")
+endif()
+
+get_property(LINKER_SCRIPT_DEFINES GLOBAL PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES)
+
+if(CONFIG_APPLICATION_MEMORY)
+  # Objects default to being in kernel space, and then we exclude
+  # certain items.
+  set(kernel_object_file_list
+    ${ZEPHYR_LIBS_PROPERTY}
+    kernel
+    )
+  list(
+    REMOVE_ITEM
+    kernel_object_file_list
+    app
+    )
+
+  # The zephyr libraries in zephyr/lib/ and zephyr/test/ belong in
+  # userspace.
+
+  # NB: The business logic for determing what source files are in
+  # kernel space and what source files are in user space is
+  # fragile. Fix ASAP.
+  #
+  # The intended design is that certain directories are designated as
+  # containing userspace code and others for kernel space code. The
+  # implementation we have however is not working on directories of
+  # code, it is working on zephyr libraries. It is exploiting the fact
+  # that zephyr libraries follow a naming scheme as described in
+  # extensions.cmake:zephyr_library_get_current_dir_lib_name
+  #
+  # But code from test/ and lib/ that is placed in the "zephyr"
+  # library (with zephyr_sources()) will not be in a library that is
+  # prefixed with lib__ or test__ and will end up in the wrong address
+  # space.
+  set(application_space_dirs
+    lib
+    tests
+    )
+  foreach(f ${kernel_object_file_list})
+    foreach(app_dir ${application_space_dirs})
+      if(${f} MATCHES "^${app_dir}__") # Begins with ${app_dir}__, e.g. lib__libc
+        list(
+          REMOVE_ITEM
+          kernel_object_file_list
+          ${f}
+          )
+      endif()
+    endforeach()
+  endforeach()
+
+  # Create a list ks, with relative paths to kernel space libs.
+  foreach(f ${kernel_object_file_list})
+    get_target_property(target_name       ${f} NAME)
+    get_target_property(target_binary_dir ${f} BINARY_DIR)
+
+    string(REPLACE
+      ${PROJECT_BINARY_DIR}
+      ""
+      fixed_path
+      ${target_binary_dir}
+      )
+
+    # Append / if not empty
+    if(fixed_path)
+      set(fixed_path "${fixed_path}/")
+    endif()
+
+    # Cut off leading / if present
+    if(fixed_path MATCHES "^/.+")
+      string(SUBSTRING ${fixed_path} 1 -1 fixed_path)
+    endif()
+
+    list(APPEND ks "${fixed_path}lib${target_name}.a")
+  endforeach()
+
+  # We are done constructing kernel_object_file_list, now we inject this
+  # information into the linker script through -D's
+  list(LENGTH kernel_object_file_list NUM_KERNEL_OBJECT_FILES)
+  list(APPEND LINKER_SCRIPT_DEFINES -DNUM_KERNEL_OBJECT_FILES=${NUM_KERNEL_OBJECT_FILES})
+  set(i 0)
+  foreach(f ${ks})
+    list(APPEND LINKER_SCRIPT_DEFINES -DKERNEL_OBJECT_FILE_${i}=${f})
+    math(EXPR i "${i}+1")
+  endforeach()
+endif() # CONFIG_APPLICATION_MEMORY
+
+get_filename_component(BASE_NAME ${CMAKE_CURRENT_BINARY_DIR} NAME)
+add_custom_command(
+  OUTPUT linker.cmd
+  DEPENDS ${LINKER_SCRIPT}
+  ${LINKER_SCRIPT_DEP}
+  # NB: This COMMAND is copy-pasted to generate linker_pass2.cmd
+  # TODO: Remove duplication
+  COMMAND ${CMAKE_C_COMPILER}
+  -x assembler-with-cpp
+  -nostdinc
+  -undef
+  -MD -MF linker.cmd.dep -MT ${BASE_NAME}/linker.cmd
+  ${ZEPHYR_INCLUDES}
+  ${LINKER_SCRIPT_DEFINES}
+  -E ${LINKER_SCRIPT} -P
+  -o linker.cmd
+  VERBATIM
+  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)
+add_custom_target(
+  linker_script
+  DEPENDS
+  linker.cmd
+  offsets_h
+)
+
+set(zephyr_lnk
+  ${LINKERFLAGPREFIX},-Map=${PROJECT_BINARY_DIR}/${KERNEL_MAP_NAME}
+  -u_OffsetAbsSyms
+  -u_ConfigAbsSyms
+  -e${CONFIG_KERNEL_ENTRY}
+  ${LINKERFLAGPREFIX},--start-group
+  ${LINKERFLAGPREFIX},--whole-archive
+  ${ZEPHYR_LIBS_PROPERTY}
+  ${LINKERFLAGPREFIX},--no-whole-archive
+  kernel
+  ${OFFSETS_O_PATH}
+  ${LINKERFLAGPREFIX},--end-group
+  ${LIB_INCLUDE_DIR}
+  -L${PROJECT_BINARY_DIR}
+  ${TOOLCHAIN_LIBS}
+  )
+
+if(CONFIG_GEN_ISR_TABLES)
+  # isr_tables.c is generated from zephyr_prebuilt by
+  # gen_isr_tables.py
+  add_custom_command(
+    OUTPUT isr_tables.c
+    COMMAND ${CMAKE_OBJCOPY}
+    -I ${OUTPUT_FORMAT}
+    -O binary
+    --only-section=.intList
+    $<TARGET_FILE:zephyr_prebuilt>
+    isrList.bin
+    COMMAND ${PYTHON_EXECUTABLE}
+    $ENV{ZEPHYR_BASE}/arch/common/gen_isr_tables.py
+    --output-source isr_tables.c
+    --intlist isrList.bin
+    --debug
+    --sw-isr-table
+    --vector-table
+    DEPENDS zephyr_prebuilt
+    )
+  set_property(GLOBAL APPEND PROPERTY GENERATED_KERNEL_SOURCE_FILES isr_tables.c)
+endif()
+
+if(CONFIG_USERSPACE)
+  set(GEN_KOBJ_LIST $ENV{ZEPHYR_BASE}/scripts/gen_kobject_list.py)
+  set(PROCESS_GPERF $ENV{ZEPHYR_BASE}/scripts/process_gperf.py)
+
+  set(OBJ_LIST           kobject_hash.gperf)
+  set(OUTPUT_SRC_PRE     kobject_hash_preprocessed.c)
+  set(OUTPUT_SRC         kobject_hash.c)
+  set(OUTPUT_OBJ         kobject_hash.c.obj)
+  set(OUTPUT_OBJ_RENAMED kobject_hash_renamed.o)
+
+  # Essentially what we are doing here is extracting some information
+  # out of the nearly finished elf file, generating the source code
+  # for a hash table based on that information, and then compiling and
+  # linking the hash table back into a now even more nearly finished
+  # elf file.
+
+  # Use the script GEN_KOBJ_LIST to scan the kernel binary's
+  # (zephyr_prebuilt) DWARF information to produce a table of kernel
+  # objects (OBJ_LIST) which we will then pass to gperf
+  add_custom_command(
+    OUTPUT ${OBJ_LIST}
+    COMMAND
+    ${PYTHON_EXECUTABLE}
+    ${GEN_KOBJ_LIST}
+    --kernel $<TARGET_FILE:zephyr_prebuilt>
+    --output ${OBJ_LIST}
+    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
+    DEPENDS zephyr_prebuilt
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+  add_custom_target(obj_list DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${OBJ_LIST})
+
+  # Use gperf to generate C code (OUTPUT_SRC_PRE) which implements a
+  # perfect hashtable based on OBJ_LIST
+  add_custom_command(
+    OUTPUT ${OUTPUT_SRC_PRE}
+    COMMAND
+    ${GPERF}
+    --output-file ${OUTPUT_SRC_PRE}
+    ${OBJ_LIST}
+    DEPENDS obj_list
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+  add_custom_target(output_src_pre DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_SRC_PRE})
+
+  # For our purposes the code/data generated by gperf is not optimal.
+  #
+  # The script PROCESS_GPERF creates a new c file OUTPUT_SRC based on
+  # OUTPUT_SRC_PRE to greatly reduce the amount of code/data generated
+  # since we know we are always working with pointer values
+  add_custom_command(
+    OUTPUT ${OUTPUT_SRC}
+    COMMAND
+    ${PROCESS_GPERF}
+    -i ${OUTPUT_SRC_PRE}
+    -o ${OUTPUT_SRC}
+    $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
+    DEPENDS output_src_pre
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+  add_custom_target(output_src DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_SRC})
+
+  # We need precise control of where generated text/data ends up in the final
+  # kernel image. Disable function/data sections and use objcopy to move
+  # generated data into special section names
+  add_library(output_lib STATIC
+    ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_SRC}
+    )
+
+  target_link_libraries(output_lib zephyr_interface)
+
+  # Turn off -ffunction-sections, etc.
+  # NB: Using a library instead of target_compile_options(output_lib
+  # [...]) because a library's options have precedence
+  add_library(output_lib_interface INTERFACE)
+  target_compile_options(output_lib_interface INTERFACE
+    -fno-function-sections
+    -fno-data-sections
+    )
+  target_link_libraries(output_lib output_lib_interface)
+
+  set(OUTPUT_OBJ_PATH ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/output_lib.dir/${OUTPUT_OBJ})
+
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_OBJ_RENAMED}
+    COMMAND
+    ${CMAKE_OBJCOPY}
+    --rename-section   .data=.kobject_data.data
+    --rename-section   .text=.kobject_data.text
+    --rename-section .rodata=.kobject_data.rodata
+    ${OUTPUT_OBJ_PATH}
+    ${OUTPUT_OBJ_RENAMED}
+    DEPENDS output_lib
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+  add_custom_target(output_obj_renamed DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_OBJ_RENAMED})
+
+  add_library(output_obj_renamed_lib STATIC IMPORTED GLOBAL)
+  set_property(
+    TARGET output_obj_renamed_lib
+    PROPERTY
+    IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_OBJ_RENAMED}
+    )
+  add_dependencies(
+    output_obj_renamed_lib
+    output_obj_renamed
+    )
+
+  set_property(GLOBAL APPEND PROPERTY GENERATED_KERNEL_OBJECT_FILES output_obj_renamed_lib)
+endif()
+
+# Read global variables into local variables
+get_property(GKOF GLOBAL PROPERTY GENERATED_KERNEL_OBJECT_FILES)
+get_property(GKSF GLOBAL PROPERTY GENERATED_KERNEL_SOURCE_FILES)
+
+# FIXME: Is there any way to get rid of empty_file.c?
+add_executable(       zephyr_prebuilt misc/empty_file.c)
+target_link_libraries(zephyr_prebuilt -T${PROJECT_BINARY_DIR}/linker.cmd ${zephyr_lnk})
+set_property(TARGET   zephyr_prebuilt PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker.cmd)
+add_dependencies(     zephyr_prebuilt linker_script offsets)
+
+if(GKOF OR GKSF)
+  set(logical_target_for_zephyr_elf kernel_elf)
+
+  # The second linker pass uses the same source linker script of the
+  # first pass (LINKER_SCRIPT), but this time preprocessed with the
+  # define LINKER_PASS2.
+  add_custom_command(
+    OUTPUT linker_pass2.cmd
+    DEPENDS ${LINKER_SCRIPT}
+    ${LINKER_SCRIPT_DEP}
+    COMMAND ${CMAKE_C_COMPILER}
+    -x assembler-with-cpp
+    -nostdinc
+    -undef
+    -MD -MF linker_pass2.cmd.dep -MT ${BASE_NAME}/linker_pass2.cmd
+    ${ZEPHYR_INCLUDES}
+    ${LINKER_SCRIPT_DEFINES}
+    -DLINKER_PASS2
+    -E ${LINKER_SCRIPT} -P
+    -o linker_pass2.cmd
+    VERBATIM
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    )
+  add_custom_target(
+    linker_pass2_script
+    DEPENDS
+    linker_pass2.cmd
+    offsets_h
+    )
+
+  add_executable(       kernel_elf misc/empty_file.c ${GKSF})
+  target_link_libraries(kernel_elf ${GKOF} -T${PROJECT_BINARY_DIR}/linker_pass2.cmd ${zephyr_lnk})
+  set_property(TARGET   kernel_elf PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker_pass2.cmd)
+  add_dependencies(     kernel_elf linker_pass2_script)
+else()
+  set(logical_target_for_zephyr_elf zephyr_prebuilt)
+  # Use the prebuilt elf as the final elf since we don't have a
+  # generation stage.
+endif()
+
+# To avoid having the same logical target name for the zephyr lib and
+# the zephyr elf, we set the kernel_elf file name to zephyr.elf.
+set_target_properties(${logical_target_for_zephyr_elf} PROPERTIES OUTPUT_NAME ${KERNEL_NAME})
+
+set(post_build_commands "")
+
+list_append_ifdef(CONFIG_CHECK_LINK_MAP
+  post_build_commands
+  COMMAND ${PYTHON_EXECUTABLE} $ENV{ZEPHYR_BASE}/scripts/check_link_map.py ${KERNEL_MAP_NAME}
+  )
+
+list_append_ifdef(
+  CONFIG_BUILD_OUTPUT_HEX
+  post_build_commands
+  COMMAND ${CMAKE_OBJCOPY} -S -Oihex   -R .comment -R COMMON -R .eh_frame  ${KERNEL_ELF_NAME}    ${KERNEL_HEX_NAME}
+  )
+
+list_append_ifdef(
+  CONFIG_BUILD_OUTPUT_BIN
+  post_build_commands
+  COMMAND ${CMAKE_OBJCOPY} -S -Obinary -R .comment -R COMMON -R .eh_frame  ${KERNEL_ELF_NAME}    ${KERNEL_BIN_NAME}
+  )
+list_append_ifdef(
+  CONFIG_BUILD_OUTPUT_S19
+  post_build_commands
+  COMMAND ${CMAKE_OBJCOPY} --srec-len 1 --output-target=srec ${KERNEL_ELF_NAME} ${KERNEL_S19_NAME}
+  )
+
+list_append_ifdef(
+  CONFIG_OUTPUT_DISASSEMBLY
+  post_build_commands
+  COMMAND ${CMAKE_OBJDUMP} -S ${KERNEL_ELF_NAME} >  ${KERNEL_LST_NAME}
+  )
+
+list_append_ifdef(
+  CONFIG_OUTPUT_STAT
+  post_build_commands
+  COMMAND ${CMAKE_READELF} -e ${KERNEL_ELF_NAME} >  ${KERNEL_STAT_NAME}
+  )
+
+list_append_ifdef(
+  CONFIG_BUILD_OUTPUT_STRIPPED
+  post_build_commands
+  COMMAND ${CMAKE_STRIP}   --strip-all ${KERNEL_ELF_NAME} -o ${KERNEL_STRIP_NAME}
+  )
+
+add_custom_command(
+  TARGET ${logical_target_for_zephyr_elf}
+  POST_BUILD
+  ${post_build_commands}
+  COMMENT "Generating files from zephyr.elf for board: ${BOARD}"
+  # NB: COMMENT only works for some CMake-Generators
+)
+
+add_subdirectory(cmake/qemu)
+add_subdirectory(cmake/flash)
+
+add_subdirectory(cmake/usage)
+add_subdirectory(cmake/reports)
+
+include(cmake/ccache.cmake)
+
+if(CONFIG_ASSERT)
+  message(WARNING "
+      ------------------------------------------------------------
+      --- WARNING:  __ASSERT() statements are globally ENABLED ---
+      --- The kernel will run more slowly and uses more memory ---
+      ------------------------------------------------------------"
+)
+endif()
+
+if(CONFIG_BOARD_DEPRECATED)
+  message(WARNING "
+      WARNING:  The board '${BOARD}' is deprecated and will be
+      removed in version ${CONFIG_BOARD_DEPRECATED}"
+)
+endif()

CODEOWNERS

@@ -15,6 +15,7 @@ arch/arm/soc/arm/mps2/*                  @fvincenzo
 arch/arm/soc/st_stm32/*                  @erwango
 arch/arm/soc/st_stm32/stm32f4/*          @rsalveti @idlethread
 arch/arm/soc/ti_simplelink/cc32xx        @GAnthony
+arch/arm/soc/ti_simplelink/msp432p4xx    @Mani-Sadhasivam
 arch/nios2/*                             @andrewboie
 arch/nios2/core/*                        @andrewboie
 arch/riscv32                             @fractalclone
@@ -32,6 +33,7 @@ boards/arc/quark_se_c1000_ss_devboard/*  @nashif
 boards/arm/*                             @MaureenHelm @galak
 boards/arm/96b_carbon/*                  @rsalveti @idlethread
 boards/arm/96b_nitrogen/*                @idlethread
+boards/arm/96b_neonkey/*                 @Mani-Sadhasivam
 boards/arm/arduino_101_ble/*             @jhedberg
 boards/arm/cc3220sf_launchxl/*           @GAnthony
 boards/arm/disco_l475_iot1/*             @erwango
@@ -39,6 +41,7 @@ boards/arm/frdm_k64f/*                   @MaureenHelm
 boards/arm/frdm_kw41z/*                  @MaureenHelm
 boards/arm/hexiwear_k64/*                @MaureenHelm
 boards/arm/mps2_an385/*                  @fvincenzo
+boards/arm/msp_exp432p401r_launchxl/*    @Mani-Sadhasivam
 boards/arm/nrf51_blenano/*               @rsalveti
 boards/arm/nrf52_pca10040/*              @carlescufi
 boards/arm/nucleo_f401re/*               @rsalveti @idlethread
@@ -54,6 +57,9 @@ boards/x86/galileo/*                     @nashif
 boards/x86/quark_d2000_crb/*             @nashif
 boards/x86/quark_se_c1000_devboard/*     @nashif
 boards/xtensa/*                          @andrewboie
+# All cmake related files
+cmake/*                                  @nashif @SebastianBoe
+CMakeLists.txt                           @nashif @SebastianBoe
 doc/*                                    @dbkinder
 doc/subsystems/bluetooth/*               @sjanc @jhedberg @Vudentz
 drivers/*/*qmsi*                         @nashif
@@ -77,6 +83,7 @@ drivers/timer/altera_avalon_timer.c      @andrewboie
 drivers/timer/pulpino_timer.c            @fractalclone
 drivers/timer/riscv_machine_timer.c      @fractalclone
 drivers/usb                              @youvedeep @andyross
+drivers/usb/device/usb_dc_stm32.c        @ydamigos @loicpoulain
 drivers/i2c/i2c_ll_stm32*                @ldts @ydamigos
 dts/arm/st/*                             @erwango
 ext/fs/*                                 @nashif

CONTRIBUTING.rst

@@ -22,21 +22,51 @@ software continues to be available under the terms that the author desired.
 
 .. _GitHub repo: https://github.com/zephyrproject-rtos/zephyr
 
-Zephyr uses the `Apache 2.0 license`_ (as found in the LICENSE file in the
-project's `GitHub repo`_) to strike a balance between open contribution and
-allowing you to use the software however you would like to. There are some
-imported or reused components of the Zephyr project that use other licensing,
-as described in `Zephyr Licensing`_.
+Zephyr uses the `Apache 2.0 license`_ (as found in the LICENSE file in
+the project's `GitHub repo`_) to strike a balance between open
+contribution and allowing you to use the software however you would like
+to.  The Apache 2.0 license is a permisive open source license that
+allows you to freely use, modify, distribute and sell your own products
+that include Apache 2.0 licensed software.  (For more information about
+this, check out articles such as `Why choose Apache 2.0 licensing`_ and
+`Top 10 Apache License Questions Answered`_).
 
-.. _Zephyr Licensing:
-   https://www.zephyrproject.org/doc/LICENSING.html
+.. _Why choose Apache 2.0 licensing:
+   https://www.zephyrproject.org/about/#faq
 
-The license tells you what rights you have as a developer, provided by the
+.. _Top 10 Apache License Questions Answered:
+   https://www.whitesourcesoftware.com/whitesource-blog/top-10-apache-license-questions-answered/
+
+A license tells you what rights you have as a developer, as provided by the
 copyright holder. It is important that the contributor fully understands the
 licensing rights and agrees to them. Sometimes the copyright holder isn't the
 contributor, such as when the contributor is doing work on behalf of a
 company.
 
+Components using other Licenses
+===============================
+
+There are some imported or reused components of the Zephyr project that
+use other licensing, as described in `Zephyr Licensing`_.
+
+.. _Zephyr Licensing:
+   https://www.zephyrproject.org/doc/LICENSING.html
+
+Importing code into the Zephyr OS from other projects that use a license
+other than the Apache 2.0 license needs to be fully understood in
+context and approved by the Zephyr governing board.
+
+By carefully reviewing potential contributions and also enforcing a
+:ref:`DCO` for contributed code, we can ensure that
+the Zephyr community can develop products with the Zephyr Project
+without concerns over patent or copyright issues.
+
+See `Contributing non-Apache 2.0 components`_ for more information about
+this contributing and review process for imported components.
+
+.. _Contributing non-Apache 2.0 components:
+   https://www.zephyrproject.org/doc/contribute/contribute_non-apache.html
+
 .. _DCO:
 
 Developer Certification of Origin (DCO)
@@ -114,7 +144,7 @@ and how to set up your development environment as introduced in the Zephyr
    https://www.zephyrproject.org/doc/getting_started/getting_started.html
 
 The examples below use a Linux host environment for Zephyr development.
-You should be familiar with common developer tools such as Git and Make, and
+You should be familiar with common developer tools such as Git and CMake, and
 platforms such as GitHub.
 
 If you haven't already done so, you'll need to create a (free) GitHub account
@@ -139,14 +169,14 @@ available for developers to contribute to and enhance.
 Pull Requests and Issues
 ************************
 
-.. _Zephyr Project Issues: https://jira.zephyrproject.org
+.. _Zephyr Project Issues: https://github.com/zephyrproject-rtos/zephyr/issues
 
 .. _open pull requests: https://github.com/zephyrproject-rtos/zephyr/pulls
 
 .. _Zephyr-devel mailing list:
    https://lists.zephyrproject.org/mailman/listinfo/zephyr-devel
 
-Before starting on a patch, first check in our Jira `Zephyr Project Issues`_
+Before starting on a patch, first check in our issues `Zephyr Project Issues`_
 system to see what's been reported on the issue you'd like to address.  Have a
 conversation on the `Zephyr-devel mailing list`_ (or the #zephyrproject IRC
 channel on freenode.net) to see what others think of your issue (and proposed
@@ -155,13 +185,21 @@ finding, or that have similar ideas for changes or additions.  Send a message
 to the `Zephyr-devel mailing list`_ to introduce and discuss your idea with
 the development community.
 
+Please note that it's common practice on IRC to be away from the
+channel, but still have a client logged in to receive traffic. If you
+ask a question to a particular person and they don't answer, **try
+to stay signed in to the channel** if you can, so they have time to
+respond to you. This is especially important given the many different
+timezones Zephyr developers live in. If you don't get a timely
+response on IRC, try sending a message to the mailing list instead.
+
 It's always a good practice to search for existing or related issues before
 submitting your own. When you submit an issue (bug or feature request), the
 triage team will review and comment on the submission, typically within a few
 business days.
 
 You can find all `open pull requests`_ on GitHub and open `Zephyr Project
-Issues`_ in Jira.
+Issues`_ in Github issues.
 
 Development Tools and Git Setup
 *******************************
@@ -203,18 +241,14 @@ run the same tests the CI system runs, follow these steps from within your
 local Zephyr source working directory::
 
     $ source zephyr-env.sh
-    $ make host-tools
-    $ export PREBUILT_HOST_TOOLS=${ZEPHYR_BASE}/bin
-    $ export USE_CCACHE=1
     $ ./scripts/sanitycheck
 
 The above will execute the basic sanitycheck script, which will run various
 kernel tests using the QEMU emulator.  It will also do some build tests on
 various samples with advanced features that can't run in QEMU.
 
-We highly recommend you run these tests locally to avoid any CI failures.
-Using CCACHE and pre-built host tools is optional, however it speeds up the
-execution time considerably.
+We highly recommend you run these tests locally to avoid any CI
+failures.
 
 
 Coding Style
@@ -248,6 +282,8 @@ it when committing code, edit your *.git/hooks/pre-commit* file to contain:
     set -e exec
     exec git diff --cached | ${ZEPHYR_BASE}/scripts/checkpatch.pl - || true
 
+.. _Contribution workflow:
+
 Contribution Workflow
 *********************
 
@@ -284,7 +320,7 @@ workflow here:
      $ git remote -v
 
 #. Create a topic branch (off of master) for your work (if you're addressing
-   Jira issue, we suggest including the Jira issue number in the branch name)::
+   an issue, we suggest including the issue number in the branch name)::
 
      $ git checkout master
      $ git checkout -b fix_comment_typo
@@ -402,9 +438,9 @@ Changes are submitted as Git commits. Each commit message must contain:
 * A Signed-off-by line, ``Signed-off-by: <name> <email>`` typically added
   automatically by using ``git commit -s``
 
-* If the change address a Jira issue, include a line of the form::
+* If the change addresses an issue, include a line of the form::
 
-      Jira: ZEP-xxx
+      Fixes #<issue number>.
 
 
 All changes and topics sent to GitHub must be well-formed, as described above.

Kbuild

@@ -1,56 +0,0 @@
-# vim: filetype=make
-
-define filechk_configs.c
-	(echo "/* file is auto-generated, do not modify ! */"; \
-	echo; \
-	echo "#include <toolchain.h>"; \
-	echo; \
-	echo "GEN_ABS_SYM_BEGIN (_ConfigAbsSyms)"; \
-	echo; \
-	cat $(CURDIR)/include/generated/autoconf.h | sed \
-	's/".*"/1/' | awk  \
-	'/#define/{printf "GEN_ABSOLUTE_SYM(%s, %s);\n", $$2, $$3}'; \
-	echo; \
-	echo "GEN_ABS_SYM_END";)
-endef
-
-misc/generated/configs.c: include/config/auto.conf FORCE
-	$(call filechk,configs.c)
-
-targets := misc/generated/configs.c
-targets += include/generated/offsets.h
-
-
-always := misc/generated/configs.c
-always += include/generated/offsets.h
-
-define rule_cc_o_c_1
-	$(call echo-cmd,cc_o_c_1) $(cmd_cc_o_c_1);
-endef
-
-cmd_cc_o_c_1 = $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(ZEPHYRINCLUDE) -c -o $@ $<
-
-arch/$(ARCH)/core/offsets/offsets.o: arch/$(ARCH)/core/offsets/offsets.c $(KCONFIG_CONFIG) \
-				include/generated/generated_dts_board.h
-	$(Q)mkdir -p $(dir $@)
-	$(call if_changed,cc_o_c_1)
-
-
-define offsetchk
-	$(Q)set -e;                                                \
-	$(kecho) '  CHK     $@';                                   \
-	mkdir -p $(dir $@);                                        \
-	$(srctree)/scripts/gen_offset_header.py -i $(1) -o $@.tmp; \
-	if [ -r $@ ] && cmp -s $@ $@.tmp; then                     \
-	rm -f $@.tmp;                                              \
-	else                                                       \
-	$(kecho) '  UPD     $@';                                   \
-	mv -f $@.tmp $@;                                           \
-	fi
-endef
-
-include/generated/offsets.h: arch/$(ARCH)/core/offsets/offsets.o \
-			     include/config/auto.conf FORCE
-	$(call offsetchk,arch/$(ARCH)/core/offsets/offsets.o)
-
-

MAINTAINERS

@@ -1,493 +0,0 @@
-Originally from the Linux Kernel.
-# Licensed under the terms of the GNU GPL License version 2
-
-Descriptions of section entries:
-
-	P: Person (obsolete)
-	M: Mail patches to: FullName <address@domain>
-	R: Designated reviewer: FullName <address@domain>
-	   These reviewers should be CCed on patches.
-	L: Mailing list that is relevant to this area
-	W: Web-page with status/info
-	Q: Patchwork web based patch tracking system site
-	T: SCM tree type and location.
-	   Type is one of: git, hg, quilt, stgit, topgit
-	S: Status, one of the following:
-	   Supported:	Someone is actually paid to look after this.
-	   Maintained:	Someone actually looks after it.
-	   Odd Fixes:	It has a maintainer but they don't have time to do
-			much other than throw the odd patch in. See below..
-	   Orphan:	No current maintainer [but maybe you could take the
-			role as you write your new code].
-	   Obsolete:	Old code. Something tagged obsolete generally means
-			it has been replaced by a better system and you
-			should be using that.
-	F: Files and directories with wildcard patterns.
-	   A trailing slash includes all files and subdirectory files.
-	   F:	drivers/net/	all files in and below drivers/net
-	   F:	drivers/net/*	all files in drivers/net, but not below
-	   F:	*/net/*		all files in "any top level directory"/net
-	   One pattern per line.  Multiple F: lines acceptable.
-	N: Files and directories with regex patterns.
-	   N:	[^a-z]tegra	all files whose path contains the word tegra
-	   One pattern per line.  Multiple N: lines acceptable.
-	   scripts/get_maintainer.pl has different behavior for files that
-	   match F: pattern and matches of N: patterns.  By default,
-	   get_maintainer will not look at git log history when an F: pattern
-	   match occurs.  When an N: match occurs, git log history is used
-	   to also notify the people that have git commit signatures.
-	X: Files and directories that are NOT maintained, same rules as F:
-	   Files exclusions are tested before file matches.
-	   Can be useful for excluding a specific subdirectory, for instance:
-	   F:	net/
-	   X:	net/ipv6/
-	   matches all files in and below net excluding net/ipv6/
-	K: Keyword perl extended regex pattern to match content in a
-	   patch or file.  For instance:
-	   K: of_get_profile
-	      matches patches or files that contain "of_get_profile"
-	   K: \b(printk|pr_(info|err))\b
-	      matches patches or files that contain one or more of the words
-	      printk, pr_info or pr_err
-	   One regex pattern per line.  Multiple K: lines acceptable.
-
-Note: For the hard of thinking, this list is meant to remain in alphabetical
-order. If you could add yourselves to it in alphabetical order that would be
-so much easier [Ed]
-
-Maintainers List (try to look for most precise areas first)
-
-		-----------------------------------
-
-ARC ARCHITECTURE
-M:	Ruud Derwig <Ruud.Derwig@synopsys.com>
-M:	Chuck Jordan <cjordan@synopsys.com>
-S:	Supported
-F:	arch/arc/
-F:	include/arch/arc/
-F:	boards/arc/
-
-ARM ARCHITECTURE
-M:	Maureen Helm <maureen.helm@nxp.com>
-M:	Kumar Gala <kumar.gala@linaro.org>
-S:	Supported
-F:	arch/arm/
-F:	include/arch/arm/
-F:	boards/arm/
-
-ARM CORTEX MICROCONTROLLER SOFTWARE INTERFACE STANDARD (CMSIS)
-M:	Maureen Helm <maureen.helm@nxp.com>
-M:	Kumar Gala <kumar.gala@linaro.org>
-S:	Supported
-F:	ext/hal/cmsis/
-
-BOARDS/ARC - ARDUINO 101 SSS
-M:      Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	boards/arc/arduino_101_sss/
-
-BOARDS/ARC - EM Starterkit
-M:	Chuck Jordan <cjordan@synopsys.com>
-S:	Supported
-F:	boards/arc/em_starterkit/
-
-BOARDS/ARC - QUARK SE C1000 SS Devboard
-M:      Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	boards/arc/quark_se_c1000_ss_devboard/
-
-BOARDS/ARM - 96Boards CARBON
-M:	Amit Kucheria <amit.kucheria@linaro.org>
-M:	Ricardo Salveti <ricardo.salveti@linaro.org>
-S:	Supported
-F:	boards/arm/96b_carbon/
-
-BOARDS/ARM - 96Boards NITROGEN
-M:	Amit Kucheria <amit.kucheria@linaro.org>
-S:	Supported
-F:	boards/arm/96b_nitrogen/
-
-BOARDS/ARM - ARDUINO 101 BLE
-M:	Johan Hedberg <johan.hedberg@intel.com>
-S:	Supported
-F:	boards/arm/arduino_101_ble/
-
-BOARDS/ARM - CC32XX LAUNCHXL
-M:      Gil Pitney <gil.pitney@linaro.org>
-S:      Supported
-F:      boards/arm/cc3220sf_launchxl/
-
-BOARDS/ARM - NXP FRDM-K64F
-M:	Maureen Helm <maureen.helm@nxp.com>
-S:	Supported
-F:	boards/arm/frdm_k64f/
-
-BOARDS/ARM - NXP FRDM-KW41Z
-M:	Maureen Helm <maureen.helm@nxp.com>
-S:	Supported
-F:	boards/arm/frdm_kw41z/
-
-BOARDS/ARM - NXP Hexiwear
-M:	Maureen Helm <maureen.helm@nxp.com>
-S:	Supported
-F:	boards/arm/hexiwear_k64/
-
-BOARDS/ARM - NORDIC NRF51 REDBEAR BLENANO
-M:	Ricardo Salveti <ricardo.salveti@linaro.org>
-S:	Supported
-F:	boards/arm/nrf51_blenano/
-
-BOARDS/ARM - NORDIC NRF52 PCA10040
-M:	Carles Cufi <carles.cufi@nordicsemi.no>
-S:	Supported
-F:	boards/arm/nrf52_pca10040/
-
-BOARDS/ARM - NUCLEO-64 F401RE Devboard
-M:	Amit Kucheria <amit.kucheria@linaro.org>
-M:	Ricardo Salveti <ricardo.salveti@linaro.org>
-S:	Supported
-F:	boards/arm/nucleo_f401re/
-
-BOARDS/ARM - ARM LTD V2M Beetle
-M:	Vincenzo Frascino <vincenzo.frascino@linaro.org>
-S:	Supported
-F:	boards/arm/v2m_beetle/
-
-BOARDS/NIOS2 - ALTERA MAX10
-M:	Andrew Boie <andrew.p.boie@intel.com>
-S:	Supported
-F:	boards/nios2/altera_max10/
-
-BOARDS/X86 - ARDUINO 101
-M:      Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	boards/x86/arduino_101/
-
-BOARDS/X86 - Galileo
-M:      Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	boards/x86/galileo/
-
-BOARDS/X86 - QUARK D2000 Devboard
-M:      Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	boards/x86/quark_d2000_crb/
-
-BOARDS/X86 - QUARK SE C1000 Devboard
-M:      Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	boards/x86/quark_se_c1000_devboard/
-
-BLUETOOTH
-M:	Johan Hedberg <johan.hedberg@intel.com>
-M:	Luiz Augusto von Dentz <luiz.dentz@gmail.com>
-M:	Szymon Janc <szymon.janc@gmail.com>
-S:	Supported
-W:	https://www.zephyrproject.org/doc/subsystems/bluetooth/bluetooth.html
-F:	subsys/bluetooth/
-F:	include/bluetooth/
-F:	include/drivers/bluetooth/
-F:	drivers/bluetooth/
-F:	samples/bluetooth/
-F:	tests/bluetooth/
-F:	doc/subsystems/bluetooth/
-
-BLUETOOTH CONTROLLER
-M:	Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
-M:	Carles Cufi <carles.cufi@nordicsemi.no>
-S:	Supported
-F:	subsys/bluetooth/controller/
-
-CC32XX SDK
-M:      Gil Pitney <gil.pitney@linaro.org>
-S:      Supported
-F:      ext/hal/ti/simplelink
-
-CC32XX SOC - TI SIMPLELINK
-M:      Gil Pitney <gil.pitney@linaro.org>
-S:      Supported
-F:      arch/arm/soc/ti_simplelink/cc32xx
-
-DOCUMENTATION
-M:	David Kinder <david.b.kinder@intel.com>
-M:	Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
-S:	Supported
-F:	doc/
-F:	*.rst
-
-FILE SYSTEM
-M:	Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	ext/fs/
-F:	subsys/fs/
-F:	include/fs/
-F:	include/fs.h
-F:	tests/subsys/fs
-
-FLASH DRIVER
-M:	Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	drivers/flash/
-
-INTERRUPTS
-M:	Andrew Boie <andrew.p.boie@intel.com>
-S:	Supported
-F:	drivers/interrupt_controller/
-F:	arch/arc/core/
-F:	arch/arm/core/
-F:	arch/nios2/core/
-F:	arch/x86/core/
-F:	include/irq.h
-F:	include/arch/x86/arch.h
-F:	include/arch/arm/cortex_m/irq.h
-F:	include/arch/nios2/arch.h
-F:	include/arch/arc/arch.h
-F:	include/arch/arc/v2/irq.h
-F:	include/drivers/loapic.h
-F:	include/drivers/ioapic.h
-F:	include/drivers/mvic.h
-
-KERNEL CORE
-M:	Andrew Boie <andrew.p.boie@intel.com>
-M:	Andy Ross <andrew.j.ross@intel.com>
-S:	Supported
-F:	kernel/
-F:	include/misc/
-F:	include/toolchain/
-F:	include/atomic.h
-F:	include/cache.h
-F:	include/init.h
-F:	include/irq.h
-F:	include/irq_offload.h
-F:	include/kernel_version.h
-F:	include/linker/linker-defs.h
-F:	include/linker/linker-tool-gcc.h
-F:	include/linker/linker-tool.h
-F:	include/linker/section_tags.h
-F:	include/linker/sections.h
-F:	include/shared_irq.h
-F:	include/sw_isr_table.h
-F:	include/sys_clock.h
-F:	include/sys_io.h
-F:	include/toolchain.h
-F:	include/zephyr.h
-F:	include/kernel.h
-F:	tests/kernel/
-
-KNOWN ISSUES
-M:	Anas Nashif <anas.nashif@intel.com>
-M:	Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
-F:	.known-issues/
-
-LWM2M
-M:	Michael Scott <michael.scott@linaro.org>
-S:	Supported
-F:	subsys/net/lib/lwm2m/
-F:	samples/net/lwm2m_client/
-
-MAINTAINERS
-M:	Anas Nashif <anas.nashif@intel.com>
-M:	Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
-S:	Supported
-F:	MAINTAINERS
-
-MBEDTLS
-M:	Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	ext/lib/crypto/mbedtls/
-F:	samples/net/mbedtls_sslclient/
-F:	tests/crypto/mbedtls/
-
-MCUXPRESSO SOFTWARE DEVELOPMENT KIT (MCUX)
-M:	Maureen Helm <maureen.helm@nxp.com>
-S:	Supported
-F:	ext/hal/nxp/mcux/
-
-MPS2 - ARM LTD CORTEX-M PROTOTYPING SYSTEM
-M:	Vincenzo Frascino <vincenzo.frascino@linaro.org>
-S:	Supported
-F:	arch/arm/soc/arm/mps2/
-F:	boards/arm/mps2_an385/
-
-NETWORKING
-M:	Jukka Rissanen <jukka.rissanen@linux.intel.com>
-M:	Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
-S:	Supported
-W:	https://www.zephyrproject.org/doc/subsystems/networking/networking.html
-F:	subsys/net/ip/
-F:	subsys/net/lib/
-F:	include/net/
-F:	samples/net/
-F:	tests/net/
-F:	tests/net/lib/
-F:	drivers/ethernet/
-F:	drivers/ieee802154/
-F:	drivers/slip/
-
-NETWORK APPLICATIONS
-M:	Jukka Rissanen <jukka.rissanen@linux.intel.com>
-M:	Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
-S:	Supported
-F:	subsys/net/lib/dns/
-F:	subsys/net/lib/http/
-F:	subsys/net/lib/mqtt/
-F:	samples/net/dns_resolve/
-F:	samples/net/http_server/
-F:	samples/net/mqtt_publisher/
-F:	tests/net/lib/http_header_fields/
-F:	tests/net/lib/mqtt_packet/
-
-NETWORK BUFFERS
-M:	Johan Hedberg <johan.hedberg@intel.com>
-M:	Jukka Rissanen <jukka.rissanen@linux.intel.com>
-M:	Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
-S:	Supported
-W:	https://www.zephyrproject.org/doc/subsystems/networking/buffers.html
-F:	subsys/net/buf.c
-F:	include/net/buf.h
-F:	tests/net/buf/
-
-NIOS II
-M:	Andrew Boie <andrew.p.boie@intel.com>
-S:	Supported
-F:	arch/nios2/
-F:	include/arch/nios2/
-F:	drivers/serial/uart_altera_jtag.c
-F:	drivers/timer/altera_avalon_timer.c
-F:	boards/nios2/
-
-NORDIC MDK
-M:	Carles Cufi <carles.cufi@nordicsemi.no>
-S:	Supported
-F:	ext/hal/nordic/mdk/
-
-POWER MANAGEMENT
-M:	Anas Nashif <anas.nashif@intel.com>
-M:	Youvedeep Singh <youvedeep.singh@intel.com>
-S:	Supported
-F:	arch/x86/core/crt0.S
-F:	include/device.h
-F:	include/init.h
-F:	include/power.h
-F:	kernel/idle.c
-F:	kernel/device.c
-F:	samples/boards/quark_se_c1000/power*/
-
-QMSI
-M:	Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	ext/hal/qmsi/
-
-QMSI DRIVERS
-M:      Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	drivers/*/*qmsi*
-
-QUARK D2000 SOC
-M:      Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	arch/x86/soc/intel_quark/quark_d2000/
-
-QUARK SE C1000 SOC
-M:      Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	arch/x86/soc/intel_quark/quark_se/
-
-QUARK X1000 SOC
-M:      Anas Nashif <anas.nashif@intel.com>
-S:	Supported
-F:	arch/x86/soc/intel_quark/quark_x1000/
-
-SANITYCHECK
-M:	Andrew Boie <andrew.p.boie@intel.com>
-S:	Supported
-F:	scripts/sanitycheck
-F:	scripts/expr_parser.py
-F:	scripts/sanity_chk/
-
-SENSOR DRIVERS
-M:	Bogdan Davidoaia <bogdan.davidoaia@gmail.com>
-M:	Murtaza Alexandru <murtaza.alexandru1995@gmail.com>
-S:	Maintained
-W:	https://www.zephyrproject.org/doc/subsystems/sensor.html
-F:	include/sensor.h
-F:	drivers/sensor/
-F:	samples/sensor/
-
-STM32CUBE SDK
-M:	Erwan Gouriou <erwan.gouriou@linaro.org>
-S:	Supported
-F:	ext/hal/st/stm32cube/
-
-STM32F4X SoC FAMILY and DRIVERS
-M:	Amit Kucheria <amit.kucheria@linaro.org>
-M:	Ricardo Salveti <ricardo.salveti@linaro.org>
-S:	Supported
-F:	arch/arm/soc/st_stm32/stm32f4/
-F:	drivers/pinmux/stm32/
-F:	drivers/gpio/*stm32*
-F:	drivers/clock_control/*stm32f4*
-
-TINYCRYPT
-M:	Constanza Heath <constanza.m.heath@intel.com>
-S:	Supported
-F:	ext/lib/crypto/tinycrypt/
-F:	tests/crypto/
-
-SPI
-M:	Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
-S:	Supported
-F:	drivers/spi/
-F:	include/spi.h
-F:	tests/drivers/spi/
-
-USB
-M:	Youvedeep Singh <youvedeep.singh@intel.com>
-M:	Andy Ross <andrew.j.ross@intel.com>
-S:	Supported
-F:	subsys/usb
-F:	drivers/usb
-F:	samples/subsys/usb
-
-X86 ARCH
-M:	Andrew Boie <andrew.p.boie@intel.com>
-M:	Youvedeep Singh <youvedeep.singh@intel.com>
-S:	Supported
-F:	arch/x86/
-F:	include/arch/x86/
-F:	boards/x86/
-
-XTENSA ARCH
-M:	Andrew Boie <andrew.p.boie@intel.com>
-S:	Supported
-F:	arch/xtensa
-F:	include/arch/xtensa/
-F:	boards/xtensa/
-
-RISCV32 ARCH
-M:	Jean-Paul Etienne <fractalclone@gmail.com>
-S:	Supported
-F:	arch/riscv32
-F:	include/arch/riscv32
-F:	boards/riscv32
-F:	drivers/serial/uart_riscv_qemu.c
-F:	drivers/timer/pulpino_timer.c
-F:	drivers/timer/riscv_machine_timer.c
-F:	drivers/gpio/gpio_pulpino.c
-
-ZOAP
-M:	Vinicius Costa Gomes <vinicius.gomes@intel.com>
-S:	Supported
-F:	subsys/net/lib/zoap/
-F:	samples/net/zoap_client/
-F:	samples/net/zoap_server/
-F:	tests/net/lib/zoap/
-
-THE REST
-M:	Anas Nashif <anas.nashif@intel.com>
-M:	Kumar Gala <kumar.gala@linaro.org>
-L:	devel@lists.zephyrproject.com
-T:	git https://github.com/zephyrproject-rtos/zephyr
-S:	Buried alive in reporters
-F:	*
-F:	*/

Makefile.inc

@@ -1,148 +0,0 @@
-# vim: filetype=make
-#
-
-UNAME := $(shell uname)
-ifeq (MINGW, $(findstring MINGW, $(UNAME)))
-DQUOTE = '
-# '
-PROJECT_BASE ?= $(shell sh -c "pwd -W")
-else
-DQUOTE = "
-# "
-PROJECT_BASE ?= $(CURDIR)
-endif
-
-ifdef BOARD
-KBUILD_DEFCONFIG_PATH=$(wildcard $(ZEPHYR_BASE)/boards/*/*/$(BOARD)_defconfig)
-ifeq ($(KBUILD_DEFCONFIG_PATH),)
-$(error Board $(BOARD) not found!)
-endif
-else
-$(error BOARD is not defined!)
-endif
-
-# Choose a default output directory if one wasn't supplied.  Note that
-# PRISTINE_O depends on whether this is default or not.  If building
-# in-tree, we want to remove the whole outdir and not just the BOARD
-# specified (thus "pristine").  Out of tree, we can obviously remove
-# only what we were told to build.
-ifndef O
-PRISTINE_O = outdir
-O = $(PROJECT_BASE)/outdir/$(BOARD)
-else
-PRISTINE_O = $(O)
-endif
-
-# Turn O into an absolute path; we call the main Kbuild with $(MAKE) -C
-# which changes the working directory, relative paths don't work right.
-# Need to create the directory first to make realpath happy
-
-ifneq ($(MAKECMDGOALS),help)
-$(shell mkdir -p $(O))
-override O := $(realpath $(O))
-endif
-
-export ARCH QEMU_EXTRA_FLAGS PROJECT_BASE
-
-override CONF_FILE := $(strip $(subst $(DQUOTE),,$(CONF_FILE)))
-
-SOURCE_DIR ?= $(PROJECT_BASE)/src/
-override SOURCE_DIR := $(realpath $(SOURCE_DIR))
-override SOURCE_DIR := $(subst \,/,$(SOURCE_DIR))
-override SOURCE_DIR_PARENT := $(patsubst %, %/.., $(SOURCE_DIR))
-override SOURCE_DIR_PARENT := $(abspath $(SOURCE_DIR_PARENT))
-override SOURCE_DIR_PARENT := $(subst \,/,$(SOURCE_DIR_PARENT))
-export SOURCE_DIR SOURCE_DIR_PARENT
-
-ifeq ("$(origin V)", "command line")
-  KBUILD_VERBOSE = $(V)
-endif
-ifndef KBUILD_VERBOSE
-  KBUILD_VERBOSE = 0
-endif
-
-ifeq ($(KBUILD_VERBOSE),1)
-  Q =
-  S =
-else
-  Q = @
-  S = -s
-endif
-
-export CFLAGS
-
-zephyrmake	= +$(MAKE) -C $(ZEPHYR_BASE)  O=$(1) \
-			PROJECT=$(PROJECT_BASE) SOURCE_DIR=$(DQUOTE)$(SOURCE_DIR)$(DQUOTE) $(2)
-
-BOARDCONFIG = $(O)/.board_$(BOARD)
-
-DOTCONFIG = $(O)/.config
-
-all: $(DOTCONFIG)
-	$(Q)$(call zephyrmake,$(O),$@)
-
-debug:	$(DOTCONFIG)
-	$(Q)$(call zephyrmake,$(O),$@)
-
-flash: $(DOTCONFIG)
-	$(Q)$(call zephyrmake,$(O),$@)
-
-run: $(DOTCONFIG)
-	$(Q)$(call zephyrmake,$(O),$@)
-
-ifeq ($(MAKECMDGOALS),debugserver)
-ARCH = $(notdir $(subst /$(BOARD),,$(wildcard $(ZEPHYR_BASE)/boards/*/$(BOARD))))
-BOARD_DIR = $(dir $(wildcard $(ZEPHYR_BASE)/boards/*/*/$(BOARD)_defconfig))
--include $(BOARD_DIR)/Makefile.board
--include $(ZEPHYR_BASE)/scripts/Makefile.toolchain.$(ZEPHYR_GCC_VARIANT)
-BOARD_NAME = $(BOARD)
-export BOARD_NAME
-endif
-
-debugserver: FORCE
-	$(Q)$(CONFIG_SHELL) $(ZEPHYR_BASE)/scripts/support/$(DEBUG_SCRIPT) debugserver
-
-initconfig: $(DOTCONFIG)
-
-$(BOARDCONFIG):
-	@rm -f $(O)/.board_*
-	@touch $@
-
-ram_report: initconfig
-	$(Q)$(call zephyrmake,$(O),$@)
-
-rom_report: initconfig
-	$(Q)$(call zephyrmake,$(O),$@)
-
-outputexports: initconfig
-	$(Q)$(call zephyrmake,$(O),$@)
-
-dts: initconfig
-	$(Q)$(call zephyrmake,$(O),$@)
-
-config-sanitycheck: dts
-	$(Q)$(call zephyrmake,$(O),$@)
-
-menuconfig: initconfig
-	$(Q)$(call zephyrmake,$(O),$@)
-
-help:
-	$(Q)$(MAKE) -s -C $(ZEPHYR_BASE) $@
-
-# Catch all
-%:
-	$(Q)$(call zephyrmake,$(O),$@)
-
-$(DOTCONFIG): $(BOARDCONFIG) $(KBUILD_DEFCONFIG_PATH) $(CONF_FILE)
-	$(Q)$(CONFIG_SHELL) $(ZEPHYR_BASE)/scripts/kconfig/merge_config.sh \
-		-q -m -O $(O) $(KBUILD_DEFCONFIG_PATH) $(OVERLAY_CONFIG) $(CONF_FILE) \
-			      $(wildcard $(O)/*.conf)
-	$(Q)$(MAKE) $(S) -C $(ZEPHYR_BASE) O=$(O) PROJECT=$(PROJECT_BASE) oldnoconfig
-
-pristine:
-	$(Q)rm -rf $(PRISTINE_O)
-
-PHONY += FORCE initconfig
-FORCE:
-
-.PHONY: $(PHONY)

Makefile.test

@@ -1,4 +0,0 @@
-
-OVERLAY_CONFIG += $(ZEPHYR_BASE)/tests/include/test.config
-
-include ${ZEPHYR_BASE}/Makefile.inc

README.rst

@@ -5,6 +5,9 @@ Zephyr Project
 
    <a href="https://bestpractices.coreinfrastructure.org/projects/74"><img
    src="https://bestpractices.coreinfrastructure.org/projects/74/badge"></a>
+   <img
+   src="https://api.shippable.com/projects/58ffb2b8baa5e307002e1d79/badge?branch=master">
+
 
 The Zephyr Project is a scalable real-time operating system (RTOS) supporting
 multiple hardware architectures, optimized for resource constrained devices,
@@ -48,7 +51,7 @@ support systems:
   `Zephyr Introduction`_ and `Getting Started Guide`_.
 
 * **Releases**: Source code for Zephyr kernel releases are available at
-  https://zephyrproject.org/downloads. On this page,
+  https://zephyrproject.org/developers/#downloads. On this page,
   you'll find release information, and links to download or clone source
   code from our GitHub repository.  You'll also find links for the Zephyr
   SDK, a moderated collection of tools and libraries used to develop your
@@ -69,15 +72,18 @@ support systems:
   the `Zephyr GitHub wiki`_.
 
 * **Issue Reporting and Tracking**: Requirements and Issue tracking is done in
-  our JIRA system: https://jira.zephyrproject.org. You can browse through the
-  reported issues and submit issues of your own.
+  the Github issues system: https://github.com/zephyrproject-rtos/zephyr/issues.
+  You can browse through the reported issues and submit issues of your own.
 
-* **Security-related Issue Reporting**: For security-related inquiries or
-  reporting suspected security-related bugs in the Zephyr OS, please
-  send email to vulnerabilities@zephyrproject.org.  We will assess and fix
-  flaws according to our security policy outlined in the Zephyr Project
+* **Security-related Issue Reporting and Tracking**: For security-related
+  inquiries or reporting suspected security-related bugs in the Zephyr OS,
+  please send email to vulnerabilities@zephyrproject.org.  We will assess and
+  fix flaws according to our security policy outlined in the Zephyr Project
   `Security Overview`_.
 
+  Security related issue tracking is done in JIRA.  The location of this JIRA
+  is https://zephyrprojectsec.atlassian.net.
+
 * **Mailing List**: The `Zephyr Mailing Lists`_ are perhaps the most convenient
   way to track developer discussions and to ask your own support questions to
   the Zephyr project community.

VERSION

@@ -0,0 +1,5 @@
+VERSION_MAJOR = 1
+VERSION_MINOR = 10
+PATCHLEVEL = 0
+VERSION_TWEAK = 0
+EXTRAVERSION =

arch/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_subdirectory(common)
+add_subdirectory(${ARCH})

arch/Kconfig

@@ -35,33 +35,49 @@ config XTENSA
 
 endchoice
 
-#
-# Hidden PM feature configs which are to be selected by
-# individual SoC.
-#
-config SYS_POWER_LOW_POWER_STATE_SUPPORTED
-	# Hidden
-	bool
-	default n
-	help
-	This option signifies that the target supports the SYS_POWER_LOW_POWER_STATE
-	configuration option.
 
-config SYS_POWER_DEEP_SLEEP_SUPPORTED
-	# Hidden
-	bool
-	default n
-	help
-	This option signifies that the target supports the SYS_POWER_DEEP_SLEEP
-	configuration option.
+menu "General Architecture Options"
 
-config BOOTLOADER_CONTEXT_RESTORE_SUPPORTED
-	# Hidden
-	bool
-	default n
+config HW_STACK_PROTECTION
+	bool "Hardware Stack Protection"
+	depends on ARCH_HAS_STACK_PROTECTION
 	help
-	This option signifies that the target has options of bootloaders
-	that support context restore upon resume from deep sleep
+	Select this option to enable hardware-based platform features to
+	catch stack overflows when the system is running in privileged
+	mode. If CONFIG_USERSPACE is not enabled, the system is always
+	running in privileged mode.
+
+	Note that this does not necessarily prevent corruption and assertions
+	about the overall system state when a fault is triggered cannot be
+	made.
+
+config USERSPACE
+	bool "User mode threads (EXPERIMENTAL)"
+	depends on ARCH_HAS_USERSPACE
+	help
+	When enabled, threads may be created or dropped down to user mode,
+	which has significantly restricted permissions and must interact
+	with the kernel via system calls. See Zephyr documentation for more
+	details	about this feature.
+
+	If a user thread overflows its stack, this will be caught and the
+	kernel itself will be shielded from harm. Enabling this option
+	may or may not catch stack overflows when the system is in
+	privileged mode or handling a system call; to ensure these are always
+	caught, enable CONFIG_HW_STACK_PROTECTION.
+
+	This feature is under heavy development and APIs related to it are
+	subject to change, even if declared non-private.
+
+config MAX_THREAD_BYTES
+	int "Bytes to use when tracking object thread permissions"
+	default 2
+	depends on USERSPACE
+	help
+	Every kernel object will have an associated bitfield to store
+	thread permissions for that object. This controls the size of the
+	bitfield (in bytes) and imposes a limit on how many threads can
+	be created in the system.
 
 config SIMPLE_FATAL_ERROR_HANDLER
 	prompt "Simple system fatal error handler"
@@ -74,50 +90,10 @@ config SIMPLE_FATAL_ERROR_HANDLER
 	for footprint-concerned systems. Only enable this option if you do not
 	want debug capabilities in case of system fatal error.
 
-#
-# End hidden PM feature configs
-#
-
-config ARCH
-	string
-	help
-	System architecture string.
-
-config SOC
-	string
-	help
-	SoC name which can be found under arch/<arch>/soc/<soc name>.
-	This option holds the directory name used by the build system to locate
-	the correct linker and header files for the SoC. This option will go away
-	once all SoCs are using family/series structure.
-
-config SOC_SERIES
-	string
-	help
-	SoC series name which can be found under arch/<arch>/soc/<family>/<series>.
-	This option holds the directory name used by the build system to locate
-	the correct linker and header files.
-
-config SOC_FAMILY
-	string
-	help
-	SoC family name which can be found under arch/<arch>/soc/<family>.
-	This option holds the directory name used by the build system to locate
-	the correct linker and header files.
-
-config BOARD
-	string
-	help
-	This option holds the name of the board and is used to locate the files
-	related to the board in the source tree (under boards/).
-	The Board is the first location where we search for a linker.ld file,
-	if not found we look for the linker file in
-	arch/<arch>/soc/<family>/<series>
-
+menu "Interrupt Configuration"
 #
 # Interrupt related configs
 #
-
 config GEN_ISR_TABLES
 	bool
 	prompt "Use generated IRQ tables"
@@ -163,6 +139,142 @@ config GEN_IRQ_START_VECTOR
 	This is a hidden option which needs to be set per architecture and
 	left alone.
 
+
+config IRQ_OFFLOAD
+	bool "Enable IRQ offload"
+	default n
+	help
+	  Enable irq_offload() API which allows functions to be synchronously
+	  run in interrupt context. Mainly useful for test cases.
+
+endmenu # Interrupt configuration
+
+endmenu
+
+#
+# Architecture Capabilities
+#
+config ARCH_HAS_STACK_PROTECTION
+	bool
+
+config ARCH_HAS_USERSPACE
+	bool
+
+config ARCH_HAS_EXECUTABLE_PAGE_BIT
+	bool
+
+#
+# Hidden PM feature configs which are to be selected by
+# individual SoC.
+#
+config SYS_POWER_LOW_POWER_STATE_SUPPORTED
+	# Hidden
+	bool
+	default n
+	help
+	This option signifies that the target supports the SYS_POWER_LOW_POWER_STATE
+	configuration option.
+
+config SYS_POWER_DEEP_SLEEP_SUPPORTED
+	# Hidden
+	bool
+	default n
+	help
+	This option signifies that the target supports the SYS_POWER_DEEP_SLEEP
+	configuration option.
+
+config BOOTLOADER_CONTEXT_RESTORE_SUPPORTED
+	# Hidden
+	bool
+	default n
+	help
+	This option signifies that the target has options of bootloaders
+	that support context restore upon resume from deep sleep
+
+
+# End hidden CPU family configs
+#
+
+config CPU_HAS_FPU
+	bool
+	default n
+	help
+	  This option is enabled when the CPU has hardware floating point
+	  unit.
+
+config CPU_HAS_MPU
+	bool
+	# Omit prompt to signify "hidden" option
+	default n
+	help
+	  This option is enabled when the CPU has a Memory Protection Unit (MPU).
+
+menu "Floating Point Options"
+depends on CPU_HAS_FPU
+
+config FLOAT
+	bool
+	prompt "Floating point registers"
+	default n
+	help
+	This option allows threads to use the floating point registers.
+	By default, only a single thread may use the registers.
+
+	Disabling this option means that any thread that uses a
+	floating point register will get a fatal exception.
+
+config FP_SHARING
+	bool
+	prompt "Floating point register sharing"
+	depends on FLOAT
+	default n
+	help
+	This option allows multiple threads to use the floating point
+	registers.
+
+endmenu
+
+#
+# End hidden PM feature configs
+#
+
+config ARCH
+	string
+	help
+	System architecture string.
+
+config SOC
+	string
+	help
+	SoC name which can be found under arch/<arch>/soc/<soc name>.
+	This option holds the directory name used by the build system to locate
+	the correct linker and header files for the SoC. This option will go away
+	once all SoCs are using family/series structure.
+
+config SOC_SERIES
+	string
+	help
+	SoC series name which can be found under arch/<arch>/soc/<family>/<series>.
+	This option holds the directory name used by the build system to locate
+	the correct linker and header files.
+
+config SOC_FAMILY
+	string
+	help
+	SoC family name which can be found under arch/<arch>/soc/<family>.
+	This option holds the directory name used by the build system to locate
+	the correct linker and header files.
+
+config BOARD
+	string
+	help
+	This option holds the name of the board and is used to locate the files
+	related to the board in the source tree (under boards/).
+	The Board is the first location where we search for a linker.ld file,
+	if not found we look for the linker file in
+	arch/<arch>/soc/<family>/<series>
+
+
 source "arch/*/Kconfig"
 
 source "boards/Kconfig"

arch/Makefile

@@ -1 +0,0 @@
-obj-y += common/ $(ARCH)/

arch/arc/CMakeLists.txt

@@ -0,0 +1,14 @@
+# Enable debug support in mdb
+# Dwarf version 2 can be recognized by mdb
+# The default dwarf version in gdb is not recognized by mdb
+zephyr_cc_option(-g3 -gdwarf-2)
+
+# Without this (poorly named) option, compiler may generate undefined
+# references to abort().
+# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63691
+zephyr_cc_option(-fno-delete-null-pointer-checks)
+
+zephyr_cc_option_ifdef (CONFIG_LTO         -flto)
+
+add_subdirectory(soc/${SOC_PATH})
+add_subdirectory(core)

arch/arc/Kbuild

@@ -1,6 +0,0 @@
-subdir-ccflags-y +=-I$(srctree)/include/drivers
-subdir-ccflags-y +=-I$(srctree)/drivers
-subdir-asflags-y += $(subdir-ccflags-y)
-
-obj-y += soc/$(SOC_PATH)/
-obj-y += core/

arch/arc/Kconfig

@@ -24,21 +24,6 @@ config ARCH_DEFCONFIG
 	string
 	default "arch/arc/defconfig"
 
-config CPU_HAS_MPU
-	bool
-	# Omit prompt to signify "hidden" option
-	default n
-	help
-	  This option is enabled when the CPU has a Memory Protection Unit (MPU).
-
-config CPU_HAS_FPU
-	# Hidden config selected by CPU family
-	bool
-	default n
-	help
-	This option is enabled when the CPU has hardware floating point
-	unit.
-
 menu "ARC EM4 processor options"
 
 config	CPU_ARCEM4
@@ -55,6 +40,7 @@ menu "ARCv2 Family Options"
 
 config	CPU_ARCV2
 	bool
+	select		ARCH_HAS_STACK_PROTECTION
 	default y
 	help
 	  This option signifies the use of a CPU of the ARCv2 family.
@@ -104,10 +90,9 @@ config	RGF_NUM_BANKS
 	and restore general purpose registers.
 
 config	ARC_STACK_CHECKING
-	bool "Enable Stack Checking"
-	depends on CPU_ARCV2
+	bool
+	default y if HW_STACK_PROTECTION
 	select THREAD_STACK_INFO
-	default n
 	help
 	  ARCV2 has a special feature allowing to check stack overflows. This
 	  enables code that allows using this debug feature
@@ -128,14 +113,6 @@ config	FAULT_DUMP
 
 	0: Off.
 
-config IRQ_OFFLOAD
-	bool "Enable IRQ offload"
-	default n
-	help
-	Enable irq_offload() API which allows functions to be synchronously
-	run in interrupt context. Uses one entry in the	IDT.  Mainly useful
-	for test cases.
-
 config	XIP
 	default n if NSIM
 	default y
@@ -161,31 +138,6 @@ config CODE_DENSITY
 	help
 	Enable code density option to get better code density
 
-menu "Floating Point Options"
-depends on CPU_HAS_FPU
-
-config FLOAT
-	bool
-	prompt "Floating point registers"
-	default n
-	help
-	This option allows tasks and fibers to use the floating point registers.
-	By default, only a single task or fiber may use the registers.
-
-	Disabling this option means that any task or fiber that uses a
-	floating point register will get a fatal exception.
-
-config FP_SHARING
-	bool
-	prompt "Floating point register sharing"
-	depends on FLOAT
-	default n
-	help
-	This option allows multiple tasks and fibers to use the floating point
-	registers.
-
-endmenu
-
 menu "ARC MPU Options"
 depends on CPU_HAS_MPU
 
@@ -201,6 +153,7 @@ source "arch/arc/core/mpu/Kconfig"
 
 endmenu
 
+if !HAS_DTS
 config ICCM_SIZE
 	int "ICCM Size in kB"
 	help
@@ -256,6 +209,7 @@ config FLASH_BASE_ADDRESS
 	This option specifies the base address of the flash on the board.  It is
 	normally set by the board's defconfig file and the user should generally
 	avoid modifying it via the menu configuration.
+endif
 
 config CACHE_LINE_SIZE_DETECT
 	bool

arch/arc/Makefile

@@ -1,24 +0,0 @@
-# Enable debug support in mdb
-# Dwarf version 2 can be recognized by mdb
-# The default dwarf version in gdb is not recognized by mdb
-cflags-y += $(call cc-option, -g3 -gdwarf-2)
-
-cflags-y += $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-sections,)
-
-# Without this (poorly named) option, compiler may generate undefined
-# references to abort().
-# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63691
-cflags-y += $(call cc-option,-fno-delete-null-pointer-checks)
-
-cflags-$(CONFIG_LTO) = $(call cc-option,-flto,)
-
-include $(srctree)/arch/$(ARCH)/soc/$(SOC_PATH)/Makefile
-
-KBUILD_CFLAGS += $(cflags-y)
-KBUILD_CXXFLAGS += $(cflags-y)
-
-soc-cxxflags ?= $(soc-cflags)
-soc-aflags ?= $(soc-cflags)
-KBUILD_CFLAGS += $(soc-cflags)
-KBUILD_CXXFLAGS += $(soc-cxxflags)
-KBUILD_AFLAGS += $(soc-aflags)

arch/arc/core/CMakeLists.txt

@@ -0,0 +1,23 @@
+zephyr_sources(
+	thread.c
+	thread_entry_wrapper.S
+	cpu_idle.S
+	fast_irq.S
+	fatal.c
+	fault.c
+	fault_s.S
+	irq_manage.c
+	cache.c
+	timestamp.c
+	isr_wrapper.S
+	regular_irq.S
+	swap.S
+	sys_fatal_error_handler.c
+	prep_c.c
+	reset.S
+	vector_table.c
+	)
+
+zephyr_sources_if_kconfig(irq_offload.c)
+zephyr_sources_ifdef(CONFIG_ATOMIC_OPERATIONS_CUSTOM atomic.c)
+add_subdirectory_ifdef(CONFIG_CPU_HAS_MPU mpu)

arch/arc/core/Makefile

@@ -1,20 +0,0 @@
-ccflags-y += -I$(srctree)/kernel/include
-ccflags-y +=-I$(srctree)/arch/$(ARCH)/include
-
-obj-y += thread.o thread_entry_wrapper.o \
-	cpu_idle.o  fast_irq.o  fatal.o  fault.o  \
-	fault_s.o  irq_manage.o cache.o timestamp.o  \
-	isr_wrapper.o  regular_irq.o  swap.o \
-	sys_fatal_error_handler.o
-
-obj-y += prep_c.o \
-         reset.o \
-         vector_table.o
-
-obj-$(CONFIG_IRQ_OFFLOAD) += irq_offload.o
-
-# Some ARC cores like the EM4 lack the atomic LLOCK/SCOND and
-# can't use these.
-obj-$(CONFIG_ATOMIC_OPERATIONS_CUSTOM) += atomic.o
-
-obj-$(CONFIG_CPU_HAS_MPU) += mpu/

arch/arc/core/fatal.c

@@ -44,10 +44,6 @@ FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
 	case _NANO_ERR_HW_EXCEPTION:
 		break;
 
-	case _NANO_ERR_INVALID_TASK_EXIT:
-		printk("***** Invalid Exit Software Error! *****\n");
-		break;
-
 #if defined(CONFIG_STACK_CANARIES) || defined(CONFIG_ARC_STACK_CHECKING)
 	case _NANO_ERR_STACK_CHK_FAIL:
 		printk("***** Stack Check Fail! *****\n");

arch/arc/core/irq_manage.c

@@ -24,6 +24,7 @@
 #include <linker/sections.h>
 #include <sw_isr_table.h>
 #include <irq.h>
+#include <misc/printk.h>
 
 /*
  * @brief Enable an interrupt line
@@ -95,7 +96,6 @@ void _irq_priority_set(unsigned int irq, unsigned int prio, u32_t flags)
  * @return N/A
  */
 
-#include <misc/printk.h>
 void _irq_spurious(void *unused)
 {
 	ARG_UNUSED(unused);

arch/arc/core/isr_wrapper.S

@@ -120,8 +120,8 @@ registers (to avoid stack accesses). It is possible to register a FIRQ
 handler that operates outside of the kernel, but care must be taken to only
 use instructions that only use the banked registers.
 
-The kernel is able to handle transitions to and from FIRQ, RIRQ and threads
-(fibers/task). The contexts are saved 'lazily': the minimum amount of work is
+The kernel is able to handle transitions to and from FIRQ, RIRQ and threads.
+The contexts are saved 'lazily': the minimum amount of work is
 done upfront, and the rest is done when needed:
 
 o RIRQ
@@ -129,7 +129,7 @@ o RIRQ
   All needed regisers to run C code in the ISR are saved automatically
   on the outgoing thread's stack: loop, status32, pc, and the caller-
   saved GPRs. That stack frame layout is pre-determined. If returning
-  to a fiber, the stack is popped and no registers have to be saved by
+  to a thread, the stack is popped and no registers have to be saved by
   the kernel. If a context switch is required, the callee-saved GPRs
   are then saved in the thread control structure (TCS).
 
@@ -151,7 +151,7 @@ o FIRQ
   During early initialization, the sp in the 2nd register bank is made to
   refer to _firq_stack. This allows for the FIRQ handler to use its own stack.
   GPRs are banked, loop registers are saved in unused callee saved regs upon
-  interrupt entry. If returning to a fiber, loop registers are restored and the
+  interrupt entry. If returning to a thread, loop registers are restored and the
   CPU switches back to bank 0 for the GPRs. If a context switch is
   needed, at this point only are all the registers saved. First, a
   stack frame with the same layout as the automatic RIRQ one is created

arch/arc/core/mpu/CMakeLists.txt

@@ -0,0 +1,2 @@
+zephyr_sources_if_kconfig(arc_core_mpu.c)
+zephyr_sources_if_kconfig(arc_mpu.c)

arch/arc/core/mpu/Makefile

@@ -1,2 +0,0 @@
-obj-$(CONFIG_ARC_CORE_MPU) += arc_core_mpu.o
-obj-$(CONFIG_ARC_MPU) += arc_mpu.o

arch/arc/core/reset.S

@@ -11,7 +11,6 @@
  * Reset handler that prepares the system for running C code.
  */
 
-// #include <board.h>
 #include <toolchain.h>
 #include <linker/sections.h>
 #include <arch/cpu.h>

arch/arc/core/thread.c

@@ -54,8 +54,8 @@ struct init_stack_frame {
  *
  * @return N/A
  */
-void _new_thread(struct k_thread *thread, k_thread_stack_t stack,
-		 size_t stackSize, _thread_entry_t pEntry,
+void _new_thread(struct k_thread *thread, k_thread_stack_t *stack,
+		 size_t stackSize, k_thread_entry_t pEntry,
 		 void *parameter1, void *parameter2, void *parameter3,
 		 int priority, unsigned int options)
 {

arch/arc/include/kernel_arch_thread.h

@@ -8,7 +8,7 @@
  * @file
  * @brief Per-arch thread definition
  *
- * This file contains defintions for
+ * This file contains definitions for
  *
  *  struct _thread_arch
  *  struct _callee_saved
@@ -21,8 +21,8 @@
 #define _kernel_arch_thread__h_
 
 /*
- * Reason a thread has relinquished control: fibers can only be in the NONE
- * or COOP state, tasks can be one in the four.
+ * Reason a thread has relinquished control: threads can only be in the NONE
+ * or COOP state, threads can be one in the four.
  */
 #define _CAUSE_NONE 0
 #define _CAUSE_COOP 1

arch/arc/soc/em11d/CMakeLists.txt

@@ -0,0 +1,14 @@
+zephyr_library_include_directories(${PROJECT_SOURCE_DIR}/drivers)
+
+zephyr_cc_option(-mcpu=em4_fpuda -mno-sdata -mdiv-rem -mswap -mnorm)
+zephyr_cc_option(-mmpy-option=6 -mbarrel-shifter)
+zephyr_cc_option(--param l1-cache-size=16384)
+zephyr_cc_option(--param l1-cache-line-size=32)
+zephyr_cc_option_ifdef(CONFIG_CODE_DENSITY -mcode-density)
+zephyr_cc_option_ifdef(CONFIG_FLOAT -mfpu=fpuda_all)
+
+
+zephyr_sources(
+  soc.c
+  soc_config.c
+  )

arch/arc/soc/em11d/Kbuild

@@ -1,8 +0,0 @@
-ccflags-y +=-I$(srctree)/arch/arc/soc/
-ccflags-y +=-I$(srctree)/include
-ccflags-y +=-I$(srctree)/include/drivers
-ccflags-y +=-I$(srctree)/drivers
-
-asflags-y := ${ccflags-y}
-
-obj-y = soc.o soc_config.o

arch/arc/soc/em11d/Makefile

@@ -1,16 +0,0 @@
-#  -mcpu=em4_fpuda is added to KBUILD_CFLAGS to make cc-option check the options correctly
-KBUILD_CFLAGS += -mcpu=em4_fpuda
-
-soc-cflags += $(call cc-option, -mcpu=em4_fpuda -mno-sdata -mdiv-rem -mswap -mnorm) \
-		$(call cc-option,-mmpy-option=6 -mbarrel-shifter) \
-		$(call cc-option,--param l1-cache-size=16384) \
-		$(call cc-option,--param l1-cache-line-size=32)
-
-ifeq ($(CONFIG_CODE_DENSITY), y)
-soc-cflags += $(call cc-option, -mcode-density)
-endif
-
-ifeq ($(CONFIG_FLOAT), y)
-soc-cflags += $(call cc-option, -mfpu=fpuda_all)
-endif
-

arch/arc/soc/em11d/soc.h

@@ -31,7 +31,7 @@
 #ifndef _ASMLANGUAGE
 
 #include <misc/util.h>
-#include <drivers/rand32.h>
+#include <random/rand32.h>
 
 #define ARCV2_TIMER0_INT_LVL			IRQ_TIMER0
 #define ARCV2_TIMER0_INT_PRI			0

arch/arc/soc/em7d/CMakeLists.txt

@@ -0,0 +1,21 @@
+zephyr_library_include_directories(${PROJECT_SOURCE_DIR}/drivers)
+
+zephyr_cc_option(-mcpu=em4_dmips -mno-sdata)
+zephyr_cc_option(-mdiv-rem -mswap -mnorm)
+zephyr_cc_option(-mmpy-option=6 -mbarrel-shifter)
+zephyr_cc_option(--param l1-cache-size=16384)
+zephyr_cc_option(--param l1-cache-line-size=32)
+
+zephyr_cc_option_ifdef(CONFIG_CODE_DENSITY -mcode-density)
+
+if(CONFIG_BOARD_EM_STARTERKIT_R23)
+  message(FATAL "em7d from em starterkit 2.3 is not supported")
+endif()
+
+
+zephyr_sources(
+  soc.c
+  soc_config.c
+  )
+
+zephyr_sources_ifdef(CONFIG_ARC_MPU_ENABLE arc_mpu_regions.c)

arch/arc/soc/em7d/Kbuild

@@ -1,10 +0,0 @@
-ccflags-y +=-I$(srctree)/arch/arc/soc/
-ccflags-y +=-I$(srctree)/include
-ccflags-y +=-I$(srctree)/include/drivers
-ccflags-y +=-I$(srctree)/drivers
-
-asflags-y := ${ccflags-y}
-
-obj-y += soc.o soc_config.o
-
-obj-$(CONFIG_ARC_MPU_ENABLE) += arc_mpu_regions.o

arch/arc/soc/em7d/Makefile

@@ -1,16 +0,0 @@
-#  -mcpu=em4_dmips is added to KBUILD_CFLAGS to make cc-option check the options correctly
-KBUILD_CFLAGS += -mcpu=em4_dmips
-
-soc-cflags += $(call cc-option,-mcpu=em4_dmips -mno-sdata) \
-		$(call cc-option,-mdiv-rem -mswap -mnorm) \
-		$(call cc-option,-mmpy-option=6 -mbarrel-shifter) \
-		$(call cc-option,--param l1-cache-size=16384) \
-		$(call cc-option,--param l1-cache-line-size=32)
-
-ifeq ($(CONFIG_CODE_DENSITY), y)
-soc-cflags += $(call cc-option,-mcode-density)
-endif
-
-ifeq ($(CONFIG_BOARD_EM_STARTERKIT_R23), y)
-$(error em7d from em starterkit 2.3 is not supported)
-endif

arch/arc/soc/em7d/arc_mpu_regions.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
- #include <soc.h>
- #include <arch/arc/v2/mpu/arc_mpu.h>
+#include <soc.h>
+#include <arch/arc/v2/mpu/arc_mpu.h>
 
 static struct arc_mpu_region mpu_regions[] = {
 #if CONFIG_ICCM_SIZE > 0

arch/arc/soc/em7d/soc.h

@@ -40,7 +40,7 @@
 #ifndef _ASMLANGUAGE
 
 #include <misc/util.h>
-#include <drivers/rand32.h>
+#include <random/rand32.h>
 
 #define ARCV2_TIMER0_INT_LVL			IRQ_TIMER0
 #define ARCV2_TIMER0_INT_PRI			0

arch/arc/soc/em9d/CMakeLists.txt

@@ -0,0 +1,14 @@
+zephyr_library_include_directories(${PROJECT_SOURCE_DIR}/drivers)
+
+zephyr_cc_option(-mcpu=em4_fpus -mno-sdata -mdiv-rem -mswap -mnorm)
+zephyr_cc_option(-mdiv-rem -mswap -mnorm)
+zephyr_cc_option(-mmpy-option=6 -mbarrel-shifter)
+
+zephyr_cc_option_ifdef(CONFIG_CODE_DENSITY -mcode-density)
+zephyr_cc_option_ifdef(CONFIG_FLOAT -mfpu=fpuda_all)
+
+
+zephyr_sources(
+  soc.c
+  soc_config.c
+  )

arch/arc/soc/em9d/Kbuild

@@ -1,8 +0,0 @@
-ccflags-y +=-I$(srctree)/arch/arc/soc/
-ccflags-y +=-I$(srctree)/include
-ccflags-y +=-I$(srctree)/include/drivers
-ccflags-y +=-I$(srctree)/drivers
-
-asflags-y := ${ccflags-y}
-
-obj-y = soc.o soc_config.o

arch/arc/soc/em9d/Makefile

@@ -1,14 +0,0 @@
-#  -mcpu=em4_dmips is added to KBUILD_CFLAGS to make cc-option check the options correctly
-KBUILD_CFLAGS += -mcpu=em4_fpus
-
-soc-cflags += $(call cc-option,-mcpu=em4_fpus -mno-sdata) \
-		$(call cc-option,-mdiv-rem -mswap -mnorm) \
-		$(call cc-option,-mmpy-option=6 -mbarrel-shifter)
-
-ifeq ($(CONFIG_CODE_DENSITY), y)
-soc-cflags += $(call cc-option,-mcode-density)
-endif
-
-ifeq ($(CONFIG_FLOAT), y)
-soc-cflags += $(call cc-option,-mfpu=fpus_all)
-endif

arch/arc/soc/em9d/soc.h

@@ -31,7 +31,7 @@
 #ifndef _ASMLANGUAGE
 
 #include <misc/util.h>
-#include <drivers/rand32.h>
+#include <random/rand32.h>
 
 #define ARCV2_TIMER0_INT_LVL			IRQ_TIMER0
 #define ARCV2_TIMER0_INT_PRI			0

arch/arc/soc/quark_se_c1000_ss/CMakeLists.txt

@@ -0,0 +1,17 @@
+zephyr_library_include_directories(${PROJECT_SOURCE_DIR}/drivers)
+zephyr_include_directories(${PROJECT_SOURCE_DIR}/arch/x86/soc/intel_quark)
+
+zephyr_cc_option(-mcpu=quarkse_em -mno-sdata)
+
+zephyr_compile_definitions_ifdef(
+  CONFIG_SOC_QUARK_SE_C1000_SS
+  QM_SENSOR=1
+  SOC_SERIES=quark_se
+  )
+
+zephyr_sources(
+  soc.c
+  soc_config.c
+  power.c
+  soc_power.S
+  )

arch/arc/soc/quark_se_c1000_ss/Kbuild

@@ -1,8 +0,0 @@
-ccflags-y +=-I$(srctree)/include
-ccflags-y +=-I$(srctree)/include/drivers
-ccflags-y +=-I$(srctree)/drivers
-ccflags-$(CONFIG_ADC) +=-I$(srctree)/drivers/adc
-
-asflags-y := ${ccflags-y}
-
-obj-y = soc.o soc_config.o soc_power.o power.o

arch/arc/soc/quark_se_c1000_ss/Kconfig.defconfig

@@ -28,6 +28,7 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 config HARVARD
 	def_bool n
 
+if !HAS_DTS
 config FLASH_BASE_ADDRESS
 	default 0x40000000
 
@@ -40,7 +41,7 @@ config SRAM_BASE_ADDRESS
 
 config SRAM_SIZE
 	default 16 if NSIM
-	default 24
+	default 27
 
 config ICCM_BASE_ADDRESS
 	default 0xFFFFFFFF
@@ -53,6 +54,7 @@ config DCCM_BASE_ADDRESS
 
 config DCCM_SIZE
 	default 8
+endif
 
 config QMSI
 	def_bool y
@@ -266,7 +268,7 @@ endif # UART_QMSI_1
 
 endif # UART_QMSI
 
-if UART_CONSOLE
+if UART_CONSOLE && !HAS_DTS
 
 config UART_CONSOLE_ON_DEV_NAME
 	default "UART_1"

arch/arc/soc/quark_se_c1000_ss/Makefile

@@ -1,10 +0,0 @@
-soc-cflags = $(call cc-option,-mcpu=quarkse_em) \
-             $(call cc-option,-mno-sdata)
-
-soc-aflags = $(soc-cflags)
-soc-cxxflags = $(soc-cflags)
-soc-cflags += -DQM_SENSOR=1
-soc-cflags += -I$(srctree)/arch/x86/soc/intel_quark
-
-## FIXME
-SOC_SERIES = quark_se

arch/arc/soc/quark_se_c1000_ss/linker.ld

@@ -26,4 +26,5 @@
 #define DCCM_START		CONFIG_DCCM_BASE_ADDRESS
 #define DCCM_SIZE		CONFIG_DCCM_SIZE
 
+#include <generated_dts_board.h>
 #include <arch/arc/v2/linker.ld>

arch/arc/soc/quark_se_c1000_ss/soc.h

@@ -105,7 +105,7 @@
 #ifndef _ASMLANGUAGE
 
 #include <misc/util.h>
-#include <drivers/rand32.h>
+#include <random/rand32.h>
 #include <quark_se/shared_mem.h>
 
 #define INT_ENABLE_ARC					~(0x00000001 << 8)

arch/arm/CMakeLists.txt

@@ -0,0 +1,21 @@
+zephyr_cc_option_ifdef(CONFIG_LTO -flto)
+
+set(ARCH_FOR_cortex-m0     armv6-m     )
+set(ARCH_FOR_cortex-m0plus armv6-m     )
+set(ARCH_FOR_cortex-m3     armv7-m     )
+set(ARCH_FOR_cortex-m4     armv7e-m    )
+set(ARCH_FOR_cortex-m23    armv8-m.base)
+set(ARCH_FOR_cortex-m33    armv8-m.main)
+
+if(${ARCH_FOR_${GCC_M_CPU}})
+    set(ARCH_FLAG -march=${ARCH_FOR_${GCC_M_CPU}})
+endif()
+
+zephyr_compile_options(
+  -mabi=aapcs
+  ${TOOLCHAIN_C_FLAGS}
+  ${ARCH_FLAG}
+  )
+
+add_subdirectory(soc)
+add_subdirectory(core)

arch/arm/Kbuild

@@ -1,11 +0,0 @@
-subdir-ccflags-y +=-I$(srctree)/include/drivers
-subdir-ccflags-y +=-I$(srctree)/drivers
-subdir-asflags-y := ${subdir-ccflags-y}
-
-ifneq ($(SOC_FAMILY),)
-obj-y += soc/$(SOC_FAMILY)/
-else
-obj-y += soc/$(SOC_PATH)/
-endif
-
-obj-y += core/

arch/arm/Makefile

@@ -1,59 +0,0 @@
-KBUILD_CFLAGS += $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-sections,)
-
-include $(srctree)/arch/$(ARCH)/soc/$(SOC_PATH)/Makefile
-
-cflags-$(CONFIG_LTO) += $(call cc-option,-flto,)
-
-cflags-cortex-m0 = $(call cc-option,-mabi=aapcs -mthumb -mcpu=cortex-m0) \
-			$(call cc-option,-mthumb -march=armv6-m)
-cflags-cortex-m0+ = $(call cc-option,-mabi=aapcs -mthumb -mcpu=cortex-m0plus) \
-			$(call cc-option,-mthumb -march=armv6-m)
-cflags-cortex-m1 = $(call cc-option,-mabi=aapcs -mthumb -mcpu=cortex-m1) \
-			$(call cc-option,-mthumb -march=armv6-m)
-cflags-cortex-m3 = $(call cc-option,-mabi=aapcs -mthumb -mcpu=cortex-m3) \
-			$(call cc-option,-mthumb -march=armv7-m)
-cflags-cortex-m4 = $(call cc-option,-mabi=aapcs -mthumb -mcpu=cortex-m4) \
-			$(call cc-option,-mthumb -march=armv7e-m)
-cflags-cortex-m7 = $(call cc-option,-mabi=aapcs -mthumb -mcpu=cortex-m7)
-
-ifeq ($(CONFIG_FLOAT), y)
-ifeq ($(CONFIG_FP_SOFTABI), y)
-cflags-cortex-m4 += $(call cc-option,-mfloat-abi=softfp -mfpu=fpv4-sp-d16)
-cflags-cortex-m7 += $(call cc-option,-mfloat-abi=softfp -mfpu=fpv5-d16)
-endif
-ifeq ($(CONFIG_FP_HARDABI), y)
-cflags-cortex-m4 += $(call cc-option,-mfloat-abi=hard -mfpu=fpv4-sp-d16)
-cflags-cortex-m7 += $(call cc-option,-mfloat-abi=hard -mfpu=fpv5-d16)
-endif
-endif
-
-aflags-$(CONFIG_CPU_CORTEX_M0) += $(cflags-cortex-m0)
-cflags-$(CONFIG_CPU_CORTEX_M0) += $(cflags-cortex-m0)
-cxxflags-$(CONFIG_CPU_CORTEX_M0) += $(cflags-cortex-m0)
-
-aflags-$(CONFIG_CPU_CORTEX_M0PLUS) += $(cflags-cortex-m0+)
-cflags-$(CONFIG_CPU_CORTEX_M0PLUS) += $(cflags-cortex-m0+)
-cxxflags-$(CONFIG_CPU_CORTEX_M0PLUS) += $(cflags-cortex-m0+)
-
-aflags-$(CONFIG_CPU_CORTEX_M3) += $(cflags-cortex-m3)
-cflags-$(CONFIG_CPU_CORTEX_M3) += $(cflags-cortex-m3)
-cxxflags-$(CONFIG_CPU_CORTEX_M3) += $(cflags-cortex-m3)
-
-aflags-$(CONFIG_CPU_CORTEX_M4) += $(cflags-cortex-m4)
-cflags-$(CONFIG_CPU_CORTEX_M4) += $(cflags-cortex-m4)
-cxxflags-$(CONFIG_CPU_CORTEX_M4) += $(cflags-cortex-m4)
-
-aflags-$(CONFIG_CPU_CORTEX_M7) += $(cflags-cortex-m7)
-cflags-$(CONFIG_CPU_CORTEX_M7) += $(cflags-cortex-m7)
-cxxflags-$(CONFIG_CPU_CORTEX_M7) += $(cflags-cortex-m7)
-
-KBUILD_AFLAGS += $(aflags-y)
-KBUILD_CFLAGS += $(cflags-y)
-KBUILD_CXXFLAGS += $(cflags-y)
-
-soc-cxxflags ?= $(soc-cflags)
-soc-aflags ?= $(soc-cflags)
-KBUILD_CFLAGS += $(soc-cflags)
-KBUILD_CXXFLAGS += $(soc-cxxflags)
-KBUILD_AFLAGS += $(soc-aflags)
-

arch/arm/core/CMakeLists.txt

@@ -0,0 +1,20 @@
+zephyr_sources(
+  exc_exit.S
+  irq_init.c
+  swap.S
+  fault.c
+  irq_manage.c
+  thread.c
+  cpu_idle.S
+  fault_s.S
+  fatal.c
+  sys_fatal_error_handler.c
+  thread_abort.c
+)
+
+zephyr_sources_ifdef(CONFIG_GEN_SW_ISR_TABLE isr_wrapper.S)
+zephyr_sources_ifdef(CONFIG_CPLUSPLUS __aeabi_atexit.c)
+zephyr_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c)
+
+add_subdirectory_ifdef(CONFIG_CPU_CORTEX_M cortex_m)
+add_subdirectory_ifdef(CONFIG_CPU_HAS_MPU  cortex_m/mpu)

arch/arm/core/Kconfig

@@ -22,6 +22,8 @@ config CPU_CORTEX_M
 	select HAS_CMSIS
 	select HAS_FLASH_LOAD_OFFSET
 	select HAS_DTS
+	select ARCH_HAS_STACK_PROTECTION if ARM_CORE_MPU
+	select ARCH_HAS_USERSPACE if ARM_CORE_MPU
 	help
 	This option signifies the use of a CPU of the Cortex-M family.
 
@@ -32,44 +34,25 @@ config CPU_HAS_SYSTICK
 	help
 	This option is enabled when the CPU has systick timer implemented.
 
-config CPU_HAS_MPU
+config ARM_STACK_PROTECTION
 	bool
-	# Omit prompt to signify "hidden" option
-	default n
+	default y if HW_STACK_PROTECTION
+	select MPU_STACK_GUARD if ARM_CORE_MPU
 	help
-	  This option is enabled when the CPU has a Memory Protection Unit (MPU).
+	This option enables MPU stack guard to cause a system fatal error
+	if the bounds of the current process stack are overflowed.
 
-config CPU_HAS_FPU
-	# Hidden config selected by CPU family
+config ARM_USERSPACE
 	bool
-	default n
+	default y if USERSPACE
 	help
-	This option is enabled when the CPU has a hardware floating point
-	unit.
+	This option enables APIs to drop a thread's privileges,	supporting
+	user-level threads that are protected from each other and from
+	crashing the kernel.
 
-menu "Floating Point Options"
+menu "Architectue Floating Point Options"
 depends on CPU_HAS_FPU
 
-config	FLOAT
-	bool
-	prompt "Floating point registers"
-	default n
-	help
-	This option allows tasks and fibers to use the floating point registers.
-	By default, only a single task or fiber may use the registers.
-
-	Disabling this option means that any task or fiber that uses a
-	floating point register will get a fatal exception.
-
-config	FP_SHARING
-	bool
-	prompt "Floating point register sharing"
-	depends on FLOAT
-	default n
-	help
-	This option allows multiple tasks and fibers to use the floating point
-	registers.
-
 choice
 	prompt "Floating point ABI"
 	default FP_HARDABI

arch/arm/core/Makefile

@@ -1,11 +0,0 @@
-ccflags-y += -I$(srctree)/kernel/include
-asflags-y := ${ccflags-y}
-
-obj-y = exc_exit.o irq_init.o swap.o fault.o irq_manage.o thread.o \
-	cpu_idle.o fault_s.o fatal.o sys_fatal_error_handler.o thread_abort.o
-
-obj-$(CONFIG_GEN_SW_ISR_TABLE) += isr_wrapper.o
-obj-$(CONFIG_CPLUSPLUS) += __aeabi_atexit.o
-obj-$(CONFIG_IRQ_OFFLOAD) += irq_offload.o
-obj-$(CONFIG_CPU_CORTEX_M) += cortex_m/
-obj-$(CONFIG_CPU_HAS_MPU) += cortex_m/mpu/

arch/arm/core/cortex_m/CMakeLists.txt

@@ -0,0 +1,9 @@
+zephyr_sources(
+  vector_table.S
+  reset.S
+  nmi_on_reset.S
+  prep_c.c
+  scb.c
+  nmi.c
+  exc_manage.c
+  )

arch/arm/core/cortex_m/Kconfig

@@ -163,14 +163,6 @@ endmenu
 menu "ARM Cortex-M0/M0+/M3/M4/M7 options"
 	depends on ARMV6_M || ARMV7_M
 
-config IRQ_OFFLOAD
-	bool "Enable IRQ offload"
-	default n
-	help
-	Enable irq_offload() API which allows functions to be synchronously
-	run in interrupt context. Adds some overhead to context switching.
-	Mainly useful for test cases.
-
 config GEN_ISR_TABLES
 	default y
 

arch/arm/core/cortex_m/Makefile

@@ -1,11 +0,0 @@
-ccflags-y +=-I$(srctree)/include/drivers
-ccflags-y +=-I$(srctree)/arch/arm/soc/$(SOC_PATH)
-ccflags-y +=-I$(srctree)/kernel/include
-ccflags-y +=-I$(srctree)/include/
-
-asflags-y = $(ccflags-y)
-
-obj-y = vector_table.o reset.o \
-	nmi_on_reset.o prep_c.o scb.o nmi.o \
-	exc_manage.o
-

arch/arm/core/cortex_m/mpu/CMakeLists.txt

@@ -0,0 +1,3 @@
+zephyr_sources_ifdef(CONFIG_ARM_CORE_MPU arm_core_mpu.c)
+zephyr_sources_if_kconfig(               arm_mpu.c)
+zephyr_sources_if_kconfig(               nxp_mpu.c)

arch/arm/core/cortex_m/mpu/Kconfig

@@ -24,8 +24,9 @@ config MPU_STACK_GUARD
 config ARM_MPU
 	bool "ARM MPU Support"
 	depends on CPU_HAS_MPU
-	depends on SOC_FAMILY_ARM || SOC_FAMILY_STM32 || SOC_FAMILY_NRF5
+	depends on SOC_FAMILY_ARM || SOC_FAMILY_STM32 || SOC_FAMILY_NRF5 || SOC_FAMILY_IMX
 	select ARM_CORE_MPU
+	select ARCH_HAS_EXECUTABLE_PAGE_BIT
 	default n
 	help
 	  MCU has ARM MPU
@@ -35,6 +36,7 @@ config NXP_MPU
 	depends on CPU_HAS_MPU
 	depends on SOC_FAMILY_KINETIS
 	select ARM_CORE_MPU
+	select ARCH_HAS_EXECUTABLE_PAGE_BIT
 	default n
 	help
 	  MCU has NXP MPU

arch/arm/core/cortex_m/mpu/Makefile

@@ -1,3 +0,0 @@
-obj-$(CONFIG_ARM_CORE_MPU) += arm_core_mpu.o
-obj-$(CONFIG_ARM_MPU) += arm_mpu.o
-obj-$(CONFIG_NXP_MPU) += nxp_mpu.o

arch/arm/core/cortex_m/mpu/arm_core_mpu.c

@@ -10,6 +10,7 @@
 #include <soc.h>
 #include <arch/arm/cortex_m/cmsis.h>
 #include <arch/arm/cortex_m/mpu/arm_core_mpu.h>
+#include <logging/sys_log.h>
 
 #if defined(CONFIG_MPU_STACK_GUARD)
 /*
@@ -29,3 +30,61 @@ void configure_mpu_stack_guard(struct k_thread *thread)
 	arm_core_mpu_enable();
 }
 #endif
+
+#if defined(CONFIG_USERSPACE)
+/*
+ * @brief Configure MPU memory domain
+ *
+ * This function configures per thread memory domain reprogramming the MPU.
+ * The functionality is meant to be used during context switch.
+ *
+ * @param thread thread info data structure.
+ */
+void configure_mpu_mem_domain(struct k_thread *thread)
+{
+	SYS_LOG_DBG("configure thread %p's domain", thread);
+	arm_core_mpu_disable();
+	arm_core_mpu_configure_mem_domain(thread->mem_domain_info.mem_domain);
+	arm_core_mpu_enable();
+}
+
+int _arch_mem_domain_max_partitions_get(void)
+{
+	return arm_core_mpu_get_max_domain_partition_regions();
+}
+
+/*
+ * Reset MPU region for a single memory partition
+ */
+void _arch_mem_domain_partition_remove(struct k_mem_domain *domain,
+				       u32_t  partition_id)
+{
+	ARG_UNUSED(domain);
+
+	arm_core_mpu_disable();
+	arm_core_mpu_mem_partition_remove(partition_id);
+	arm_core_mpu_enable();
+
+}
+
+/*
+ * Destroy MPU regions for the mem domain
+ */
+void _arch_mem_domain_destroy(struct k_mem_domain *domain)
+{
+	ARG_UNUSED(domain);
+
+	arm_core_mpu_disable();
+	arm_core_mpu_configure_mem_domain(NULL);
+	arm_core_mpu_enable();
+}
+
+/*
+ * Validate the given buffer is user accessible or not
+ */
+int _arch_buffer_validate(void *addr, size_t size, int write)
+{
+	return arm_core_mpu_buffer_validate(addr, size, write);
+}
+
+#endif

arch/arm/core/cortex_m/mpu/arm_mpu.c

@@ -69,6 +69,127 @@ static void _region_init(u32_t index, u32_t region_addr,
 	ARM_MPU_DEV->rasr = region_attr | REGION_ENABLE;
 }
 
+/**
+ * This internal function is utilized by the MPU driver to parse the intent
+ * type (i.e. THREAD_STACK_REGION) and return the correct region index.
+ */
+static inline u32_t _get_region_index_by_type(u32_t type)
+{
+	/*
+	 * The new MPU regions are allocated per type after the statically
+	 * configured regions. The type is one-indexed rather than
+	 * zero-indexed, therefore we need to subtract by one to get the region
+	 * index.
+	 */
+	switch (type) {
+	case THREAD_STACK_REGION:
+		return mpu_config.num_regions + type - 1;
+	case THREAD_STACK_GUARD_REGION:
+		return mpu_config.num_regions + type - 1;
+	case THREAD_DOMAIN_PARTITION_REGION:
+#if defined(CONFIG_MPU_STACK_GUARD)
+		return mpu_config.num_regions + type - 1;
+#else
+		/*
+		 * Start domain partition region from stack guard region
+		 * since stack guard is not enabled.
+		 */
+		return mpu_config.num_regions + type - 2;
+#endif
+	default:
+		__ASSERT(0, "Unsupported type");
+		return 0;
+	}
+}
+
+static inline u32_t round_up_to_next_power_of_two(u32_t v)
+{
+	v--;
+	v |= v >> 1;
+	v |= v >> 2;
+	v |= v >> 4;
+	v |= v >> 8;
+	v |= v >> 16;
+	v++;
+
+	return v;
+}
+
+/**
+ * This internal function converts the region size to
+ * the SIZE field value of MPU_RASR.
+ */
+static inline u32_t _size_to_mpu_rasr_size(u32_t size)
+{
+	/* The minimal supported region size is 32 bytes */
+	if (size <= 32) {
+		return REGION_32B;
+	}
+
+	/*
+	 * A size value greater than 2^31 could not be handled by
+	 * round_up_to_next_power_of_two() properly. We handle
+	 * it separately here.
+	 */
+	if (size > (1 << 31)) {
+		return REGION_4G;
+	}
+
+	size = round_up_to_next_power_of_two(size);
+
+	return (find_msb_set(size) - 2) << 1;
+}
+
+/**
+ * This internal function check if region is enabled or not
+ */
+static inline int _is_enabled_region(u32_t r_index)
+{
+	ARM_MPU_DEV->rnr = r_index;
+
+	return ARM_MPU_DEV->rasr & REGION_ENABLE_MASK;
+}
+
+/**
+ * This internal function check if the given buffer in in the region
+ */
+static inline int _is_in_region(u32_t r_index, u32_t start, u32_t size)
+{
+	u32_t r_addr_start;
+	u32_t r_size_lshift;
+	u32_t r_addr_end;
+
+	ARM_MPU_DEV->rnr = r_index;
+	r_addr_start = ARM_MPU_DEV->rbar & REGION_BASE_ADDR_MASK;
+	r_size_lshift = ((ARM_MPU_DEV->rasr & REGION_SIZE_MASK) >>
+			REGION_SIZE_OFFSET) + 1;
+	r_addr_end = r_addr_start + (1 << r_size_lshift) - 1;
+
+	if (start >= r_addr_start && (start + size - 1) <= r_addr_end) {
+		return 1;
+	}
+
+	return 0;
+}
+
+/**
+ * This internal function check if the region is user accessible or not
+ */
+static inline int _is_user_accessible_region(u32_t r_index, int write)
+{
+	u32_t r_ap;
+
+	ARM_MPU_DEV->rnr = r_index;
+	r_ap = ARM_MPU_DEV->rasr & ACCESS_PERMS_MASK;
+
+	if (write) {
+		return r_ap == P_RW_U_RW;
+	}
+
+	/* For all user accessible permissions, their AP[1] bit is l */
+	return r_ap & (0x2 << ACCESS_PERMS_OFFSET);
+}
+
 /* ARM Core MPU Driver API Implementation for ARM MPU */
 
 /**
@@ -107,13 +228,7 @@ void arm_core_mpu_disable(void)
 void arm_core_mpu_configure(u8_t type, u32_t base, u32_t size)
 {
 	SYS_LOG_DBG("Region info: 0x%x 0x%x", base, size);
-	/*
-	 * The new MPU regions are allocated per type after the statically
-	 * configured regions. The type is one-indexed rather than
-	 * zero-indexed, therefore we need to subtract by one to get the region
-	 * index.
-	 */
-	u32_t region_index = mpu_config.num_regions + type - 1;
+	u32_t region_index = _get_region_index_by_type(type);
 	u32_t region_attr = _get_region_attr_by_type(type, size);
 
 	/* ARM MPU supports up to 16 Regions */
@@ -124,6 +239,140 @@ void arm_core_mpu_configure(u8_t type, u32_t base, u32_t size)
 	_region_init(region_index, base, region_attr);
 }
 
+#if defined(CONFIG_USERSPACE)
+/**
+ * @brief configure MPU regions for the memory partitions of the memory domain
+ *
+ * @param   mem_domain    memory domain that thread belongs to
+ */
+void arm_core_mpu_configure_mem_domain(struct k_mem_domain *mem_domain)
+{
+	u32_t region_index =
+		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
+	u32_t region_attr;
+	u32_t num_partitions;
+	struct k_mem_partition *pparts;
+
+	if (mem_domain) {
+		SYS_LOG_DBG("configure domain: %p", mem_domain);
+		num_partitions = mem_domain->num_partitions;
+		pparts = mem_domain->partitions;
+	} else {
+		SYS_LOG_DBG("disable domain partition regions");
+		num_partitions = 0;
+		pparts = NULL;
+	}
+
+	for (; region_index < _get_num_regions(); region_index++) {
+		if (num_partitions && pparts->size) {
+			SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
+				    region_index, pparts->start, pparts->size);
+			region_attr = pparts->attr |
+				      _size_to_mpu_rasr_size(pparts->size);
+			_region_init(region_index, pparts->start, region_attr);
+			num_partitions--;
+		} else {
+			SYS_LOG_DBG("disable region 0x%x", region_index);
+			/* Disable region */
+			ARM_MPU_DEV->rnr = region_index;
+			ARM_MPU_DEV->rbar = 0;
+			ARM_MPU_DEV->rasr = 0;
+		}
+		pparts++;
+	}
+}
+
+/**
+ * @brief configure MPU region for a single memory partition
+ *
+ * @param   part_index  memory partition index
+ * @param   part        memory partition info
+ */
+void arm_core_mpu_configure_mem_partition(u32_t part_index,
+					  struct k_mem_partition *part)
+{
+	u32_t region_index =
+		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
+	u32_t region_attr;
+
+	SYS_LOG_DBG("configure partition index: %u", part_index);
+
+	if (part) {
+		SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
+			    region_index + part_index, part->start, part->size);
+		region_attr = part->attr | _size_to_mpu_rasr_size(part->size);
+		_region_init(region_index + part_index, part->start,
+			     region_attr);
+	} else {
+		SYS_LOG_DBG("disable region 0x%x", region_index + part_index);
+		/* Disable region */
+		ARM_MPU_DEV->rnr = region_index + part_index;
+		ARM_MPU_DEV->rbar = 0;
+		ARM_MPU_DEV->rasr = 0;
+	}
+}
+
+/**
+ * @brief Reset MPU region for a single memory partition
+ *
+ * @param   part_index  memory partition index
+ */
+void arm_core_mpu_mem_partition_remove(u32_t part_index)
+{
+	u32_t region_index =
+		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
+
+	SYS_LOG_DBG("disable region 0x%x", region_index + part_index);
+	/* Disable region */
+	ARM_MPU_DEV->rnr = region_index + part_index;
+	ARM_MPU_DEV->rbar = 0;
+	ARM_MPU_DEV->rasr = 0;
+}
+
+/**
+ * @brief get the maximum number of free regions for memory domain partitions
+ */
+int arm_core_mpu_get_max_domain_partition_regions(void)
+{
+	/*
+	 * Subtract the start of domain partition regions from total regions
+	 * will get the maximum number of free regions for memory domain
+	 * partitions.
+	 */
+	return _get_num_regions() -
+		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
+}
+
+/**
+ * @brief validate the given buffer is user accessible or not
+ */
+int arm_core_mpu_buffer_validate(void *addr, size_t size, int write)
+{
+	u32_t r_index;
+
+	/* Iterate all mpu regions in reversed order */
+	for (r_index = _get_num_regions() + 1; r_index-- > 0;) {
+		if (!_is_enabled_region(r_index) ||
+		    !_is_in_region(r_index, (u32_t)addr, size)) {
+			continue;
+		}
+
+		/* For ARM MPU, higher region number takes priority.
+		 * Since we iterate all mpu regions in reversed order, so
+		 * we can stop the iteration immediately once we find the
+		 * matched region that grants permission or denies access.
+		 */
+		if (_is_user_accessible_region(r_index, write)) {
+			return 0;
+		} else {
+			return -EPERM;
+		}
+	}
+
+	return -EPERM;
+}
+#endif /* CONFIG_USERSPACE */
+
 /* ARM MPU Driver Initial Setup */
 
 /*

arch/arm/core/cortex_m/mpu/nxp_mpu.c

@@ -79,6 +79,79 @@ static void _region_init(u32_t index, u32_t region_base,
 		    SYSMPU->WORD[index][3]);
 }
 
+/**
+ * This internal function is utilized by the MPU driver to parse the intent
+ * type (i.e. THREAD_STACK_REGION) and return the correct region index.
+ */
+static inline u32_t _get_region_index_by_type(u32_t type)
+{
+	/*
+	 * The new MPU regions are allocated per type after the statically
+	 * configured regions. The type is one-indexed rather than
+	 * zero-indexed, therefore we need to subtract by one to get the region
+	 * index.
+	 */
+	switch (type) {
+	case THREAD_STACK_REGION:
+		return mpu_config.num_regions + type - 1;
+	case THREAD_STACK_GUARD_REGION:
+		return mpu_config.num_regions + type - 1;
+	case THREAD_DOMAIN_PARTITION_REGION:
+#if defined(CONFIG_MPU_STACK_GUARD)
+		return mpu_config.num_regions + type - 1;
+#else
+		/*
+		 * Start domain partition region from stack guard region
+		 * since stack guard is not enabled.
+		 */
+		return mpu_config.num_regions + type - 2;
+#endif
+	default:
+		__ASSERT(0, "Unsupported type");
+		return 0;
+	}
+}
+
+/**
+ * This internal function check if region is enabled or not
+ */
+static inline int _is_enabled_region(u32_t r_index)
+{
+	return SYSMPU->WORD[r_index][3] & SYSMPU_WORD_VLD_MASK;
+}
+
+/**
+ * This internal function check if the given buffer in in the region
+ */
+static inline int _is_in_region(u32_t r_index, u32_t start, u32_t size)
+{
+	u32_t r_addr_start;
+	u32_t r_addr_end;
+
+	r_addr_start = SYSMPU->WORD[r_index][0];
+	r_addr_end = SYSMPU->WORD[r_index][1];
+
+	if (start >= r_addr_start && (start + size - 1) <= r_addr_end) {
+		return 1;
+	}
+
+	return 0;
+}
+
+/**
+ * This internal function check if the region is user accessible or not
+ */
+static inline int _is_user_accessible_region(u32_t r_index, int write)
+{
+	u32_t r_ap = SYSMPU->WORD[r_index][2];
+
+	if (write) {
+		return (r_ap & MPU_REGION_WRITE) == MPU_REGION_WRITE;
+	}
+
+	return (r_ap & MPU_REGION_READ) == MPU_REGION_READ;
+}
+
 /* ARM Core MPU Driver API Implementation for NXP MPU */
 
 /**
@@ -119,13 +192,7 @@ void arm_core_mpu_disable(void)
 void arm_core_mpu_configure(u8_t type, u32_t base, u32_t size)
 {
 	SYS_LOG_DBG("Region info: 0x%x 0x%x", base, size);
-	/*
-	 * The new MPU regions are allocated per type after the statically
-	 * configured regions. The type is one-indexed rather than
-	 * zero-indexed, therefore we need to subtract by one to get the region
-	 * index.
-	 */
-	u32_t region_index = mpu_config.num_regions + type - 1;
+	u32_t region_index = _get_region_index_by_type(type);
 	u32_t region_attr = _get_region_attr_by_type(type);
 	u32_t last_region = _get_num_regions() - 1;
 
@@ -181,6 +248,149 @@ void arm_core_mpu_configure(u8_t type, u32_t base, u32_t size)
 
 }
 
+#if defined(CONFIG_USERSPACE)
+/**
+ * @brief configure MPU regions for the memory partitions of the memory domain
+ *
+ * @param   mem_domain    memory domain that thread belongs to
+ */
+void arm_core_mpu_configure_mem_domain(struct k_mem_domain *mem_domain)
+{
+	u32_t region_index =
+		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
+	u32_t region_attr;
+	u32_t num_partitions;
+	struct k_mem_partition *pparts;
+
+	if (mem_domain) {
+		SYS_LOG_DBG("configure domain: %p", mem_domain);
+		num_partitions = mem_domain->num_partitions;
+		pparts = mem_domain->partitions;
+	} else {
+		SYS_LOG_DBG("disable domain partition regions");
+		num_partitions = 0;
+		pparts = NULL;
+	}
+
+	/*
+	 * Don't touch the last region, it is reserved for SRAM_1 region.
+	 * See comments in arm_core_mpu_configure().
+	 */
+	for (; region_index < _get_num_regions() - 1; region_index++) {
+		if (num_partitions && pparts->size) {
+			SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
+				    region_index, pparts->start, pparts->size);
+			region_attr = pparts->attr;
+			_region_init(region_index, pparts->start,
+				     ENDADDR_ROUND(pparts->start+pparts->size),
+				     region_attr);
+			num_partitions--;
+		} else {
+			SYS_LOG_DBG("disable region 0x%x", region_index);
+			/* Disable region */
+			SYSMPU->WORD[region_index][0] = 0;
+			SYSMPU->WORD[region_index][1] = 0;
+			SYSMPU->WORD[region_index][2] = 0;
+			SYSMPU->WORD[region_index][3] = 0;
+		}
+		pparts++;
+	}
+}
+
+/**
+ * @brief configure MPU region for a single memory partition
+ *
+ * @param   part_index  memory partition index
+ * @param   part        memory partition info
+ */
+void arm_core_mpu_configure_mem_partition(u32_t part_index,
+					  struct k_mem_partition *part)
+{
+	u32_t region_index =
+		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
+	u32_t region_attr;
+
+	SYS_LOG_DBG("configure partition index: %u", part_index);
+
+	if (part) {
+		SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
+			    region_index + part_index, part->start, part->size);
+		region_attr = part->attr;
+		_region_init(region_index + part_index, part->start,
+			     ENDADDR_ROUND(part->start + part->size),
+			     region_attr);
+	} else {
+		SYS_LOG_DBG("disable region 0x%x", region_index);
+		/* Disable region */
+		SYSMPU->WORD[region_index + part_index][0] = 0;
+		SYSMPU->WORD[region_index + part_index][1] = 0;
+		SYSMPU->WORD[region_index + part_index][2] = 0;
+		SYSMPU->WORD[region_index + part_index][3] = 0;
+	}
+}
+
+/**
+ * @brief Reset MPU region for a single memory partition
+ *
+ * @param   part_index  memory partition index
+ */
+void arm_core_mpu_mem_partition_remove(u32_t part_index)
+{
+	u32_t region_index =
+		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
+
+	SYS_LOG_DBG("disable region 0x%x", region_index);
+	/* Disable region */
+	SYSMPU->WORD[region_index + part_index][0] = 0;
+	SYSMPU->WORD[region_index + part_index][1] = 0;
+	SYSMPU->WORD[region_index + part_index][2] = 0;
+	SYSMPU->WORD[region_index + part_index][3] = 0;
+}
+
+/**
+ * @brief get the maximum number of free regions for memory domain partitions
+ */
+int arm_core_mpu_get_max_domain_partition_regions(void)
+{
+	/*
+	 * Subtract the start of domain partition regions from total regions
+	 * should get the maximum number of free regions for memory domain
+	 * partitions. But we need to consume an extra 1 region to make
+	 * stack/stack guard protection work properly.
+	 * See the comments in arm_core_mpu_configure().
+	 */
+	return _get_num_regions() -
+		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION) - 1;
+}
+
+/**
+ * @brief validate the given buffer is user accessible or not
+ */
+int arm_core_mpu_buffer_validate(void *addr, size_t size, int write)
+{
+	u32_t r_index;
+
+	/* Iterate all mpu regions */
+	for (r_index = 0; r_index < _get_num_regions(); r_index++) {
+		if (!_is_enabled_region(r_index) ||
+		    !_is_in_region(r_index, (u32_t)addr, size)) {
+			continue;
+		}
+
+		/* For NXP MPU, priority given to granting permission over
+		 * denying access for overlapping region.
+		 * So we can stop the iteration immediately once we find the
+		 * matched region that grants permission.
+		 */
+		if (_is_user_accessible_region(r_index, write)) {
+			return 0;
+		}
+	}
+
+	return -EPERM;
+}
+#endif /* CONFIG_USERSPACE */
+
 /* NXP MPU Driver Initial Setup */
 
 /*

arch/arm/core/cortex_m/prep_c.c

@@ -27,7 +27,7 @@
 #ifdef CONFIG_ARMV6_M
 
 #define VECTOR_ADDRESS 0
-static inline void relocate_vector_table(void)
+void __weak relocate_vector_table(void)
 {
 #if defined(CONFIG_XIP) && (CONFIG_FLASH_BASE_ADDRESS != 0) || \
     !defined(CONFIG_XIP) && (CONFIG_SRAM_BASE_ADDRESS != 0)
@@ -73,7 +73,7 @@ static inline void enable_floating_point(void)
 	 * Although automatic state preservation is enabled, the processor
 	 * does not automatically save the volatile FP registers until they
 	 * have first been touched. Perform a dummy move operation so that
-	 * the stack frames are created as expected before any task or fiber
+	 * the stack frames are created as expected before any thread
 	 * context switching can occur.
 	 */
 	__asm__ volatile(

arch/arm/core/cortex_m/reset.S

@@ -81,7 +81,7 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start)
 
     /*
      * Set PSP and use it to boot without using MSP, so that it
-     * gets set to _interrupt_stack during nanoInit().
+     * gets set to _interrupt_stack during initialisation.
      */
     ldr r0, =_interrupt_stack
     ldr r1, =CONFIG_ISR_STACK_SIZE

arch/arm/core/fatal.c

@@ -46,10 +46,6 @@ void _NanoFatalErrorHandler(unsigned int reason,
 					  const NANO_ESF *pEsf)
 {
 	switch (reason) {
-	case _NANO_ERR_INVALID_TASK_EXIT:
-		printk("***** Invalid Exit Software Error! *****\n");
-		break;
-
 #if defined(CONFIG_STACK_CANARIES) || defined(CONFIG_STACK_SENTINEL)
 	case _NANO_ERR_STACK_CHK_FAIL:
 		printk("***** Stack Check Fail! *****\n");

arch/arm/core/irq_init.c

@@ -9,7 +9,7 @@
  * @brief ARM Cortex-M interrupt initialization
  *
  * The ARM Cortex-M architecture provides its own k_thread_abort() to deal with
- * different CPU modes (handler vs thread) when a fiber aborts. When its entry
+ * different CPU modes (handler vs thread) when a thread aborts. When its entry
  * point returns or when it aborts itself, the CPU is in thread mode and must
  * call _Swap() (which triggers a service call), but when in handler mode, the
  * CPU must exit handler mode to cause the context switch, and thus must queue

arch/arm/core/offsets/Makefile

@@ -1 +0,0 @@
-obj-y = offsets.o

arch/arm/core/swap.S

@@ -175,6 +175,14 @@ _thread_irq_disabled:
     pop {r2, lr}
 #endif /* CONFIG_MPU_STACK_GUARD */
 
+#ifdef CONFIG_USERSPACE
+    /* r2 contains k_thread */
+    add r0, r2, #0
+    push {r2, lr}
+    blx configure_mpu_mem_domain
+    pop {r2, lr}
+#endif /* CONFIG_USERSPACE */
+
     /* load callee-saved + psp from thread */
     add r0, r2, #_thread_offset_to_callee_saved
     ldmia r0, {v1-v8, ip}

arch/arm/core/thread.c

@@ -49,8 +49,8 @@
  * @return N/A
  */
 
-void _new_thread(struct k_thread *thread, k_thread_stack_t stack,
-		 size_t stackSize, _thread_entry_t pEntry,
+void _new_thread(struct k_thread *thread, k_thread_stack_t *stack,
+		 size_t stackSize, k_thread_entry_t pEntry,
 		 void *parameter1, void *parameter2, void *parameter3,
 		 int priority, unsigned int options)
 {

arch/arm/core/thread_abort.c

@@ -22,15 +22,19 @@
 #include <linker/sections.h>
 #include <ksched.h>
 #include <wait_q.h>
+#include <misc/__assert.h>
 
 extern void _k_thread_single_abort(struct k_thread *thread);
 
-void k_thread_abort(k_tid_t thread)
+void _impl_k_thread_abort(k_tid_t thread)
 {
 	unsigned int key;
 
 	key = irq_lock();
 
+	__ASSERT(!(thread->base.user_options & K_ESSENTIAL),
+		 "essential thread aborted");
+
 	_k_thread_single_abort(thread);
 	_thread_monitor_exit(thread);
 

arch/arm/include/kernel_arch_func.h

@@ -39,8 +39,8 @@ static ALWAYS_INLINE void kernel_arch_init(void)
 
 static ALWAYS_INLINE void
 _arch_switch_to_main_thread(struct k_thread *main_thread,
-			    k_thread_stack_t main_stack,
-			    size_t main_stack_size, _thread_entry_t _main)
+			    k_thread_stack_t *main_stack,
+			    size_t main_stack_size, k_thread_entry_t _main)
 {
 	/* get high address of the stack, i.e. its start (stack grows down) */
 	char *start_of_main_stack;

arch/arm/include/kernel_arch_thread.h

@@ -8,7 +8,7 @@
  * @file
  * @brief Per-arch thread definition
  *
- * This file contains defintions for
+ * This file contains definitions for
  *
  *  struct _thread_arch
  *  struct _callee_saved

arch/arm/soc/CMakeLists.txt

@@ -0,0 +1,6 @@
+if(SOC_FAMILY)
+  add_subdirectory(${SOC_FAMILY})
+else()
+  add_subdirectory(${SOC_NAME})
+endif()
+

arch/arm/soc/arm/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(${SOC_SERIES})

arch/arm/soc/arm/Kbuild

@@ -1,8 +0,0 @@
-# Kconfig - ARM LTD SoC configuration options
-#
-# Copyright (c) 2016 Linaro Limited
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-obj-y += $(SOC_SERIES)/

arch/arm/soc/arm/beetle/CMakeLists.txt

@@ -0,0 +1,5 @@
+zephyr_sources(
+  soc.c
+  power.c
+  )
+zephyr_sources_ifdef(CONFIG_ARM_MPU_ENABLE arm_mpu_regions.c)

arch/arm/soc/arm/beetle/Makefile

@@ -1,10 +0,0 @@
-# Makefile - ARM LTD Beetle SoC build options
-
-#
-# Copyright (c) 2016 Linaro Limited
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-obj-y += soc.o power.o
-obj-$(CONFIG_ARM_MPU_ENABLE) += arm_mpu_regions.o

arch/arm/soc/arm/beetle/arm_mpu_regions.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
- #include <soc.h>
- #include <arch/arm/cortex_m/mpu/arm_mpu.h>
+#include <soc.h>
+#include <arch/arm/cortex_m/mpu/arm_mpu.h>
 
 static struct arm_mpu_region mpu_regions[] = {
 	/* Region 0 */

arch/arm/soc/arm/beetle/soc.c

@@ -12,12 +12,12 @@
  * for the ARM LTD Beetle SoC.
  */
 
- #include <kernel.h>
- #include <device.h>
- #include <init.h>
- #include <soc.h>
+#include <kernel.h>
+#include <device.h>
+#include <init.h>
+#include <soc.h>
 
- #include <arch/cpu.h>
+#include <arch/cpu.h>
 
 /**
  * @brief Perform basic hardware initialization at boot.

arch/arm/soc/arm/mps2/CMakeLists.txt

@@ -0,0 +1,3 @@
+zephyr_sources(
+  soc.c
+  )

arch/arm/soc/arm/mps2/Makefile

@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2017 Linaro Limited
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-obj-y += soc.o

arch/arm/soc/atmel_sam/CMakeLists.txt

@@ -0,0 +1,8 @@
+# Makefile - Atmel SAM MCU family
+#
+# Copyright (c) 2016 Piotr Mienkowski
+# SPDX-License-Identifier: Apache-2.0
+#
+
+add_subdirectory(${SOC_SERIES})
+add_subdirectory_ifdef(CONFIG_ASF common)

arch/arm/soc/atmel_sam/Kconfig

@@ -2,7 +2,19 @@
 #
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
+
+config SOC_FAMILY_SAM
+	bool
+	# omit prompt to signify a "hidden" option
+	default n
+
+if SOC_FAMILY_SAM
+
+config SOC_FAMILY
+	string
+	default atmel_sam
+
+endif #SOC_FAMILY_SAM
 
 # Select SoC Part No. and configuration options
 source "arch/arm/soc/atmel_sam/*/Kconfig.soc"

arch/arm/soc/atmel_sam/Kconfig.defconfig

@@ -4,20 +4,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-config SOC_FAMILY_SAM
-	bool
-	# omit prompt to signify a "hidden" option
-	default n
-
 if SOC_FAMILY_SAM
 
-config SOC_FAMILY
-	string
-	default atmel_sam
-
 config WATCHDOG
 	def_bool y
 
-endif #SOC_FAMILY_SAM
-
+endif
 source "arch/arm/soc/atmel_sam/*/Kconfig.defconfig.series"

arch/arm/soc/atmel_sam/Makefile

@@ -1,8 +0,0 @@
-# Makefile - Atmel SAM MCU family
-#
-# Copyright (c) 2016 Piotr Mienkowski
-# SPDX-License-Identifier: Apache-2.0
-#
-
-obj-y += $(SOC_SERIES)/
-obj-$(CONFIG_ASF) += common/

arch/arm/soc/atmel_sam/common/CMakeLists.txt

@@ -0,0 +1,5 @@
+zephyr_include_directories(.)
+zephyr_sources(
+  soc_pmc.c
+  soc_gpio.c
+  )

arch/arm/soc/atmel_sam/common/Makefile

@@ -1,8 +0,0 @@
-# Makefile - Atmel SAM MCU family common functions
-#
-# Copyright (c) 2016 Piotr Mienkowski
-# SPDX-License-Identifier: Apache-2.0
-#
-
-obj-y += soc_pmc.o
-obj-y += soc_gpio.o

arch/arm/soc/atmel_sam/common/soc_gpio.h

@@ -163,7 +163,7 @@ static inline u32_t soc_gpio_get(const struct soc_gpio_pin *pin)
  * or may not be taken into account, depending on the precise timing of its
  * occurrence.
  *
- * tdiv_slck = ((div + 1) × 2) × tslck
+ * tdiv_slck = ((div + 1) x 2) x tslck
  * where tslck is the slow clock, typically 32.768 kHz.
  *
  * Setting the length of the debounce window is only meaningful if the pin is

arch/arm/soc/atmel_sam/sam3x/CMakeLists.txt

@@ -0,0 +1,3 @@
+zephyr_sources(
+  soc.c
+  )

arch/arm/soc/atmel_sam/sam3x/Makefile

@@ -1,9 +0,0 @@
-# Makefile - Atmel SAM3X MCU series
-#
-# Copyright (c) 2017 Justin Watson
-# SPDX-License-Identifier: Apache-2.0
-#
-
-ZEPHYRINCLUDE += -I$(srctree)/arch/arm/soc/atmel_sam/common
-
-obj-y += soc.o