diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2020-09-09 14:41:56 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2020-09-23 10:31:41 +0200 |
| commit | 29bd8ada52e186ea6b7f8b633d7aa6296fb097d1 (patch) | |
| tree | e28766afe0f94273ebefadfd0519a3a7a4586078 /board/xilinx/zynqmp | |
| parent | b7d4518eed716a483b4efa1e282033f37244ab2d (diff) | |
| download | u-boot-29bd8ada52e186ea6b7f8b633d7aa6296fb097d1.tar.gz u-boot-29bd8ada52e186ea6b7f8b633d7aa6296fb097d1.tar.xz u-boot-29bd8ada52e186ea6b7f8b633d7aa6296fb097d1.zip | |
fpga: kconfig: Rename SPL_FPGA_SUPPORT to SPL_FPGA
The patch does sed 's/SPL_FPGA_SUPPORT/SPL_FPGA/g' but also fixing Makefile
and zynqmp.c to simplify if/endif logic in zynqmp.c.
This change is mostly done to be able to use CONFIG_IS_ENABLED macro and
obj-$(CONFIG_$(SPL_)FPGA) in Makefile. For them symbols need to be in sync.
And removing one line from Topic Miami boards which is not needed because
symbol is not enabled via Kconfig.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board/xilinx/zynqmp')
| -rw-r--r-- | board/xilinx/zynqmp/zynqmp.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index e95d13a14c..30f757627f 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -49,10 +49,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) && \ - !defined(CONFIG_SPL_BUILD) || (defined(CONFIG_SPL_FPGA_SUPPORT) && \ - defined(CONFIG_SPL_BUILD)) - +#if CONFIG_IS_ENABLED(FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) static xilinx_desc zynqmppl = XILINX_ZYNQMP_DESC; enum { @@ -331,9 +328,7 @@ int board_init(void) /* Bug in ROM sets wrong value in this register */ writel(PS_SYSMON_ANALOG_BUS_VAL, PS_SYSMON_ANALOG_BUS_REG); -#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) && \ - !defined(CONFIG_SPL_BUILD) || (defined(CONFIG_SPL_FPGA_SUPPORT) && \ - defined(CONFIG_SPL_BUILD)) +#if CONFIG_IS_ENABLED(FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) zynqmppl.name = zynqmp_get_silicon_idcode_name(); printf("Chip ID:\t%s\n", zynqmppl.name); fpga_init(); |