GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-07-04 05:12:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE

Browse source 
Since there is the SPL_USB_HOST_SUPPORT for enabling USB support in SPL,
makes more sense to rename the SPL_USB_SUPPORT as SPL_USB_STORAGE.
Everything that is not part of the usb storage support in SPL is now
build under SPL_USB_HOST_SUPPORT.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Abel Vesa 2019-02-01 16:40:07 +00:00 • committed by Stefano Babic
parent 69280961d7
commit 79536013a3
8 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/include/asm/arch-am33xx/spl.h
View file

@ -62,7 +62,7 @@
#define BOOT_DEVICE_CPGMAC 0x47 #define BOOT_DEVICE_CPGMAC 0x47
#define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1 #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1
#ifdef CONFIG_SPL_USB_SUPPORT #ifdef CONFIG_SPL_USB_STORAGE
#define MMC_BOOT_DEVICES_END BOOT_DEVICE_USB #define MMC_BOOT_DEVICES_END BOOT_DEVICE_USB
#else #else
#define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2 #define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2

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

@ -93,7 +93,7 @@ void save_omap_boot_params(void)
sys_boot_device = 1; sys_boot_device = 1;
break; break;
#endif #endif
#if defined(BOOT_DEVICE_USB) && !defined(CONFIG_SPL_USB_SUPPORT) #if defined(BOOT_DEVICE_USB) && !defined(CONFIG_SPL_USB_STORAGE)
case BOOT_DEVICE_USB: case BOOT_DEVICE_USB:
sys_boot_device = 1; sys_boot_device = 1;
break; break;

5
common/Makefile
View file

@ -75,8 +75,9 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
ifdef CONFIG_SPL_USB_HOST_SUPPORT ifdef CONFIG_SPL_USB_HOST_SUPPORT
obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o obj-y += usb.o
obj-$(CONFIG_USB_STORAGE) += usb_storage.o obj-y += usb_hub.o
obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o
else else
obj-$(CONFIG_USB_MUSB_HOST) += usb.o obj-$(CONFIG_USB_MUSB_HOST) += usb.o
endif endif

4
common/spl/Kconfig
View file

@ -794,9 +794,9 @@ config SPL_USB_HOST_SUPPORT
device can be attached. This option enables the drivers in device can be attached. This option enables the drivers in
drivers/usb/host as part of an SPL build. drivers/usb/host as part of an SPL build.
config SPL_USB_SUPPORT config SPL_USB_STORAGE
bool "Support loading from USB" bool "Support loading from USB"
depends on SPL_USB_HOST_SUPPORT depends on SPL_USB_HOST_SUPPORT && !(BLK && !DM_USB)
help help
Enable support for USB devices in SPL. This allows use of USB Enable support for USB devices in SPL. This allows use of USB
devices such as hard drives and flash drivers for loading U-Boot. devices such as hard drives and flash drivers for loading U-Boot.

2
common/spl/Makefile
View file

@ -22,7 +22,7 @@ obj-$(CONFIG_$(SPL_TPL_)NET_SUPPORT) += spl_net.o
obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += spl_mmc.o obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += spl_mmc.o
obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o
obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o
obj-$(CONFIG_$(SPL_TPL_)USB_SUPPORT) += spl_usb.o obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o
obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o
obj-$(CONFIG_$(SPL_TPL_)FS_EXT4) += spl_ext.o obj-$(CONFIG_$(SPL_TPL_)FS_EXT4) += spl_ext.o
obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.o obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.o

4
common/spl/spl_usb.c
View file

@ -15,9 +15,7 @@
#include <usb.h> #include <usb.h>
#include <fat.h> #include <fat.h>
#ifdef CONFIG_USB_STORAGE
static int usb_stor_curr_dev = -1; /* current device */ static int usb_stor_curr_dev = -1; /* current device */
#endif
static int spl_usb_load_image(struct spl_image_info *spl_image, static int spl_usb_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev) struct spl_boot_device *bootdev)
@ -34,13 +32,11 @@ static int spl_usb_load_image(struct spl_image_info *spl_image,
return err; return err;
} }
#ifdef CONFIG_USB_STORAGE
/* try to recognize storage devices immediately */ /* try to recognize storage devices immediately */
usb_stor_curr_dev = usb_stor_scan(1); usb_stor_curr_dev = usb_stor_scan(1);
stor_dev = blk_get_devnum_by_type(IF_TYPE_USB, usb_stor_curr_dev); stor_dev = blk_get_devnum_by_type(IF_TYPE_USB, usb_stor_curr_dev);
if (!stor_dev) if (!stor_dev)
return -ENODEV; return -ENODEV;
#endif
debug("boot mode - FAT\n"); debug("boot mode - FAT\n");

2
configs/am43xx_evm_usbhost_boot_defconfig
View file

@ -14,7 +14,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y
CONFIG_SPL_USB_SUPPORT=y CONFIG_SPL_USB_STORAGE=y
CONFIG_CMD_SPL=y CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_NAND_OFS=0x00100000 CONFIG_CMD_SPL_NAND_OFS=0x00100000
CONFIG_CMD_SPL_WRITE_SIZE=0x40000 CONFIG_CMD_SPL_WRITE_SIZE=0x40000

2
configs/am43xx_hs_evm_defconfig
View file

@ -24,7 +24,7 @@ CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y
CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL"
CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y
CONFIG_SPL_USB_SUPPORT=y CONFIG_SPL_USB_STORAGE=y
CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_GADGET=y
CONFIG_SPL_USB_ETHER=y CONFIG_SPL_USB_ETHER=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set