brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

fpga: kconfig: Rename SPL_FPGA_SUPPORT to SPL_FPGA

Browse Source 
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>
This commit is contained in:
Michal Simek 2020-09-09 14:41:56 +02:00
parent b7d4518eed
commit 29bd8ada52
9 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-zynq/cpu.c
View File

@ -17,8 +17,7 @@
#define ZYNQ_SILICON_VER_MASK 0xF0000000 #define ZYNQ_SILICON_VER_MASK 0xF0000000
#define ZYNQ_SILICON_VER_SHIFT 28 #define ZYNQ_SILICON_VER_SHIFT 28
#if (defined(CONFIG_FPGA) && !defined(CONFIG_SPL_BUILD)) || \ #if CONFIG_IS_ENABLED(FPGA)
(defined(CONFIG_SPL_FPGA_SUPPORT) && defined(CONFIG_SPL_BUILD))
xilinx_desc fpga = { xilinx_desc fpga = {
.family = xilinx_zynq, .family = xilinx_zynq,
.iface = devcfg, .iface = devcfg,
@ -111,8 +110,7 @@ static int __maybe_unused cpu_desc_id(void)
#if defined(CONFIG_ARCH_EARLY_INIT_R) #if defined(CONFIG_ARCH_EARLY_INIT_R)
int arch_early_init_r(void) int arch_early_init_r(void)
{ {
#if (defined(CONFIG_FPGA) && !defined(CONFIG_SPL_BUILD)) || \ #if CONFIG_IS_ENABLED(FPGA)
(defined(CONFIG_SPL_FPGA_SUPPORT) && defined(CONFIG_SPL_BUILD))
int cpu_id = cpu_desc_id(); int cpu_id = cpu_desc_id();
if (cpu_id < 0) if (cpu_id < 0)

2
arch/arm/mach-zynq/spl.c
View File

@ -34,7 +34,7 @@ void board_init_f(ulong dummy)
void spl_board_init(void) void spl_board_init(void)
{ {
preloader_console_init(); preloader_console_init();
#if defined(CONFIG_ARCH_EARLY_INIT_R) && defined(CONFIG_SPL_FPGA_SUPPORT) #if defined(CONFIG_ARCH_EARLY_INIT_R) && defined(CONFIG_SPL_FPGA)
arch_early_init_r(); arch_early_init_r();
#endif #endif
board_init(); board_init();

9
board/xilinx/zynqmp/zynqmp.c
View File

@ -49,10 +49,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) && \ #if CONFIG_IS_ENABLED(FPGA) && defined(CONFIG_FPGA_ZYNQMPPL)
!defined(CONFIG_SPL_BUILD) || (defined(CONFIG_SPL_FPGA_SUPPORT) && \
defined(CONFIG_SPL_BUILD))
static xilinx_desc zynqmppl = XILINX_ZYNQMP_DESC; static xilinx_desc zynqmppl = XILINX_ZYNQMP_DESC;
enum { enum {
@ -331,9 +328,7 @@ int board_init(void)
/* Bug in ROM sets wrong value in this register */ /* Bug in ROM sets wrong value in this register */
writel(PS_SYSMON_ANALOG_BUS_VAL, PS_SYSMON_ANALOG_BUS_REG); writel(PS_SYSMON_ANALOG_BUS_VAL, PS_SYSMON_ANALOG_BUS_REG);
#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) && \ #if CONFIG_IS_ENABLED(FPGA) && defined(CONFIG_FPGA_ZYNQMPPL)
!defined(CONFIG_SPL_BUILD) || (defined(CONFIG_SPL_FPGA_SUPPORT) && \
defined(CONFIG_SPL_BUILD))
zynqmppl.name = zynqmp_get_silicon_idcode_name(); zynqmppl.name = zynqmp_get_silicon_idcode_name();
printf("Chip ID:\t%s\n", zynqmppl.name); printf("Chip ID:\t%s\n", zynqmppl.name);
fpga_init(); fpga_init();

2
common/spl/Kconfig
View File

@ -602,7 +602,7 @@ config SPL_FAT_WRITE
Support for the underlying block device (e.g. MMC or USB) must be Support for the underlying block device (e.g. MMC or USB) must be
enabled separately. enabled separately.
config SPL_FPGA_SUPPORT config SPL_FPGA
bool "Support FPGAs" bool "Support FPGAs"
help help
Enable support for FPGAs in SPL. Field-programmable Gate Arrays Enable support for FPGAs in SPL. Field-programmable Gate Arrays

4
common/spl/spl_fit.c
View File

@ -253,7 +253,7 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
const void *data; const void *data;
bool external_data = false; bool external_data = false;
if (IS_ENABLED(CONFIG_SPL_FPGA_SUPPORT) || if (IS_ENABLED(CONFIG_SPL_FPGA) ||
(IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP))) { (IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP))) {
if (fit_image_get_type(fit, node, &type)) if (fit_image_get_type(fit, node, &type))
puts("Cannot get image type.\n"); puts("Cannot get image type.\n");
@ -546,7 +546,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
return -1; return -1;
} }
#ifdef CONFIG_SPL_FPGA_SUPPORT #ifdef CONFIG_SPL_FPGA
node = spl_fit_get_image_node(fit, images, "fpga", 0); node = spl_fit_get_image_node(fit, images, "fpga", 0);
if (node >= 0) { if (node >= 0) {
/* Load the image and set up the spl_image structure */ /* Load the image and set up the spl_image structure */

2
configs/socfpga_arria10_defconfig
View File

@ -23,7 +23,7 @@ CONFIG_DEFAULT_FDT_FILE="socfpga_arria10_socdk_sdmmc.dtb"
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_FPGA_SUPPORT=y CONFIG_SPL_FPGA=y
CONFIG_CMD_ASKENV=y CONFIG_CMD_ASKENV=y
CONFIG_CMD_GREPENV=y CONFIG_CMD_GREPENV=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

2
configs/xilinx_zynq_virt_defconfig
View File

@ -20,7 +20,7 @@ CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SPL_FPGA_SUPPORT=y CONFIG_SPL_FPGA=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
# CONFIG_BOOTM_NETBSD is not set # CONFIG_BOOTM_NETBSD is not set

3
drivers/Makefile
View File

@ -30,6 +30,7 @@ obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm/
obj-$(CONFIG_$(SPL_TPL_)ACPI_PMC) += power/acpi_pmc/ obj-$(CONFIG_$(SPL_TPL_)ACPI_PMC) += power/acpi_pmc/
obj-$(CONFIG_$(SPL_)BOARD) += board/ obj-$(CONFIG_$(SPL_)BOARD) += board/
obj-$(CONFIG_XEN) += xen/ obj-$(CONFIG_XEN) += xen/
obj-$(CONFIG_$(SPL_)FPGA) += fpga/
ifndef CONFIG_TPL_BUILD ifndef CONFIG_TPL_BUILD
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
@ -60,7 +61,6 @@ obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += usb/host/
obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/ obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/
obj-$(CONFIG_SPL_SATA_SUPPORT) += ata/ scsi/ obj-$(CONFIG_SPL_SATA_SUPPORT) += ata/ scsi/
obj-$(CONFIG_HAVE_BLOCK_DEVICE) += block/ obj-$(CONFIG_HAVE_BLOCK_DEVICE) += block/
obj-$(CONFIG_SPL_FPGA_SUPPORT) += fpga/
obj-$(CONFIG_SPL_THERMAL) += thermal/ obj-$(CONFIG_SPL_THERMAL) += thermal/
endif endif
@ -85,7 +85,6 @@ obj-y += cache/
obj-$(CONFIG_CPU) += cpu/ obj-$(CONFIG_CPU) += cpu/
obj-y += crypto/ obj-y += crypto/
obj-$(CONFIG_FASTBOOT) += fastboot/ obj-$(CONFIG_FASTBOOT) += fastboot/
obj-$(CONFIG_FPGA) += fpga/
obj-y += misc/ obj-y += misc/
obj-$(CONFIG_MMC) += mmc/ obj-$(CONFIG_MMC) += mmc/
obj-$(CONFIG_NVME) += nvme/ obj-$(CONFIG_NVME) += nvme/

1
include/configs/topic_miami.h
View File

@ -24,7 +24,6 @@
/* No falcon support */ /* No falcon support */
#undef CONFIG_SPL_OS_BOOT #undef CONFIG_SPL_OS_BOOT
#undef CONFIG_SPL_FPGA_SUPPORT
/* FPGA commands that we don't use */ /* FPGA commands that we don't use */