You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by vi...@apache.org on 2017/01/31 01:34:11 UTC
[1/2] incubator-mynewt-core git commit: License updates
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 4609cd2eb -> f7f305404
License updates
- Add missing license
- Update paths and filenames to match recent changes in LICENSE file
- Update rat-exludes accordingly
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/f7f30540
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/f7f30540
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/f7f30540
Branch: refs/heads/develop
Commit: f7f3054042ff69696b60de7efb1ebae67646481c
Parents: ec2136f
Author: Vipul Rahane <vi...@apache.org>
Authored: Mon Jan 30 17:31:48 2017 -0800
Committer: Vipul Rahane <vi...@apache.org>
Committed: Mon Jan 30 17:33:35 2017 -0800
----------------------------------------------------------------------
.rat-excludes | 59 +++++++++++-----
LICENSE | 144 ++++++++++++++++++++--------------------
fs/fatfs/src/mynewt_glue.c | 18 +++++
3 files changed, 135 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f7f30540/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 551b4cd..1b7d62e 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -10,21 +10,22 @@ tags
RELEASE_NOTES.md
repository.yml
.gitignore
+pts-gap.txt
+pts-gatt.txt
+pts-l2cap.txt
+pts-sm.txt
+90359-20161220-172100175.tpg
+90359-20161220-172113981.pts
+00readme.txt
# CRC16 - BSD License.
crc16.*
# Nordic nRF51 SDK - BSD License.
-boot-nrf51dk.ld
-nrf51dk.ld
nrf51dk_no_boot.ld
system_nrf51.c
gcc_startup_nrf51.s
-boot-nrf51dk-16kbram.ld
-nrf51dk-16kbram.ld
nrf51dk-16kbram_no_boot.ld
-boot-nrf51-arduino_101.ld
-nrf51-arduino_101.ld
boot-nrf51xxaa.ld
nrf51xxaa.ld
boot-nrf51xxac.ld
@@ -36,8 +37,6 @@ split-nrf51dk.ld
split-nrf51dk-16kbram.ld
nrf51.ld
nrf51.h
-nrf51422_peripherals.h
-nrf51822_peripherals.h
nrf51_bitfields.h
nrf51_deprecated.h
system_nrf51.h
@@ -59,10 +58,17 @@ system_nrf52.c
gcc_startup_nrf52.s
nrf51_to_nrf52.h
nrf52.h
-nrf52832_peripherals.h
nrf52_bitfields.h
system_nrf52.h
gcc_startup_nrf52_split.s
+gcc_startup_nrf52840.s
+nrf51_to_nrf52840.h
+nrf52840.h
+nrf52840_bitfields.h
+nrf52840_peripherals.h
+nrf52_to_nrf52840.h
+system_nrf52840.c
+system_nrf52840.h
# Nordic nRF51 SDK - BSD License.
# Nordic nRF52 SDK - BSD License.
@@ -159,9 +165,6 @@ stm32f4xx_hal_uart.c
# klibc - MIT License.
baselibc
-# eLua - MUT License.
-elua
-
# CMSIS-CORE - BSD License.
core_ca9.h
core_caFunc.h
@@ -192,9 +195,6 @@ queue.h
os_mbuf.c
base64.c
-# crc32.c - Public domain.
-crc32.c
-
# tinycrypt - BSD License.
tinycrypt
@@ -217,3 +217,32 @@ lwip_base
# OIC - BSD License.
oic
+
+# FATFS ChaN License
+diskio.h
+ff.h
+ffconf.h
+integer.h
+ff.c
+unicode.c
+00history.txt
+
+#Codesoucery License
+split-nrf52840pdk.ld
+nrf52840pdk_no_boot.ld
+
+#Freescale Semiconductor License
+boot-mkw41z512.ld
+mkw41z512.ld
+no-boot-mkw41z512.ld
+gcc_startup_mkw41z.s
+MKW41Z4.h
+fsl_device_registers.h
+system_MKW41Z4.h
+MKW41Z4_features.h
+system_MKW41Z4.c
+
+#Imagination Technologies License
+ctx.S
+excpt_isr.S
+uhi32.ld
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f7f30540/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 6bff31e..199965b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,118 +201,120 @@
limitations under the License.
This product bundles crc16, which is available under the "3-clause BSD"
-license. For details, see fs/nffs/src/crc16.[ch]
+license. For details, see:
+ * util/crc/include/crc/crc16.h
+ * util/crc/src/crc16.c
This product bundles queue.h 8.5, which is available under the "3-clause BSD"
-license. For details, see libs/os/include/os/queue.h
+license. For details, see kernel/os/include/os/queue.h
This product partly derives from FreeBSD, which is available under the
"3-clause BSD" license. For details, see:
- * libs/os/include/os/os_time.h
- * libs/os/src/os_mbuf.c
- * libs/util/src/base64.c
- * libs/util/src/datetime.c
+ * kernel/os/include/os/os_time.h
+ * kernel/os/src/os_mbuf.c
+ * encoding/base64/src/base64.c
+ * time/datetime/src/datetime.c
This product bundles baselibc, which is available under the "3-clause BSD"
license. Baselibc bundles tinyprintf and is based on klibc for details see:
-libs/baselibc/LICENSE
+libc/baselibc/LICENSE
This product bundles tinyprintf, which is available under the "3-clause BSD"
-license. For details, see libs/baselibc/src/tinyprintf.c
+license. For details, see libc/baselibc/src/tinyprintf.c
This product conatins code based on klibc, which is available under the MIT
-license. For details, see libs/baselibc/LICENSE
+license. For details, see libc/baselibc/LICENSE
This product bundles microjson, which is available under the "3-clause BSD"
-license. For details, see libs/json/
-
-This product bundles and partly derives from parts of the Nordic nRF51 SDK,
-which are available under a BSD style license. Relevant files are:
- * hw/bsp/nrf51dk/boot-nrf51dk.ld
- * hw/bsp/nrf51dk/nrf51dk.ld
- * hw/bsp/nrf51dk/nrf51dk_no_boot.ld
- * hw/bsp/nrf51dk-16kbram/boot-nrf51dk-16kbram.ld
- * hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram.ld
- * hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_no_boot.ld
- * hw/bsp/nrf51-arduino_101/boot-nrf51-arduino_101.ld
- * hw/bsp/nrf51-arduino_101/nrf51-arduino_101.ld
+license. For details, see encoding/json/
This product bundles and partly derives from parts of the Nordic nRF52 SDK,
which are available under a BSD style license. Relevant files are:
- * hw/bsp/bmd300eval/bmd300eval.ld
- * hw/bsp/bmd300eval/bmd300eval_no_boot.ld
- * hw/bsp/bmd300eval/boot-bmd300eval.ld
- * hw/bsp/nrf52dk/boot-nrf52dk.ld
- * hw/bsp/nrf52dk/nrf52dk.ld
- * hw/bsp/nrf52dk/nrf52dk_no_boot.ld
- * hw/bsp/nrf52dk/boot-nrf52dk.ld
- * hw/bsp/nrf52pdk/nrf52pdk.ld
- * hw/bsp/nrf52pdk/nrf52pdk_no_boot.ld
+ * hw/bsp/nrf52840pdk/src/arch/cortex_m4/gcc_startup_nrf52840.s
This product bundles Gary S. Brown's CRC32 implementation, which is available under the following license:
COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or
code or tables extracted from it, as desired without restriction.
-This product bundles eLua, which is available under the MIT license.
-For details, see libs/elua/elua_base/
-
-eLua bundles further items which are available under permissive Apache
-compatable licenses (BSD/MIT). For full details see:
-libs/elua/elua_base/LICENSE
-
-This product bundles Lua-RPC library, which is available under a zlib license.
-for details see libs/elua/elua_base/LICENSE.luarpc
-
This product bundles parts of CMSIS-CORE, which is available under the
"3-clause BSD" license. Bundled files are:
- * libs/cmsis-core/
- * libs/os/src/arch/cortex_m0/m0/HAL_CM0.s
- * libs/os/src/arch/cortex_m0/m0/SVC_Table.s
- * libs/os/src/arch/cortex_m4/m4/HAL_CM4.s
- * libs/os/src/arch/cortex_m4/m4/SVC_Table.s
+ * hw/cmsis-core/
+ * kernel/os/src/arch/cortex_m0/m0/HAL_CM0.s
+ * kernel/os/src/arch/cortex_m0/m0/SVC_Table.s
+ * kernel/os/src/arch/cortex_m4/m4/HAL_CM4.s
+ * kernel/os/src/arch/cortex_m4/m4/SVC_Table.s
This product bundles additional files from CMSIS-CORE, but these files are
missing licensing information. The BSD license was subsequently added to
these files in later releases. These files are:
- * libs/cmsis-core/src/cmsis_nvic.c
+ * hw/cmsis-core/src/cmsis_nvic.c
* hw/bsp/nrf51dk-16kbram/include/bsp/cmsis_nvic.h
* hw/bsp/nrf51dk/include/bsp/cmsis_nvic.h
- * hw/bsp/nrf52pdk/include/bsp/cmsis_nvic.h
* hw/bsp/olimex_stm32-e407_devboard/include/bsp/cmsis_nvic.h
This product bundles parts of STM32CubeF4 1.5, which is available under the
"3-clause BSD" license. Bundled files are:
- * hw/mcu/stm/stm32f4xx/src/stm32f4xx_hal_flash.c
- * hw/mcu/stm/stm32f4xx/src/stm32f4xx_hal_flash_ex.c
- * hw/mcu/stm/stm32f4xx/src/stm32f4xx_hal_gpio.c
- * hw/mcu/stm/stm32f4xx/src/stm32f4xx_hal_rcc.c
- * hw/mcu/stm/stm32f4xx/src/stm32f4xx_hal_uart.c
+ * hw/mcu/stm/stm32f4xx/src/hal_flash.c
+ * hw/mcu/stm/stm32f4xx/src/hal_gpio.c
+ * hw/mcu/stm/stm32f4xx/src/hal_uart.c
* hw/mcu/stm/stm32f4xx/include/
* hw/bsp/olimex_stm32-e407_devboard/src/arch/cortex_m4/startup_STM32F40x.s
* hw/bsp/olimex_stm32-e407_devboard/include/bsp/stm32f4xx_hal_conf.h
* hw/bsp/olimex_stm32-e407_devboard/src/arch/cortex_m4/startup_STM32F40x.s
* hw/bsp/olimex_stm32-e407_devboard/src/system_stm32f4xx.c
- * hw/mcu/stm/stm32f4xx/src/stm32f4xx_hal_flash.c
- * hw/mcu/stm/stm32f4xx/src/stm32f4xx_hal_flash_ex.c
- * hw/mcu/stm/stm32f4xx/src/stm32f4xx_hal_gpio.c
This product bundles parts of mbed, which is available under the
"3-clause BSD" license. Bundled files are:
- * hw/mcu/nordic/nrf52xxx/include/mcu/compiler_abstraction.h
* hw/mcu/nordic/nrf52xxx/include/mcu/cortex_m4.h
- * hw/mcu/nordic/nrf52xxx/include/mcu/nrf.h
- * hw/mcu/nordic/nrf52xxx/include/mcu/nrf51_to_nrf52.h
- * hw/mcu/nordic/nrf52xxx/include/mcu/nrf52.h
- * hw/mcu/nordic/nrf52xxx/include/mcu/nrf52832_peripherals.h
- * hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_bitfields.h
- * hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
- * hw/mcu/nordic/nrf52xxx/include/mcu/system_nrf52.h
- * hw/mcu/nordic/nrf51xxx/include/mcu/compiler_abstraction.h
- * hw/mcu/nordic/nrf51xxx/include/mcu/nrf.h
- * hw/mcu/nordic/nrf51xxx/include/mcu/nrf51.h
- * hw/mcu/nordic/nrf51xxx/include/mcu/nrf51422_peripherals.h
- * hw/mcu/nordic/nrf51xxx/include/mcu/nrf51822_peripherals.h
- * hw/mcu/nordic/nrf51xxx/include/mcu/nrf51_bitfields.h
- * hw/mcu/nordic/nrf51xxx/include/mcu/nrf51_deprecated.h
- * hw/mcu/nordic/nrf51xxx/include/mcu/system_nrf51.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/compiler_abstraction.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52840.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_to_nrf52.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_to_nrf52840.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_to_nrf52840.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_bitfields.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_bitfields.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52840_bitfields.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52840_peripherals.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_deprecated.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/toolchain/system_nrf52840.c
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/toolchain/system_nrf52840.h
+ * hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_name_change.h
+
+This product bundles FATFS, which is available under a
+"1-clause BSD" style license. Bundled files are:
+ * fs/fatfs/include/fatfs/diskio.h
+ * fs/fatfs/include/fatfs/ff.h
+ * fs/fatfs/include/fatfs/ffconf.h
+ * fs/fatfs/include/fatfs/integer.h
+ * fs/fatfs/src/ff.c
+ * fs/fatfs/src/option/unicode.c
+
+This product bundles part of linker scripts Nordic Semiconductor nRF5 devices, which is available under the
+"modified Tcl/Tk" license. Bundled files are:
+ * hw/bsp/nrf52840pdk/split-nrf52840pdk.ld
+ * hw/bsp/nrf52840pdk/nrf52840pdk_no_boot.ld
+ * hw/bsp/bmd300eval/bmd300eval_no_boot.ld
+ * hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_no_boot.ld
+ * hw/bsp/nrf51dk/nrf51dk_no_boot.ld
+ * hw/bsp/nrf52dk/nrf52dk_no_boot.ld
+This product bundles part of NXP mkw41z, which is available under the
+"3-clause BSD" license. Bundled files are:
+ * hw/mcu/nxp/mkw41z/include/mcu/MKW41Z4.h
+ * hw/mcu/nxp/mkw41z/include/mcu/MKW41Z4_features.h
+ * hw/mcu/nxp/mkw41z/include/mcu/fsl_device_registers.h
+ * hw/mcu/nxp/mkw41z/include/mcu/system_MKW41Z4.h
+ * hw/mcu/nxp/mkw41z/src/system_MKW41Z4.c
+ * hw/bsp/usbmkw41z/boot-mkw41z512.ld
+ * hw/bsp/usbmkw41z/mkw41z512.ld
+ * hw/bsp/usbmkw41z/no-boot-mkw41z512.ld
+ * hw/bsp/usbmkw41z/src/arch/cortex_m0/gcc_startup_mkw41z.s
+
+This product bundles part of mips architecture and ci40, which is available under the
+"3-clause BSD" license. Bundled files are:
+ * kernel/os/src/arch/mips/asm/ctx.S
+ * kernel/os/src/arch/mips/asm/excpt_isr.S
+ * hw/bsp/ci40/uhi32.ld
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f7f30540/fs/fatfs/src/mynewt_glue.c
----------------------------------------------------------------------
diff --git a/fs/fatfs/src/mynewt_glue.c b/fs/fatfs/src/mynewt_glue.c
index c065fc1..3208917 100644
--- a/fs/fatfs/src/mynewt_glue.c
+++ b/fs/fatfs/src/mynewt_glue.c
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
#include <assert.h>
#include <sysinit/sysinit.h>
#include <hal/hal_flash.h>
[2/2] incubator-mynewt-core git commit: Add missing license
Posted by vi...@apache.org.
Add missing license
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/ec2136f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/ec2136f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/ec2136f1
Branch: refs/heads/develop
Commit: ec2136f1a3d12184bf522d3c6cd064904d473aa3
Parents: 4609cd2
Author: Vipul Rahane <vi...@apache.org>
Authored: Fri Jan 27 12:10:36 2017 -0800
Committer: Vipul Rahane <vi...@apache.org>
Committed: Mon Jan 30 17:33:35 2017 -0800
----------------------------------------------------------------------
hw/bsp/ci40/syscfg.yml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ec2136f1/hw/bsp/ci40/syscfg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/ci40/syscfg.yml b/hw/bsp/ci40/syscfg.yml
index d889f55..ffed5aa 100644
--- a/hw/bsp/ci40/syscfg.yml
+++ b/hw/bsp/ci40/syscfg.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
# Package: hw/bsp/ci40
syscfg.defs: