You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@mynewt.apache.org by Justin Mclean <ju...@classsoftware.com> on 2016/02/20 00:10:57 UTC
Re: incubator-mynewt-larva git commit: Updated version of system_stm32f4xx with more permissive license.
Hi,
Would it be correct to assume this is a different version of the file by STMicroelectronics issued under a different license by them?
Thanks,
Justin
> On 20 Feb 2016, at 9:55 am, ccollins@apache.org wrote:
>
> Repository: incubator-mynewt-larva
> Updated Branches:
> refs/heads/master 312a26f76 -> 37ed7322e
>
>
> Updated version of system_stm32f4xx with more permissive license.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
> Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/37ed7322
> Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/37ed7322
> Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/37ed7322
>
> Branch: refs/heads/master
> Commit: 37ed7322e52bc15081f2dcf27b97dc18df2c7b7d
> Parents: 312a26f
> Author: Christopher Collins <cc...@gmail.com>
> Authored: Fri Feb 19 14:55:09 2016 -0800
> Committer: Christopher Collins <cc...@gmail.com>
> Committed: Fri Feb 19 14:55:09 2016 -0800
>
> ----------------------------------------------------------------------
> .../stm32f4xx/include/mcu/system_stm32f4xx.h | 51 ++++++++++++++------
> 1 file changed, 35 insertions(+), 16 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/37ed7322/hw/mcu/stm/stm32f4xx/include/mcu/system_stm32f4xx.h
> ----------------------------------------------------------------------
> diff --git a/hw/mcu/stm/stm32f4xx/include/mcu/system_stm32f4xx.h b/hw/mcu/stm/stm32f4xx/include/mcu/system_stm32f4xx.h
> index 3558bb0..e3a3b0d 100755
> --- a/hw/mcu/stm/stm32f4xx/include/mcu/system_stm32f4xx.h
> +++ b/hw/mcu/stm/stm32f4xx/include/mcu/system_stm32f4xx.h
> @@ -2,28 +2,38 @@
> ******************************************************************************
> * @file system_stm32f4xx.h
> * @author MCD Application Team
> - * @version V1.1.0
> - * @date 11-January-2013
> + * @version V2.0.0
> + * @date 18-February-2014
> * @brief CMSIS Cortex-M4 Device System Source File for STM32F4xx devices.
> ******************************************************************************
> * @attention
> *
> - * <h2><center>© COPYRIGHT 2013 STMicroelectronics</center></h2>
> + * <h2><center>© COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
> *
> - * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
> - * You may not use this file except in compliance with the License.
> - * You may obtain a copy of the License at:
> + * Redistribution and use in source and binary forms, with or without modification,
> + * are permitted provided that the following conditions are met:
> + * 1. Redistributions of source code must retain the above copyright notice,
> + * this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright notice,
> + * this list of conditions and the following disclaimer in the documentation
> + * and/or other materials provided with the distribution.
> + * 3. Neither the name of STMicroelectronics nor the names of its contributors
> + * may be used to endorse or promote products derived from this software
> + * without specific prior written permission.
> *
> - * http://www.st.com/software_license_agreement_liberty_v2
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
> + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
> + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> *
> - * 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.
> - *
> - ******************************************************************************
> - */
> + ******************************************************************************
> + */
>
> /** @addtogroup CMSIS
> * @{
> @@ -55,7 +65,14 @@
> /** @addtogroup STM32F4xx_System_Exported_types
> * @{
> */
> -
> + /* This variable is updated in three ways:
> + 1) by calling CMSIS function SystemCoreClockUpdate()
> + 2) by calling HAL API function HAL_RCC_GetSysClockFreq()
> + 3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
> + Note: If you use this function to configure the system clock; then there
> + is no need to call the 2 first functions listed above, since SystemCoreClock
> + variable is updated automatically.
> + */
> extern uint32_t SystemCoreClock; /*!< System Clock Frequency (Core Clock) */
>
>
> @@ -85,6 +102,8 @@ extern uint32_t SystemCoreClock; /*!< System Clock Frequency (Core Cloc
>
> extern void SystemInit(void);
> extern void SystemCoreClockUpdate(void);
> +extern void SetSysClock(void);
> +
> /**
> * @}
> */
>
Re: incubator-mynewt-larva git commit: Updated version of
system_stm32f4xx with more permissive license.
Posted by Christopher Collins <ch...@runtime.io>.
Hi Justin,
[system_stm32f4xx]
On Sat, Feb 20, 2016 at 10:10:57AM +1100, Justin Mclean wrote:
> Would it be correct to assume this is a different version of the file
> by STMicroelectronics issued under a different license by them?
Yes, that is the case. It appears STM opted for a more permissive
license in recent versions of STM32CubeF4.
Thanks,
Chris