You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/10/17 19:32:03 UTC
[GitHub] sjanc closed pull request #1462: License cleanups
sjanc closed pull request #1462: License cleanups
URL: https://github.com/apache/mynewt-core/pull/1462
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.rat-excludes b/.rat-excludes
index 2438a7a6e1..af64beea57 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -114,6 +114,7 @@ vbluno52_no_boot.ld
stm32_driver_mod_i2c_v1.c
stm32_driver_mod_i2c_v2.c
stm32_driver_mod_spi.c
+stm32_driver_mod_timer.c
# STM32CubeF4 - BSD License.
stm32f4xx_hal_conf.h
@@ -347,6 +348,12 @@ startup_stm32l152xc.s
# NUCLEO-F767 BSP - BSD License
startup_stm32f767xx.s
+# NUCLEO-F413ZH BSP - BSD License
+nucleo-f413zh
+
+# NUCLEO-L467rg BSP - BSD License
+nucleo-l476rg
+
# Microchip PIC32 SDK - BSD License
p32mz2048efg100.h
pic32_init_cache.S
@@ -400,6 +407,8 @@ docs
# nrfX - BSD License
nrfx
nrfx_glue.h
+nrf52xxx
+nrf52xxx-compat
# cmsis-core - Apache License
cmsis-core
@@ -424,3 +433,16 @@ olimex-p103
# puckjs - BSD License
puckjs_no_boot.ld
split_puckjs.ld
+
+# STM32L0xx SDK - BSD License
+stm32l0xx
+
+# STM32L4xx SDK - BSD License
+stm32l4xx
+
+# Fanstel EVBT840 BSP linker scripts - BSD License
+fanstel-ev-bt840_no_boot.ld
+split-fanstel-ev-bt840.ld
+
+# B-L072Z-LRWAN1 BSP - BSD License
+b-l072z-lrwan1
diff --git a/hw/sensor/test/src/sensor_test.c b/hw/sensor/test/src/sensor_test.c
index 5f75b21603..2a04c0652c 100644
--- a/hw/sensor/test/src/sensor_test.c
+++ b/hw/sensor/test/src/sensor_test.c
@@ -6,7 +6,9 @@
* 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
diff --git a/hw/sensor/test/src/testcases/sensor_test_case_poll_err.c b/hw/sensor/test/src/testcases/sensor_test_case_poll_err.c
index dc1a257136..318abe5600 100644
--- a/hw/sensor/test/src/testcases/sensor_test_case_poll_err.c
+++ b/hw/sensor/test/src/testcases/sensor_test_case_poll_err.c
@@ -6,7 +6,9 @@
* 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
diff --git a/hw/util/i2cn/include/i2cn/i2cn.h b/hw/util/i2cn/include/i2cn/i2cn.h
index f5f762db8d..d6caaae1d3 100644
--- a/hw/util/i2cn/include/i2cn/i2cn.h
+++ b/hw/util/i2cn/include/i2cn/i2cn.h
@@ -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.
+ */
+
#ifndef H_I2CN_
#define H_I2CN_
diff --git a/hw/util/i2cn/src/i2cn.c b/hw/util/i2cn/src/i2cn.c
index b5543d0fa4..2322e1f97c 100644
--- a/hw/util/i2cn/src/i2cn.c
+++ b/hw/util/i2cn/src/i2cn.c
@@ -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.
+ */
+
#include "hal/hal_i2c.h"
#include "i2cn/i2cn.h"
diff --git a/sys/log/full/test/util/src/log_test_util.c b/sys/log/full/test/util/src/log_test_util.c
index ab1fc4dea1..fc80e484a8 100644
--- a/sys/log/full/test/util/src/log_test_util.c
+++ b/sys/log/full/test/util/src/log_test_util.c
@@ -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.
+ */
+
#include "log_test_util/log_test_util.h"
static struct flash_area fcb_areas[] = {
diff --git a/util/rwlock/test/src/rwlock_test.h b/util/rwlock/test/src/rwlock_test.h
index c38191c1b3..e739b878d6 100644
--- a/util/rwlock/test/src/rwlock_test.h
+++ b/util/rwlock/test/src/rwlock_test.h
@@ -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.
+ */
+
#ifndef H_RWLOCK_TEST_H
#define H_RWLOCK_TEST_H
diff --git a/util/rwlock/test/src/testcases/rwlock_test_case_basic.c b/util/rwlock/test/src/testcases/rwlock_test_case_basic.c
index 26917b7856..fd6fb4c0a5 100644
--- a/util/rwlock/test/src/testcases/rwlock_test_case_basic.c
+++ b/util/rwlock/test/src/testcases/rwlock_test_case_basic.c
@@ -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.
+ */
+
#include "rwlock/rwlock.h"
#include "rwlock_test.h"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services