andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1739 from Yann-lms/includes 

stm32mp1: do not include platform header files directly in drivers
This commit is contained in:
Antonio Niño Díaz 2019-01-08 09:10:32 +00:00 committed by GitHub
parent bd0bad1a1b 6e6ab282f7
commit f0ea34206a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/st/clk/stm32mp1_clk.c
View File

@ -11,6 +11,8 @@
#include <libfdt.h>
#include <platform_def.h>
#include <arch.h>
#include <arch_helpers.h>
#include <common/debug.h>
@ -25,9 +27,6 @@
#include <lib/utils_def.h>
#include <plat/common/platform.h>
#include <stm32mp1_dt.h>
#include <stm32mp1_private.h>
#define MAX_HSI_HZ 64000000
#define TIMEOUT_200MS (plat_get_syscnt_freq2() / 5U)

4
drivers/st/clk/stm32mp1_clkfunc.c
View File

@ -8,12 +8,12 @@
#include <libfdt.h>
#include <platform_def.h>
#include <drivers/st/stm32mp1_clk.h>
#include <drivers/st/stm32mp1_clkfunc.h>
#include <dt-bindings/clock/stm32mp1-clksrc.h>
#include <stm32mp1_dt.h>
#define DT_RCC_NODE_NAME "rcc@50000000"
#define DT_RCC_CLK_COMPAT "st,stm32mp1-rcc"
#define DT_RCC_COMPAT "syscon"

5
drivers/st/ddr/stm32mp1_ddr.c
View File

@ -6,6 +6,8 @@
#include <stddef.h>
#include <platform_def.h>
#include <arch.h>
#include <arch_helpers.h>
#include <common/debug.h>
@ -21,9 +23,6 @@
#include <lib/mmio.h>
#include <plat/common/platform.h>
#include <stm32mp1_def.h>
#include <stm32mp1_dt.h>
struct reg_desc {
const char *name;
uint16_t offset; /* Offset for base address */

4
drivers/st/ddr/stm32mp1_ram.c
View File

@ -20,10 +20,6 @@
#include <dt-bindings/clock/stm32mp1-clks.h>
#include <lib/mmio.h>
#include <boot_api.h>
#include <stm32mp1_dt.h>
#include <stm32mp1_private.h>
#define DDR_PATTERN 0xAAAAAAAAU
#define DDR_ANTIPATTERN 0x55555555U

2
drivers/st/io/io_stm32image.c
View File

@ -18,8 +18,6 @@
#include <lib/utils.h>
#include <plat/common/platform.h>
#include <boot_api.h>
static uintptr_t backend_dev_handle;
static uintptr_t backend_image_spec;
static uint32_t *stm32_img;

7
drivers/st/mmc/stm32_sdmmc2.c
View File

@ -8,6 +8,10 @@
#include <errno.h>
#include <string.h>
#include <libfdt.h>
#include <platform_def.h>
#include <arch.h>
#include <arch_helpers.h>
#include <common/debug.h>
@ -19,13 +23,10 @@
#include <drivers/st/stm32mp1_reset.h>
#include <dt-bindings/clock/stm32mp1-clks.h>
#include <dt-bindings/reset/stm32mp1-resets.h>
#include <libfdt.h>
#include <lib/mmio.h>
#include <lib/utils.h>
#include <plat/common/platform.h>
#include <stm32mp1_dt.h>
/* Registers offsets */
#define SDMMC_POWER 0x00U
#define SDMMC_CLKCR 0x04U

3
drivers/st/pmic/stm32mp1_pmic.c
View File

@ -20,9 +20,6 @@
#include <lib/mmio.h>
#include <lib/utils_def.h>
#include <stm32mp1_def.h>
#include <stm32mp1_dt.h>
/* I2C Timing hard-coded value, for I2C clock source is HSI at 64MHz */
#define I2C_TIMING 0x10D07DB5

2
include/drivers/st/stm32mp1_pmic.h
View File

@ -9,7 +9,7 @@
#include <stdbool.h>
#include <stm32mp1_def.h>
#include <platform_def.h>
bool dt_check_pmic(void);
int dt_pmic_enable_boot_on_regulators(void);

2
plat/st/stm32mp1/platform.mk
View File

@ -22,8 +22,6 @@ PLAT_PARTITION_MAX_ENTRIES := $(shell echo $$(($(STM32_TF_A_COPIES) + 1)))
$(eval $(call add_define,PLAT_PARTITION_MAX_ENTRIES))
PLAT_INCLUDES := -Iplat/st/stm32mp1/include/
PLAT_INCLUDES += -Iplat/st/stm32mp1/
PLAT_INCLUDES += -Iinclude/common/tbbr
# Device tree
STM32_DTB_FILE_NAME ?= stm32mp157c-ev1.dtb

6
plat/st/stm32mp1/stm32mp1_def.h
View File

@ -11,6 +11,12 @@
#include <lib/utils_def.h>
#include <lib/xlat_tables/xlat_tables_defs.h>
#ifndef __ASSEMBLY__
#include <boot_api.h>
#include <stm32mp1_dt.h>
#include <stm32mp1_private.h>
#endif
/*******************************************************************************
* STM32MP1 memory map related constants
******************************************************************************/