Merge "fix(stm32mp1): correct include order" into integration

This commit is contained in:
Madhukar Pappireddy 2021-12-17 20:04:33 +01:00 committed by TrustedFirmware Code Review
commit f480c9c42b
2 changed files with 3 additions and 4 deletions

View File

@ -8,8 +8,6 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <platform_def.h>
#include <arch_helpers.h> #include <arch_helpers.h>
#include <common/bl_common.h> #include <common/bl_common.h>
#include <common/debug.h> #include <common/debug.h>
@ -19,10 +17,10 @@
#include <drivers/st/bsec.h> #include <drivers/st/bsec.h>
#include <drivers/st/stm32_iwdg.h> #include <drivers/st/stm32_iwdg.h>
#include <drivers/st/stm32_uart.h> #include <drivers/st/stm32_uart.h>
#include <drivers/st/stm32mp_pmic.h>
#include <drivers/st/stm32mp1_clk.h> #include <drivers/st/stm32mp1_clk.h>
#include <drivers/st/stm32mp1_pwr.h> #include <drivers/st/stm32mp1_pwr.h>
#include <drivers/st/stm32mp1_ram.h> #include <drivers/st/stm32mp1_ram.h>
#include <drivers/st/stm32mp_pmic.h>
#include <lib/fconf/fconf.h> #include <lib/fconf/fconf.h>
#include <lib/fconf/fconf_dyn_cfg_getter.h> #include <lib/fconf/fconf_dyn_cfg_getter.h>
#include <lib/mmio.h> #include <lib/mmio.h>
@ -30,6 +28,7 @@
#include <lib/xlat_tables/xlat_tables_v2.h> #include <lib/xlat_tables/xlat_tables_v2.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <platform_def.h>
#include <stm32mp1_dbgmcu.h> #include <stm32mp1_dbgmcu.h>
static struct stm32mp_auth_ops stm32mp1_auth_ops; static struct stm32mp_auth_ops stm32mp1_auth_ops;

View File

@ -8,9 +8,9 @@
#include <drivers/st/stm32_gpio.h> #include <drivers/st/stm32_gpio.h>
#include <drivers/st/stm32_iwdg.h> #include <drivers/st/stm32_iwdg.h>
#include <libfdt.h>
#include <lib/mmio.h> #include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables_v2.h> #include <lib/xlat_tables/xlat_tables_v2.h>
#include <libfdt.h>
#include <platform_def.h> #include <platform_def.h>