diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-24 21:28:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-24 21:28:47 -0400 |
| commit | 3eebbd866bfa8e889e52d1734b574a585e076a5a (patch) | |
| tree | 5ba4d5966dd2589cc21728c502f56549de1c7d57 /arch/arm/cpu/armv8/fsl-layerscape/cpu.c | |
| parent | 26bfb853cae5c05950f8716e6f405eb0f9588d97 (diff) | |
| parent | c4f0de3eecd951cd5480cdbc9d96c63a4432a521 (diff) | |
Merge tag 'fsl-qoriq-2022-10-18' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq
Layerscape update
- support sysreset,
- de-select FSL_IFC when booting from SD
- disable unused parts of ICID tables
- reduce ns_dev size for csu
- enable dma snooping for ls104x
- nand driver fixups for ls1043ardb rev 7.0 boards.
Diffstat (limited to 'arch/arm/cpu/armv8/fsl-layerscape/cpu.c')
| -rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index c989a43cbe..487c0ed553 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -1229,6 +1229,7 @@ int timer_init(void) return 0; } +#if !CONFIG_IS_ENABLED(SYSRESET) __efi_runtime_data u32 __iomem *rstcr = (u32 *)CONFIG_SYS_FSL_RST_ADDR; void __efi_runtime reset_cpu(void) @@ -1248,6 +1249,7 @@ void __efi_runtime reset_cpu(void) scfg_out32(rstcr, val); #endif } +#endif #if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_PSCI_RESET) |