patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

ext: hal: nxp: imx: Fixed duplicit file device_imx.h

Browse source 
The file was in two subfolders as copied from the FreeRTOS BSP
for i.MX6 and i.MX7. Unified the file and moved it into the
devices folder, like in the FreeRTOS BSPs.

Fixes: #13748

Signed-off-by: Stanislav Poboril <stanislav.poboril@nxp.com>
This commit is contained in:
Stanislav Poboril 2019-02-27 09:49:48 +01:00 committed by Kumar Gala
parent e64cd5c74d
commit ee1bdc12f7
4 changed files with 3 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/hal/nxp/imx/CMakeLists.txt
View file

@ -2,8 +2,7 @@
# name respectively.
string(TOUPPER ${CONFIG_SOC} IMX_DEVICE)
zephyr_include_directories(devices/${IMX_DEVICE})
# Build imx drivers and utilities that can be used for multiple SoC's.
add_subdirectory(drivers)
add_subdirectory(devices)
add_subdirectory(devices/${IMX_DEVICE})

1
ext/hal/nxp/imx/devices/CMakeLists.txt Normal file
View file

@ -0,0 +1 @@
zephyr_include_directories(.)

70
ext/hal/nxp/imx/devices/MCIMX7D/device_imx.h
View file

@ -1,70 +0,0 @@
/*
* Copyright (c) 2015, Freescale Semiconductor, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* o Redistributions of source code must retain the above copyright notice, this list
* of conditions and the following disclaimer.
*
* o 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.
*
* o Neither the name of Freescale Semiconductor, Inc. nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* 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.
*/
/*
** ###################################################################
** Abstract:
** Common include file for CMSIS register access layer headers.
**
** http: www.freescale.com
** mail: support@freescale.com
**
** ###################################################################
*/
#ifndef __DEVICE_IMX_H__
#define __DEVICE_IMX_H__
/*
* Include the cpu specific register header files.
*
* The CPU macro should be declared in the project or makefile.
*/
#if defined(CONFIG_SOC_MCIMX6X_M4)
/* CMSIS-style register definitions */
#include "MCIMX6X/include/MCIMX6X_M4.h"
#define RDC_SEMAPHORE_MASTER_SELF (5)
#define SEMA4_PROCESSOR_SELF (1)
#elif defined(CONFIG_SOC_MCIMX7_M4)
/* CMSIS-style register definitions */
#include "MCIMX7D_M4.h"
#define RDC_SEMAPHORE_MASTER_SELF (6)
#define SEMA4_PROCESSOR_SELF (1)
#endif
#endif /* __DEVICE_IMX_H__ */
/*******************************************************************************
* EOF
******************************************************************************/

2
ext/hal/nxp/imx/devices/MCIMX6X/device_imx.h → ext/hal/nxp/imx/devices/device_imx.h
View file

@ -55,7 +55,7 @@
#define RDC_SEMAPHORE_MASTER_SELF (5)
#define SEMA4_PROCESSOR_SELF (1)
#elif defined(CONFIG_SOC_MCIMX7D_M4)
#elif defined(CONFIG_SOC_MCIMX7_M4)
/* CMSIS-style register definitions */
#include "MCIMX7D_M4.h"