diff options
author | Yann Gautier <yann.gautier@st.com> | 2019-02-14 11:13:50 +0100 |
---|---|---|
committer | Yann Gautier <yann.gautier@st.com> | 2019-02-14 11:20:23 +0100 |
commit | e0a8ce5d0d1395da3b442c7c019ba62d1361e92b (patch) | |
tree | 132329104ad494f015f3995057b4388749be3c6d /plat/st | |
parent | 3f9c97842e5780e0e21f8eb36844c8154635c8c4 (diff) |
stm32mp1: remove some dependencies on clocks and reset in drivers
Include all RCC, clocks and reset headers from stm32mp1_def.h
which if exported to the firmware through platform_def.h.
The same dependency removal is done in common code as well.
Some useless includes are also removed in stm32_sdmmc2 driver.
Change-Id: I731ea5775c3fdb7f7b0c388b93923ed5e84b8d3f
Signed-off-by: Yann Gautier <yann.gautier@st.com>
Diffstat (limited to 'plat/st')
-rw-r--r-- | plat/st/common/bl2_io_storage.c | 1 | ||||
-rw-r--r-- | plat/st/common/stm32mp_common.c | 1 | ||||
-rw-r--r-- | plat/st/common/stm32mp_dt.c | 1 | ||||
-rw-r--r-- | plat/st/stm32mp1/bl2_plat_setup.c | 1 | ||||
-rw-r--r-- | plat/st/stm32mp1/stm32mp1_def.h | 5 | ||||
-rw-r--r-- | plat/st/stm32mp1/stm32mp1_helper.S | 1 | ||||
-rw-r--r-- | plat/st/stm32mp1/stm32mp1_pm.c | 1 | ||||
-rw-r--r-- | plat/st/stm32mp1/stm32mp1_security.c | 1 |
8 files changed, 5 insertions, 7 deletions
diff --git a/plat/st/common/bl2_io_storage.c b/plat/st/common/bl2_io_storage.c index 5b649a34..c8bb559f 100644 --- a/plat/st/common/bl2_io_storage.c +++ b/plat/st/common/bl2_io_storage.c @@ -20,7 +20,6 @@ #include <drivers/st/io_mmc.h> #include <drivers/st/io_stm32image.h> #include <drivers/st/stm32_sdmmc2.h> -#include <drivers/st/stm32mp1_rcc.h> #include <lib/mmio.h> #include <lib/utils.h> #include <plat/common/platform.h> diff --git a/plat/st/common/stm32mp_common.c b/plat/st/common/stm32mp_common.c index 20aa57da..aecef471 100644 --- a/plat/st/common/stm32mp_common.c +++ b/plat/st/common/stm32mp_common.c @@ -10,7 +10,6 @@ #include <arch_helpers.h> #include <common/debug.h> -#include <dt-bindings/clock/stm32mp1-clks.h> #include <plat/common/platform.h> uintptr_t plat_get_ns_image_entrypoint(void) diff --git a/plat/st/common/stm32mp_dt.c b/plat/st/common/stm32mp_dt.c index 0b6a0d32..c0b0518d 100644 --- a/plat/st/common/stm32mp_dt.c +++ b/plat/st/common/stm32mp_dt.c @@ -13,7 +13,6 @@ #include <common/debug.h> #include <drivers/st/stm32_gpio.h> -#include <drivers/st/stm32mp1_clk.h> #include <drivers/st/stm32mp1_ddr.h> #include <drivers/st/stm32mp1_ram.h> diff --git a/plat/st/stm32mp1/bl2_plat_setup.c b/plat/st/stm32mp1/bl2_plat_setup.c index beea69a9..bcf1aa9e 100644 --- a/plat/st/stm32mp1/bl2_plat_setup.c +++ b/plat/st/stm32mp1/bl2_plat_setup.c @@ -21,7 +21,6 @@ #include <drivers/st/stm32mp1_clk.h> #include <drivers/st/stm32mp1_pwr.h> #include <drivers/st/stm32mp1_ram.h> -#include <drivers/st/stm32mp1_rcc.h> #include <lib/mmio.h> #include <lib/xlat_tables/xlat_tables_v2.h> #include <plat/common/platform.h> diff --git a/plat/st/stm32mp1/stm32mp1_def.h b/plat/st/stm32mp1/stm32mp1_def.h index a456f263..95d34125 100644 --- a/plat/st/stm32mp1/stm32mp1_def.h +++ b/plat/st/stm32mp1/stm32mp1_def.h @@ -8,10 +8,15 @@ #define STM32MP1_DEF_H #include <common/tbbr/tbbr_img_def.h> +#include <drivers/st/stm32mp1_rcc.h> +#include <dt-bindings/clock/stm32mp1-clks.h> +#include <dt-bindings/reset/stm32mp1-resets.h> #include <lib/utils_def.h> #include <lib/xlat_tables/xlat_tables_defs.h> #ifndef __ASSEMBLY__ +#include <drivers/st/stm32mp1_clk.h> + #include <boot_api.h> #include <stm32mp_common.h> #include <stm32mp_dt.h> diff --git a/plat/st/stm32mp1/stm32mp1_helper.S b/plat/st/stm32mp1/stm32mp1_helper.S index c6759655..bfcd991a 100644 --- a/plat/st/stm32mp1/stm32mp1_helper.S +++ b/plat/st/stm32mp1/stm32mp1_helper.S @@ -10,7 +10,6 @@ #include <asm_macros.S> #include <common/bl_common.h> #include <drivers/st/stm32_gpio.h> -#include <drivers/st/stm32mp1_rcc.h> #define GPIO_TX_SHIFT (DEBUG_UART_TX_GPIO_PORT << 1) #define GPIO_TX_ALT_SHIFT ((DEBUG_UART_TX_GPIO_PORT - GPIO_ALT_LOWER_LIMIT) << 2) diff --git a/plat/st/stm32mp1/stm32mp1_pm.c b/plat/st/stm32mp1/stm32mp1_pm.c index 18921ef0..c4d02327 100644 --- a/plat/st/stm32mp1/stm32mp1_pm.c +++ b/plat/st/stm32mp1/stm32mp1_pm.c @@ -14,7 +14,6 @@ #include <drivers/arm/gic_common.h> #include <drivers/arm/gicv2.h> #include <drivers/st/stm32mp1_clk.h> -#include <drivers/st/stm32mp1_rcc.h> #include <dt-bindings/clock/stm32mp1-clks.h> #include <lib/mmio.h> #include <lib/psci/psci.h> diff --git a/plat/st/stm32mp1/stm32mp1_security.c b/plat/st/stm32mp1/stm32mp1_security.c index bb66b4b5..baa3916d 100644 --- a/plat/st/stm32mp1/stm32mp1_security.c +++ b/plat/st/stm32mp1/stm32mp1_security.c @@ -11,7 +11,6 @@ #include <common/debug.h> #include <drivers/arm/tzc400.h> #include <drivers/st/stm32mp1_clk.h> -#include <drivers/st/stm32mp1_rcc.h> #include <dt-bindings/clock/stm32mp1-clks.h> #include <lib/mmio.h> |