From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Date: Sat, 2 Feb 2019 22:46:20 +0100 Subject: [U-Boot] [PATCH v4 02/20] usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE In-Reply-To: <1549039198-16674-3-git-send-email-abel.vesa@nxp.com> References: <1549039198-16674-1-git-send-email-abel.vesa@nxp.com> <1549039198-16674-3-git-send-email-abel.vesa@nxp.com> Message-ID: <20190202224620.3cea1ca0@jawa> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Fri, 1 Feb 2019 16:40:07 +0000 Abel Vesa wrote: > 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. > Reviewed-by: Lukasz Majewski > Signed-off-by: Abel Vesa > Reviewed-by: Tom Rini > --- > arch/arm/include/asm/arch-am33xx/spl.h | 2 +- > arch/arm/mach-omap2/boot-common.c | 2 +- > common/Makefile | 5 +++-- > common/spl/Kconfig | 4 ++-- > common/spl/Makefile | 2 +- > common/spl/spl_usb.c | 4 ---- > configs/am43xx_evm_usbhost_boot_defconfig | 2 +- > configs/am43xx_hs_evm_defconfig | 2 +- > 8 files changed, 10 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/include/asm/arch-am33xx/spl.h > b/arch/arm/include/asm/arch-am33xx/spl.h index 0bf8c17..f3910c2 100644 > --- a/arch/arm/include/asm/arch-am33xx/spl.h > +++ b/arch/arm/include/asm/arch-am33xx/spl.h > @@ -62,7 +62,7 @@ > #define BOOT_DEVICE_CPGMAC 0x47 > > #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 > #else > #define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2 > diff --git a/arch/arm/mach-omap2/boot-common.c > b/arch/arm/mach-omap2/boot-common.c index 2db1922..c8b8ac6 100644 > --- a/arch/arm/mach-omap2/boot-common.c > +++ b/arch/arm/mach-omap2/boot-common.c > @@ -93,7 +93,7 @@ void save_omap_boot_params(void) > sys_boot_device = 1; > break; > #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: > sys_boot_device = 1; > break; > diff --git a/common/Makefile b/common/Makefile > index ad390d0..8c92feb 100644 > --- a/common/Makefile > +++ b/common/Makefile > @@ -75,8 +75,9 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o > obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o > > ifdef CONFIG_SPL_USB_HOST_SUPPORT > -obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o > -obj-$(CONFIG_USB_STORAGE) += usb_storage.o > +obj-y += usb.o > +obj-y += usb_hub.o > +obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o > else > obj-$(CONFIG_USB_MUSB_HOST) += usb.o > endif > diff --git a/common/spl/Kconfig b/common/spl/Kconfig > index 54b0dc3..8b0627e 100644 > --- a/common/spl/Kconfig > +++ b/common/spl/Kconfig > @@ -766,9 +766,9 @@ config SPL_USB_HOST_SUPPORT > device can be attached. This option enables the drivers in > drivers/usb/host as part of an SPL build. > > -config SPL_USB_SUPPORT > +config SPL_USB_STORAGE > bool "Support loading from USB" > - depends on SPL_USB_HOST_SUPPORT > + depends on SPL_USB_HOST_SUPPORT && !(BLK && !DM_USB) > help > Enable support for USB devices in SPL. This allows use of > USB devices such as hard drives and flash drivers for loading U-Boot. > diff --git a/common/spl/Makefile b/common/spl/Makefile > index 6f8d759..a3980ce 100644 > --- a/common/spl/Makefile > +++ b/common/spl/Makefile > @@ -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_)ATF) += spl_atf.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_)FAT_SUPPORT) += spl_fat.o > obj-$(CONFIG_$(SPL_TPL_)EXT_SUPPORT) += spl_ext.o > obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.o > diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c > index c8d8231..e29d579 100644 > --- a/common/spl/spl_usb.c > +++ b/common/spl/spl_usb.c > @@ -15,9 +15,7 @@ > #include > #include > > -#ifdef CONFIG_USB_STORAGE > static int usb_stor_curr_dev = -1; /* current device */ > -#endif > > static int spl_usb_load_image(struct spl_image_info *spl_image, > struct spl_boot_device *bootdev) > @@ -34,13 +32,11 @@ static int spl_usb_load_image(struct > spl_image_info *spl_image, return err; > } > > -#ifdef CONFIG_USB_STORAGE > /* try to recognize storage devices immediately */ > usb_stor_curr_dev = usb_stor_scan(1); > stor_dev = blk_get_devnum_by_type(IF_TYPE_USB, > usb_stor_curr_dev); if (!stor_dev) > return -ENODEV; > -#endif > > debug("boot mode - FAT\n"); > > diff --git a/configs/am43xx_evm_usbhost_boot_defconfig > b/configs/am43xx_evm_usbhost_boot_defconfig index 5131f19..5bd919b > 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig > +++ b/configs/am43xx_evm_usbhost_boot_defconfig > @@ -14,7 +14,7 @@ CONFIG_VERSION_VARIABLE=y > CONFIG_SPL_MTD_SUPPORT=y > CONFIG_SPL_OS_BOOT=y > CONFIG_SPL_USB_HOST_SUPPORT=y > -CONFIG_SPL_USB_SUPPORT=y > +CONFIG_SPL_USB_STORAGE=y > CONFIG_CMD_SPL=y > CONFIG_CMD_SPL_NAND_OFS=0x00100000 > CONFIG_CMD_SPL_WRITE_SIZE=0x40000 > diff --git a/configs/am43xx_hs_evm_defconfig > b/configs/am43xx_hs_evm_defconfig index 99e4ccb..c01fda9 100644 > --- a/configs/am43xx_hs_evm_defconfig > +++ b/configs/am43xx_hs_evm_defconfig > @@ -24,7 +24,7 @@ CONFIG_SPL_MTD_SUPPORT=y > CONFIG_SPL_NET_SUPPORT=y > CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" > CONFIG_SPL_USB_HOST_SUPPORT=y > -CONFIG_SPL_USB_SUPPORT=y > +CONFIG_SPL_USB_STORAGE=y > CONFIG_SPL_USB_GADGET=y > CONFIG_SPL_USB_ETHER=y > # CONFIG_CMD_FLASH is not set Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: