diff options
| author | Hadi Asyrafi <muhammad.hadi.asyrafi.abdul.halim@intel.com> | 2019-06-12 11:24:12 +0800 |
|---|---|---|
| committer | Hadi Asyrafi <muhammad.hadi.asyrafi.abdul.halim@intel.com> | 2019-06-26 18:45:01 +0800 |
| commit | bf719f66a7f2261b69b397072cec5ad99c573891 (patch) | |
| tree | ad4245c8f5b97a29cad128004ee6c868506e72c6 /plat/intel | |
| parent | de3ad4f0963cdf5206a9736185d23514cfb45111 (diff) | |
intel: Pull out common drivers into platform common
Signed-off-by: Hadi Asyrafi <muhammad.hadi.asyrafi.abdul.halim@intel.com>
Change-Id: Ib79e2c6fe6e66dec5004701133ad6a5f4c78f2fa
Diffstat (limited to 'plat/intel')
| -rw-r--r-- | plat/intel/soc/common/drivers/qspi/cadence_qspi.c (renamed from plat/intel/soc/stratix10/drivers/qspi/cadence_qspi.c) | 0 | ||||
| -rw-r--r-- | plat/intel/soc/common/drivers/qspi/cadence_qspi.h (renamed from plat/intel/soc/stratix10/drivers/qspi/cadence_qspi.h) | 4 | ||||
| -rw-r--r-- | plat/intel/soc/common/drivers/wdt/watchdog.c (renamed from plat/intel/soc/stratix10/drivers/wdt/watchdog.c) | 0 | ||||
| -rw-r--r-- | plat/intel/soc/common/drivers/wdt/watchdog.h (renamed from plat/intel/soc/stratix10/drivers/wdt/watchdog.h) | 4 | ||||
| -rw-r--r-- | plat/intel/soc/stratix10/bl2_plat_setup.c | 4 | ||||
| -rw-r--r-- | plat/intel/soc/stratix10/platform.mk | 5 |
6 files changed, 9 insertions, 8 deletions
diff --git a/plat/intel/soc/stratix10/drivers/qspi/cadence_qspi.c b/plat/intel/soc/common/drivers/qspi/cadence_qspi.c index 506a633b..506a633b 100644 --- a/plat/intel/soc/stratix10/drivers/qspi/cadence_qspi.c +++ b/plat/intel/soc/common/drivers/qspi/cadence_qspi.c diff --git a/plat/intel/soc/stratix10/drivers/qspi/cadence_qspi.h b/plat/intel/soc/common/drivers/qspi/cadence_qspi.h index e419161c..3906a1ae 100644 --- a/plat/intel/soc/stratix10/drivers/qspi/cadence_qspi.h +++ b/plat/intel/soc/common/drivers/qspi/cadence_qspi.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CAD_QSPI_H__ -#define __CAD_QSPI_H__ +#ifndef CAD_QSPI_H +#define CAD_QSPI_H #define CAD_QSPI_MICRON_N25Q_SUPPORT 1 diff --git a/plat/intel/soc/stratix10/drivers/wdt/watchdog.c b/plat/intel/soc/common/drivers/wdt/watchdog.c index b4dbe5f4..b4dbe5f4 100644 --- a/plat/intel/soc/stratix10/drivers/wdt/watchdog.c +++ b/plat/intel/soc/common/drivers/wdt/watchdog.c diff --git a/plat/intel/soc/stratix10/drivers/wdt/watchdog.h b/plat/intel/soc/common/drivers/wdt/watchdog.h index e9202367..9410242a 100644 --- a/plat/intel/soc/stratix10/drivers/wdt/watchdog.h +++ b/plat/intel/soc/common/drivers/wdt/watchdog.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __CAD_WATCHDOG_H__ -#define __CAD_WATCHDOG_H__ +#ifndef CAD_WATCHDOG_H +#define CAD_WATCHDOG_H #define WDT_BASE (0xFFD00200) #define WDT_REG_SIZE_OFFSET (0x4) diff --git a/plat/intel/soc/stratix10/bl2_plat_setup.c b/plat/intel/soc/stratix10/bl2_plat_setup.c index 58e8c029..78301628 100644 --- a/plat/intel/soc/stratix10/bl2_plat_setup.c +++ b/plat/intel/soc/stratix10/bl2_plat_setup.c @@ -31,8 +31,8 @@ #include "s10_pinmux.h" #include "aarch64/stratix10_private.h" #include "include/s10_mailbox.h" -#include "drivers/qspi/cadence_qspi.h" -#include "drivers/wdt/watchdog.h" +#include "qspi/cadence_qspi.h" +#include "wdt/watchdog.h" const mmap_region_t plat_stratix10_mmap[] = { diff --git a/plat/intel/soc/stratix10/platform.mk b/plat/intel/soc/stratix10/platform.mk index fdd6e45b..c1d62da9 100644 --- a/plat/intel/soc/stratix10/platform.mk +++ b/plat/intel/soc/stratix10/platform.mk @@ -7,6 +7,7 @@ PLAT_INCLUDES := \ -Iplat/intel/soc/stratix10/ \ -Iplat/intel/soc/stratix10/include/ \ + -Iplat/intel/soc/common/drivers/ PLAT_BL_COMMON_SOURCES := \ lib/xlat_tables/xlat_tables_common.c \ @@ -46,8 +47,8 @@ BL2_SOURCES += \ plat/intel/soc/stratix10/soc/s10_system_manager.c \ common/desc_image_load.c \ plat/intel/soc/stratix10/soc/s10_mailbox.c \ - plat/intel/soc/stratix10/drivers/qspi/cadence_qspi.c \ - plat/intel/soc/stratix10/drivers/wdt/watchdog.c + plat/intel/soc/common/drivers/qspi/cadence_qspi.c \ + plat/intel/soc/common/drivers/wdt/watchdog.c BL31_SOURCES += drivers/arm/cci/cci.c \ lib/cpus/aarch64/cortex_a53.S \ |