diff options
| author | Tom Rini <[email protected]> | 2025-06-23 14:49:16 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-06-23 16:15:23 -0600 |
| commit | 184e7d0bb211b8885f6715fdd6149ce96a4d1037 (patch) | |
| tree | 271f9ebbfa6f0d2776054bbf07c396ebe1f663e8 /arch | |
| parent | dbf7fd557a73ded3141db3c2cf5c572989378825 (diff) | |
| parent | fb4a488eb91b089912ffbc9a74d0527f0f2c79ac (diff) | |
Merge tag 'v2025.07-rc5' into next
Prepare v2025.07-rc5
With this merge, tighten up the LTO_FLAGS removal we added to not
trigger on ARMv7 (which is Thumb-2 and should be fine).
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-airoha/an7581/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-airoha/an7581/init.c b/arch/arm/mach-airoha/an7581/init.c index cefe9c6db9e..d149e0ee3c8 100644 --- a/arch/arm/mach-airoha/an7581/init.c +++ b/arch/arm/mach-airoha/an7581/init.c @@ -2,6 +2,7 @@ #include <fdtdec.h> #include <init.h> +#include <sysreset.h> #include <asm/armv8/mmu.h> #include <asm/system.h> @@ -21,7 +22,7 @@ int dram_init_banksize(void) return fdtdec_setup_memory_banksize(); } -void reset_cpu(ulong addr) +void reset_cpu(void) { psci_system_reset(); } |