diff options
author | Jolly Shah <jollys@xilinx.com> | 2019-01-08 11:16:16 -0800 |
---|---|---|
committer | Jolly Shah <jollys@xilinx.com> | 2019-01-09 12:05:56 -0800 |
commit | 99564393bf6e6125e7f9030044077ece4d4e348e (patch) | |
tree | 277bf00c560c1ae846a6fc0432e180179aaa38c5 /plat/xilinx | |
parent | 31c3842ee86e5e98a1f441e1373906954dbcdf9f (diff) |
plat: xilinx: zynqmp: Move zynqmp_def.h to include directory
Move zynqmp_def.h to platform specific include directory.
Also, update source file to include header file from updated
path of zynqmp_def.h
Signed-off-by: Tejas Patel <tejas.patel@xilinx.com>
Reviewed-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Signed-off-by: Jolly Shah <jollys@xilinx.com>
Diffstat (limited to 'plat/xilinx')
-rw-r--r-- | plat/xilinx/zynqmp/include/plat_macros.S | 4 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/include/platform_def.h | 2 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/include/zynqmp_def.h (renamed from plat/xilinx/zynqmp/zynqmp_def.h) | 23 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c | 2 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_client.c | 4 |
5 files changed, 21 insertions, 14 deletions
diff --git a/plat/xilinx/zynqmp/include/plat_macros.S b/plat/xilinx/zynqmp/include/plat_macros.S index e54cfc49..bf1ff82b 100644 --- a/plat/xilinx/zynqmp/include/plat_macros.S +++ b/plat/xilinx/zynqmp/include/plat_macros.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -8,7 +8,7 @@ #include <arm_macros.S> #include <cci_macros.S> -#include "../zynqmp_def.h" +#include "zynqmp_def.h" /* --------------------------------------------- * The below required platform porting macro diff --git a/plat/xilinx/zynqmp/include/platform_def.h b/plat/xilinx/zynqmp/include/platform_def.h index e3c9fcc1..fb104113 100644 --- a/plat/xilinx/zynqmp/include/platform_def.h +++ b/plat/xilinx/zynqmp/include/platform_def.h @@ -12,7 +12,7 @@ #include <drivers/arm/gic_common.h> #include <lib/utils_def.h> -#include "../zynqmp_def.h" +#include "zynqmp_def.h" /******************************************************************************* * Generic platform constants diff --git a/plat/xilinx/zynqmp/zynqmp_def.h b/plat/xilinx/zynqmp/include/zynqmp_def.h index f75530e7..8648b9ab 100644 --- a/plat/xilinx/zynqmp/zynqmp_def.h +++ b/plat/xilinx/zynqmp/include/zynqmp_def.h @@ -60,8 +60,10 @@ #define CRL_APB_BOOT_PIN_MASK (U(0xf0f) << 0) #define CRL_APB_BOOT_DRIVE_PIN_1_SHIFT U(9) #define CRL_APB_BOOT_ENABLE_PIN_1_SHIFT U(1) -#define CRL_APB_BOOT_ENABLE_PIN_1 (U(0x1) << CRL_APB_BOOT_ENABLE_PIN_1_SHIFT) -#define CRL_APB_BOOT_DRIVE_PIN_1 (U(0x1) << CRL_APB_BOOT_DRIVE_PIN_1_SHIFT) +#define CRL_APB_BOOT_ENABLE_PIN_1 (U(0x1) << \ + CRL_APB_BOOT_ENABLE_PIN_1_SHIFT) +#define CRL_APB_BOOT_DRIVE_PIN_1 (U(0x1) << \ + CRL_APB_BOOT_DRIVE_PIN_1_SHIFT) #define ZYNQMP_BOOTMODE_JTAG U(0) #define ZYNQMP_ULPI_RESET_VAL_HIGH (CRL_APB_BOOT_ENABLE_PIN_1 | \ CRL_APB_BOOT_DRIVE_PIN_1) @@ -137,7 +139,7 @@ #define ZYNQMP_UART0_BASE 0xFF000000 #define ZYNQMP_UART1_BASE 0xFF010000 -#if ZYNQMP_CONSOLE_IS(cadence) +#if ZYNQMP_CONSOLE_IS(cadence) || ZYNQMP_CONSOLE_IS(dcc) # define ZYNQMP_UART_BASE ZYNQMP_UART0_BASE #elif ZYNQMP_CONSOLE_IS(cadence1) # define ZYNQMP_UART_BASE ZYNQMP_UART1_BASE @@ -167,22 +169,27 @@ #define ZYNQMP_CSU_IDCODE_OFFSET 0x40 #define ZYNQMP_CSU_IDCODE_XILINX_ID_SHIFT 0 -#define ZYNQMP_CSU_IDCODE_XILINX_ID_MASK (0xFFF << ZYNQMP_CSU_IDCODE_XILINX_ID_SHIFT) +#define ZYNQMP_CSU_IDCODE_XILINX_ID_MASK (0xFFF << \ + ZYNQMP_CSU_IDCODE_XILINX_ID_SHIFT) #define ZYNQMP_CSU_IDCODE_XILINX_ID 0x093 #define ZYNQMP_CSU_IDCODE_SVD_SHIFT 12 #define ZYNQMP_CSU_IDCODE_SVD_MASK (0x7 << \ ZYNQMP_CSU_IDCODE_SVD_SHIFT) #define ZYNQMP_CSU_IDCODE_DEVICE_CODE_SHIFT 15 -#define ZYNQMP_CSU_IDCODE_DEVICE_CODE_MASK (0xF << ZYNQMP_CSU_IDCODE_DEVICE_CODE_SHIFT) +#define ZYNQMP_CSU_IDCODE_DEVICE_CODE_MASK (0xF << \ + ZYNQMP_CSU_IDCODE_DEVICE_CODE_SHIFT) #define ZYNQMP_CSU_IDCODE_SUB_FAMILY_SHIFT 19 -#define ZYNQMP_CSU_IDCODE_SUB_FAMILY_MASK (0x3 << ZYNQMP_CSU_IDCODE_SUB_FAMILY_SHIFT) +#define ZYNQMP_CSU_IDCODE_SUB_FAMILY_MASK (0x3 << \ + ZYNQMP_CSU_IDCODE_SUB_FAMILY_SHIFT) #define ZYNQMP_CSU_IDCODE_FAMILY_SHIFT 21 -#define ZYNQMP_CSU_IDCODE_FAMILY_MASK (0x7F << ZYNQMP_CSU_IDCODE_FAMILY_SHIFT) +#define ZYNQMP_CSU_IDCODE_FAMILY_MASK (0x7F << \ + ZYNQMP_CSU_IDCODE_FAMILY_SHIFT) #define ZYNQMP_CSU_IDCODE_FAMILY 0x23 #define ZYNQMP_CSU_IDCODE_REVISION_SHIFT 28 -#define ZYNQMP_CSU_IDCODE_REVISION_MASK (0xF << ZYNQMP_CSU_IDCODE_REVISION_SHIFT) +#define ZYNQMP_CSU_IDCODE_REVISION_MASK (0xF << \ + ZYNQMP_CSU_IDCODE_REVISION_SHIFT) #define ZYNQMP_CSU_IDCODE_REVISION 0 #define ZYNQMP_CSU_VERSION_OFFSET 0x44 diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c index d3f1fbfe..44acb4bd 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c @@ -12,6 +12,7 @@ #include <drivers/delay_timer.h> #include <lib/mmio.h> #include <plat/common/platform.h> +#include <zynqmp_def.h> #include "pm_api_clock.h" #include "pm_api_ioctl.h" @@ -19,7 +20,6 @@ #include "pm_client.h" #include "pm_common.h" #include "pm_ipi.h" -#include "../zynqmp_def.h" /** * pm_ioctl_get_rpu_oper_mode () - Get current RPU operation mode diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.c b/plat/xilinx/zynqmp/pm_service/pm_client.c index bebb74ce..997c3305 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_client.c +++ b/plat/xilinx/zynqmp/pm_service/pm_client.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -19,7 +19,7 @@ #include <lib/mmio.h> #include <lib/utils.h> -#include "../zynqmp_def.h" +#include <zynqmp_def.h> #include "pm_api_sys.h" #include "pm_client.h" #include "pm_ipi.h" |