Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-20 22:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Convert CONFIG_AM335X_USB0 et al to Kconfig

Browse source 
This converts the following to Kconfig:
   CONFIG_AM335X_USB0
   CONFIG_AM335X_USB0_MODE
   CONFIG_AM335X_USB1
   CONFIG_AM335X_USB1_MODE

We do this by introducing specific options for static configuration of
USB0/USB1 in SPL rather than defining CONFIG_AM335X_USBx_MODE to the
enum value being used.  Furthermore, with how the code is used now we do
not need to have OTG mode exposed as an option here, so remove that.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-03-11 23:07:29 -05:00
parent 08f1d58aff
commit ae3f467e84
9 changed files with 42 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
arch/arm/mach-omap2/am33xx/Kconfig
View file

@ -280,3 +280,35 @@ config PUB_ROM_DATA_SIZE
image, this area is no longer used, and can be reclaimed
for run time use by the boot image.
endif
config AM335X_USB0
bool "Static mode configuration for USB0 in SPL"
depends on AM33XX && SPL_MUSB_NEW && !SPL_OF_CONTROL
choice
prompt "USB0 port configuration"
depends on AM335X_USB0
config AM335X_USB0_HOST
bool "Port is used in host mode"
config AM335X_USB0_PERIPHERAL
bool "Port is used in peripheral mode"
endchoice
config AM335X_USB1
bool "Static mode configuration for USB1 in SPL"
depends on AM33XX && SPL_MUSB_NEW && !SPL_OF_CONTROL
choice
prompt "USB1 port configuration"
depends on AM335X_USB1
config AM335X_USB1_HOST
bool "Port is used in host mode"
config AM335X_USB1_PERIPHERAL
bool "Port is used in peripheral mode"
endchoice

8
arch/arm/mach-omap2/am33xx/board.c
View file

@ -241,14 +241,14 @@ static struct ti_musb_plat usb1 = {
};
U_BOOT_DRVINFOS(am33xx_usbs) = {
#if CONFIG_AM335X_USB0_MODE == MUSB_PERIPHERAL
#ifdef CONFIG_AM335X_USB0_PERIPHERAL
{ "ti-musb-peripheral", &usb0 },
#elif CONFIG_AM335X_USB0_MODE == MUSB_HOST
#elif defined(CONFIG_AM335X_USB0_HOST)
{ "ti-musb-host", &usb0 },
#endif
#if CONFIG_AM335X_USB1_MODE == MUSB_PERIPHERAL
#ifdef CONFIG_AM335X_USB1_PERIPHERAL
{ "ti-musb-peripheral", &usb1 },
#elif CONFIG_AM335X_USB1_MODE == MUSB_HOST
#elif defined(CONFIG_AM335X_USB1_HOST)
{ "ti-musb-host", &usb1 },
#endif
};

3
configs/am335x_evm_defconfig
View file

@ -4,6 +4,9 @@ CONFIG_ARCH_OMAP2PLUS=y
CONFIG_TI_COMMON_CMD_OPTIONS=y
CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
CONFIG_AM33XX=y
CONFIG_AM335X_USB0=y
CONFIG_AM335X_USB0_PERIPHERAL=y
CONFIG_AM335X_USB1=y
CONFIG_SPL=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_TIMESTAMP=y

3
configs/am335x_guardian_defconfig
View file

@ -10,6 +10,9 @@ CONFIG_ENV_OFFSET=0x500000
CONFIG_DEFAULT_DEVICE_TREE="am335x-guardian"
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_GUARDIAN=y
CONFIG_AM335X_USB0=y
CONFIG_AM335X_USB0_PERIPHERAL=y
CONFIG_AM335X_USB1=y
CONFIG_SPL_SERIAL=y
CONFIG_SPL_DRIVERS_MISC=y
CONFIG_BOOTCOUNT_BOOTLIMIT=3

12
include/configs/am335x_evm.h
View file

@ -201,18 +201,6 @@
* in memory.
*/
/*
* USB configuration. We enable MUSB support, both for host and for
* gadget. We set USB0 as peripheral and USB1 as host, based on the
* board schematic and physical port wired to each. Then for host we
* add mass storage support and for gadget we add both RNDIS ethernet
* and DFU.
*/
#define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
#define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
/*
* Disable MMC DM for SPL build and can be re-enabled after adding
* DM support in SPL

5
include/configs/am335x_guardian.h
View file

@ -129,9 +129,4 @@
#endif /* CONFIG_MTD_RAW_NAND */
#define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
#define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
#endif /* ! __CONFIG_AM335X_GUARDIAN_H */

12
include/configs/baltos.h
View file

@ -214,18 +214,6 @@
#endif
#endif
/*
* USB configuration. We enable MUSB support, both for host and for
* gadget. We set USB0 as peripheral and USB1 as host, based on the
* board schematic and physical port wired to each. Then for host we
* add mass storage support and for gadget we add both RNDIS ethernet
* and DFU.
*/
#define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_HOST
#define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_OTG
/* NAND support */
#ifdef CONFIG_MTD_RAW_NAND
#define GPMC_NAND_ECC_LP_x8_LAYOUT 1

4
include/configs/chiliboard.h
View file

@ -127,10 +127,6 @@
#define CONFIG_SYS_NAND_ECCBYTES 14
/* NAND: SPL related configs */
/* USB configuration */
#define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
/*
* Disable MMC DM for SPL build and can be re-enabled after adding
* DM support in SPL

7
include/configs/siemens-am33x-common.h
View file

@ -104,13 +104,6 @@
*/
#ifndef CONFIG_SPL_BUILD
/*
* USB configuration
*/
#define CONFIG_AM335X_USB0
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
#define CONFIG_AM335X_USB1
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
/* USB DRACO ID as default */
#define CONFIG_USBD_HS