diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2022-02-17 14:28:39 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2022-02-21 13:20:06 +0100 |
| commit | 27703ba06ded72b735ad92214857d7628a273429 (patch) | |
| tree | 1c9e04ead1bdee86461adbb905a880a4c45c8284 | |
| parent | f063100593942a33d8bf40dbc95b4b44e417a368 (diff) | |
| download | u-boot-27703ba06ded72b735ad92214857d7628a273429.zip u-boot-27703ba06ded72b735ad92214857d7628a273429.tar.gz u-boot-27703ba06ded72b735ad92214857d7628a273429.tar.bz2 | |
arm64: zynqmp: Build psu_spl_init for SPL all the time
ZYNQMP_PSU_INIT_ENABLED specifically saying that has connection to full
U-Boot not SPL that's why build psu_spl_init for SPL all the time.
Also disable ZYNQMP_PSU_INIT_ENABLED because it ends up in situation that
psu_init() is called twice which is wrong. By default only SPL should call
it.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/bf1e5d9a163f8853c7d951ad42965114ab0b1f50.1645104518.git.michal.simek@xilinx.com
| -rw-r--r-- | arch/arm/mach-zynqmp/Makefile | 2 | ||||
| -rw-r--r-- | configs/xilinx_zynqmp_virt_defconfig | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-zynqmp/Makefile b/arch/arm/mach-zynqmp/Makefile index eb6c511..4f9f6b5 100644 --- a/arch/arm/mach-zynqmp/Makefile +++ b/arch/arm/mach-zynqmp/Makefile @@ -6,6 +6,6 @@ obj-y += clk.o obj-y += cpu.o obj-$(CONFIG_MP) += mp.o -obj-$(CONFIG_SPL_BUILD) += spl.o handoff.o +obj-$(CONFIG_SPL_BUILD) += spl.o handoff.o psu_spl_init.o obj-$(CONFIG_SPL_ZYNQMP_DRAM_ECC_INIT) += ecc_spl_init.o obj-$(CONFIG_ZYNQMP_PSU_INIT_ENABLED) += psu_spl_init.o diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index 133a563..5cdfa6c 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -18,7 +18,6 @@ CONFIG_ZYNQ_MAC_IN_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20 CONFIG_CMD_FRU=y CONFIG_ZYNQMP_USB=y -CONFIG_ZYNQMP_PSU_INIT_ENABLED=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x8000000 |