mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-23 11:33:32 +00:00
74673ca705
The commit ed35de6170 ("Convert CONFIG_ZYNQMP_PSU_INIT_ENABLED to
Kconfig") converted CONFIG_ZYNQMP_PSU_INIT_ENABLED symbol and enabled it by
default which is not correct configuration.
Intention of this config was to have it enabled by default for SPL and
provide an option to users to also do low level initialization directly
from U-Boot.
That's why it is necessary to define second symbol with SPL marking in it
and properly use symbols depends on usage in Makefile.
Also disable ZYNQMP_PSU_INIT_ENABLED from boards which enables it by
default. CONFIG_SPL_ZYNQMP_PSU_INIT_ENABLED is enabled by default when SPL
is enabled.
Reported-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu@amd.com>
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/d5fcbd66b05bf0d7ef594e66464ee23b48c5e4cc.1669969083.git.michal.simek@amd.com
54 lines
1.6 KiB
Makefile
54 lines
1.6 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0+
|
|
#
|
|
# (C) Copyright 2014 - 2016 Xilinx, Inc.
|
|
# Michal Simek <michal.simek@xilinx.com>
|
|
|
|
obj-y := zynqmp.o
|
|
|
|
ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
|
|
PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE))
|
|
init-objs := ps_init_gpl.o
|
|
spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE)
|
|
$(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^
|
|
endif
|
|
|
|
DEVICE_TREE ?= $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%)
|
|
ifeq ($(DEVICE_TREE),)
|
|
DEVICE_TREE := unset
|
|
endif
|
|
|
|
ifeq ($(init-objs),)
|
|
hw-platform-y :=$(shell echo $(DEVICE_TREE))
|
|
init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\
|
|
$(hw-platform-y)/psu_init_gpl.o)
|
|
endif
|
|
|
|
ifeq ($(init-objs),)
|
|
ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),)
|
|
init-objs := psu_init_gpl.o
|
|
$(if $(CONFIG_SPL_BUILD),\
|
|
$(warning Put custom psu_init_gpl.c/h to board/xilinx/zynqmp/custom_hw_platform/))
|
|
endif
|
|
endif
|
|
|
|
obj-$(CONFIG_$(SPL_)ZYNQMP_PSU_INIT_ENABLED) += $(init-objs)
|
|
|
|
ifdef CONFIG_SPL_BUILD
|
|
ifneq ($(CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE),"")
|
|
obj-$(CONFIG_SPL_BUILD) += pm_cfg_obj.o
|
|
$(obj)/pm_cfg_obj.o: $(shell cd $(srctree); readlink -f $(CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE)) FORCE
|
|
endif
|
|
endif
|
|
|
|
ifndef CONFIG_SPL_BUILD
|
|
obj-$(CONFIG_CMD_ZYNQMP) += cmds.o
|
|
endif
|
|
|
|
# Suppress "warning: function declaration isn't a prototype"
|
|
CFLAGS_REMOVE_psu_init_gpl.o := -Wstrict-prototypes
|
|
|
|
# To include xil_io.h
|
|
CFLAGS_psu_init_gpl.o := -I$(srctree)/$(src)
|
|
|
|
# To suppress "warning: cast to pointer from integer of different size"
|
|
CFLAGS_psu_init_gpl.o += -Wno-int-to-pointer-cast
|