dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 00:32:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

spl: Kconfig: Drop the _SUPPORT postfix from SPL_DFU

Browse Source 
The symbol CONFIG_SPL_DFU_SUPPORT in SPL build has the same
meaning as CONFIG_DFU in regular U-Boot. Drop the _SUPPORT
to allow for cleaner use in code.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Acked-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Andrew F. Davis
2019-01-17 13:43:02 -06:00
committed by Tom Rini
parent 70dbbd7269
commit 6536ca4d66
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/boot-common.c
View File

@@ -108,7 +108,7 @@ void save_omap_boot_params(void)
sys_boot_device = 1; sys_boot_device = 1;
break; break;
#endif #endif
#if defined(BOOT_DEVICE_DFU) && !defined(CONFIG_SPL_DFU_SUPPORT) #if defined(BOOT_DEVICE_DFU) && !defined(CONFIG_SPL_DFU)
case BOOT_DEVICE_DFU: case BOOT_DEVICE_DFU:
sys_boot_device = 1; sys_boot_device = 1;
break; break;

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

@@ -93,7 +93,7 @@ u32 spl_boot_device(void)
case EMMC_MODE: case EMMC_MODE:
return BOOT_DEVICE_MMC1; return BOOT_DEVICE_MMC1;
#endif #endif
#ifdef CONFIG_SPL_DFU_SUPPORT #ifdef CONFIG_SPL_DFU
case USB_MODE: case USB_MODE:
return BOOT_DEVICE_DFU; return BOOT_DEVICE_DFU;
#endif #endif

4
common/Makefile
View File

@@ -64,10 +64,10 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTAGE) += bootstage.o
obj-$(CONFIG_$(SPL_TPL_)BLOBLIST) += bloblist.o obj-$(CONFIG_$(SPL_TPL_)BLOBLIST) += bloblist.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
ifdef CONFIG_SPL_DFU_SUPPORT ifdef CONFIG_SPL_DFU
obj-$(CONFIG_DFU_OVER_USB) += dfu.o obj-$(CONFIG_DFU_OVER_USB) += dfu.o
endif endif
obj-$(CONFIG_SPL_DFU_SUPPORT) += cli_hush.o obj-$(CONFIG_SPL_DFU) += cli_hush.o
obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o
obj-$(CONFIG_TPL_HASH_SUPPORT) += hash.o obj-$(CONFIG_TPL_HASH_SUPPORT) += hash.o
obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o

6
common/spl/Kconfig
View File

@@ -794,7 +794,7 @@ config SPL_USB_ETHER
since the network stack uses a number of environment variables. since the network stack uses a number of environment variables.
See also SPL_NET_SUPPORT and SPL_ETH_SUPPORT. See also SPL_NET_SUPPORT and SPL_ETH_SUPPORT.
config SPL_DFU_SUPPORT config SPL_DFU
bool "Support DFU (Device Firmware Upgrade)" bool "Support DFU (Device Firmware Upgrade)"
select SPL_HASH_SUPPORT select SPL_HASH_SUPPORT
select SPL_DFU_NO_RESET select SPL_DFU_NO_RESET
@@ -809,11 +809,11 @@ config SPL_DFU_SUPPORT
choice choice
bool "DFU device selection" bool "DFU device selection"
depends on SPL_DFU_SUPPORT depends on SPL_DFU
config SPL_DFU_RAM config SPL_DFU_RAM
bool "RAM device" bool "RAM device"
depends on SPL_DFU_SUPPORT && SPL_RAM_SUPPORT depends on SPL_DFU && SPL_RAM_SUPPORT
help help
select RAM/DDR memory device for loading binary images select RAM/DDR memory device for loading binary images
(u-boot/kernel) to the selected device partition using (u-boot/kernel) to the selected device partition using

2
common/spl/Makefile
View File

@@ -26,7 +26,7 @@ obj-$(CONFIG_$(SPL_TPL_)USB_SUPPORT) += spl_usb.o
obj-$(CONFIG_$(SPL_TPL_)FAT_SUPPORT) += spl_fat.o obj-$(CONFIG_$(SPL_TPL_)FAT_SUPPORT) += spl_fat.o
obj-$(CONFIG_$(SPL_TPL_)EXT_SUPPORT) += spl_ext.o obj-$(CONFIG_$(SPL_TPL_)EXT_SUPPORT) += spl_ext.o
obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.o obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.o
obj-$(CONFIG_$(SPL_TPL_)DFU_SUPPORT) += spl_dfu.o obj-$(CONFIG_$(SPL_TPL_)DFU) += spl_dfu.o
obj-$(CONFIG_$(SPL_TPL_)SPI_LOAD) += spl_spi.o obj-$(CONFIG_$(SPL_TPL_)SPI_LOAD) += spl_spi.o
obj-$(CONFIG_$(SPL_TPL_)RAM_SUPPORT) += spl_ram.o obj-$(CONFIG_$(SPL_TPL_)RAM_SUPPORT) += spl_ram.o
obj-$(CONFIG_$(SPL_TPL_)USB_SDP_SUPPORT) += spl_sdp.o obj-$(CONFIG_$(SPL_TPL_)USB_SDP_SUPPORT) += spl_sdp.o

4
common/spl/spl_ram.c
View File

@@ -35,7 +35,7 @@ static int spl_ram_load_image(struct spl_image_info *spl_image,
header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS; header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS;
#if CONFIG_IS_ENABLED(DFU_SUPPORT) #if CONFIG_IS_ENABLED(DFU)
if (bootdev->boot_device == BOOT_DEVICE_DFU) if (bootdev->boot_device == BOOT_DEVICE_DFU)
spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0"); spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0");
#endif #endif
@@ -76,7 +76,7 @@ static int spl_ram_load_image(struct spl_image_info *spl_image,
#if CONFIG_IS_ENABLED(RAM_DEVICE) #if CONFIG_IS_ENABLED(RAM_DEVICE)
SPL_LOAD_IMAGE_METHOD("RAM", 0, BOOT_DEVICE_RAM, spl_ram_load_image); SPL_LOAD_IMAGE_METHOD("RAM", 0, BOOT_DEVICE_RAM, spl_ram_load_image);
#endif #endif
#if CONFIG_IS_ENABLED(DFU_SUPPORT) #if CONFIG_IS_ENABLED(DFU)
SPL_LOAD_IMAGE_METHOD("DFU", 0, BOOT_DEVICE_DFU, spl_ram_load_image); SPL_LOAD_IMAGE_METHOD("DFU", 0, BOOT_DEVICE_DFU, spl_ram_load_image);
#endif #endif

2
drivers/Makefile
View File

@@ -50,7 +50,7 @@ obj-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += usb/musb-new/
obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/
obj-$(CONFIG_SPL_USB_GADGET) += usb/common/ obj-$(CONFIG_SPL_USB_GADGET) += usb/common/
obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/udc/ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/udc/
obj-$(CONFIG_SPL_DFU_SUPPORT) += dfu/ obj-$(CONFIG_SPL_DFU) += dfu/
obj-$(CONFIG_SPL_WATCHDOG_SUPPORT) += watchdog/ obj-$(CONFIG_SPL_WATCHDOG_SUPPORT) += watchdog/
obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += usb/host/ obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += usb/host/
obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/ obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/

2
drivers/usb/gadget/Makefile
View File

@@ -8,7 +8,7 @@ obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o usbstring.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_SPL_USB_GADGET) += g_dnl.o obj-$(CONFIG_SPL_USB_GADGET) += g_dnl.o
obj-$(CONFIG_SPL_DFU_SUPPORT) += f_dfu.o obj-$(CONFIG_SPL_DFU) += f_dfu.o
obj-$(CONFIG_SPL_USB_SDP_SUPPORT) += f_sdp.o obj-$(CONFIG_SPL_USB_SDP_SUPPORT) += f_sdp.o
endif endif

2
include/configs/dra7xx_evm.h
View File

@@ -53,7 +53,7 @@
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#undef CONFIG_CMD_BOOTD #undef CONFIG_CMD_BOOTD
#ifdef CONFIG_SPL_DFU_SUPPORT #ifdef CONFIG_SPL_DFU
#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000 #define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000
#define DFUARGS \ #define DFUARGS \
"dfu_bufsiz=0x10000\0" \ "dfu_bufsiz=0x10000\0" \

4
include/configs/xilinx_zynqmp.h
View File

@@ -183,7 +183,7 @@
#endif #endif
/* SPL can't handle all huge variables - define just DFU */ /* SPL can't handle all huge variables - define just DFU */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
#undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_EXTRA_ENV_SETTINGS
# define CONFIG_EXTRA_ENV_SETTINGS \ # define CONFIG_EXTRA_ENV_SETTINGS \
"dfu_alt_info_ram=uboot.bin ram 0x8000000 0x1000000;" \ "dfu_alt_info_ram=uboot.bin ram 0x8000000 0x1000000;" \
@@ -228,7 +228,7 @@
# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif #endif
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
# undef CONFIG_CMD_BOOTD # undef CONFIG_CMD_BOOTD
# define CONFIG_SPL_ENV_SUPPORT # define CONFIG_SPL_ENV_SUPPORT
# define CONFIG_SPL_HASH_SUPPORT # define CONFIG_SPL_HASH_SUPPORT