diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2023-12-07 15:09:51 +0000 |
|---|---|---|
| committer | Andre Przywara <andre.przywara@arm.com> | 2024-04-22 01:12:25 +0100 |
| commit | 02780a1c2675916bea8dbfb594bba7936ff538d5 (patch) | |
| tree | b08466f1184e254f335c0e77d6e53885b2944c0d | |
| parent | 6f68b9ce6cd180e5dc8d469a82db0cb48cc8d0ef (diff) | |
| download | u-boot-02780a1c2675916bea8dbfb594bba7936ff538d5.zip u-boot-02780a1c2675916bea8dbfb594bba7936ff538d5.tar.gz u-boot-02780a1c2675916bea8dbfb594bba7936ff538d5.tar.bz2 | |
sunxi: move #ifdef guards around tzpc_init() to header file
Some later 32-bit SoCs require some setup of the Secure Peripherals
Controller, which is handled in tzpc_init().
At the moment this is guarded in board.c by some #ifdefs selecting the
SoCs that need it.
Move those #ifdef guards into the header file, providing an empty stub
function for all other SoCs, so that the #ifdefs can be removed from the
.c file, to improve readability.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/tzpc.h | 6 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/board.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/tzpc.h b/arch/arm/include/asm/arch-sunxi/tzpc.h index 7a6fcae..9269608 100644 --- a/arch/arm/include/asm/arch-sunxi/tzpc.h +++ b/arch/arm/include/asm/arch-sunxi/tzpc.h @@ -28,6 +28,12 @@ struct sunxi_tzpc { #define SUN8I_H3_TZPC_DECPORT1_ALL 0xff #define SUN8I_H3_TZPC_DECPORT2_ALL 0x7f +#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H3 void tzpc_init(void); +#else +static inline void tzpc_init(void) +{ +} +#endif #endif /* _SUNXI_TZPC_H */ diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index f4dbb2a..0140b07 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -458,10 +458,8 @@ void board_init_f(ulong dummy) { sunxi_sram_init(); -#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H3 /* Enable non-secure access to some peripherals */ tzpc_init(); -#endif clock_init(); timer_init(); |