| Message ID | 20230530142510.1.I6509af98dc9400619e655a9bacc41077e88f10dc@changeid |
|---|---|
| State | Accepted |
| Commit | 30a93729bbaf4292dfd802e73c6e7a0d00555a20 |
| Delegated to: | Patrice Chotard |
| Headers | show |
| Series | [1/2] config: stm32mp15: remove CONFIG_FASTBOOT_USB_DEV | expand |
Hi Patrick On 5/30/23 14:26, Patrick Delaunay wrote: > The CONFIG_FASTBOOT_USB_DEV is used to select USB OTG controller other > than 0 but it is not the case for STM32MP15 boards; it can be removed > to simplify the STM32MP15 defconfig files. > > On STM32MP15x boards, we have only one USB device with instance 0, > so the device is hardcoded arch/arm/mach-stm32mp/cpu.c with > the command "fastboot 0" and this define is not used in config files > (include/configs/stm32mp15_st_common.h). > > Fixes: 4633fd51c5d7 ("stm32mp1: activate FASTBOOT on eMMC") > Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com> > --- > > configs/stm32mp15_basic_defconfig | 1 - > configs/stm32mp15_defconfig | 1 - > configs/stm32mp15_trusted_defconfig | 1 - > 3 files changed, 3 deletions(-) > > diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig > index 13355ebb4692..174eb42d6447 100644 > --- a/configs/stm32mp15_basic_defconfig > +++ b/configs/stm32mp15_basic_defconfig > @@ -102,7 +102,6 @@ CONFIG_SET_DFU_ALT_INFO=y > CONFIG_USB_FUNCTION_FASTBOOT=y > CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 > CONFIG_FASTBOOT_BUF_SIZE=0x02000000 > -CONFIG_FASTBOOT_USB_DEV=1 > CONFIG_FASTBOOT_FLASH=y > CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y > diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig > index 2669aae0f2f4..b25477c64d03 100644 > --- a/configs/stm32mp15_defconfig > +++ b/configs/stm32mp15_defconfig > @@ -75,7 +75,6 @@ CONFIG_SET_DFU_ALT_INFO=y > CONFIG_USB_FUNCTION_FASTBOOT=y > CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 > CONFIG_FASTBOOT_BUF_SIZE=0x02000000 > -CONFIG_FASTBOOT_USB_DEV=1 > CONFIG_FASTBOOT_FLASH=y > CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y > diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig > index 5f0fb4565105..e93a66f867cf 100644 > --- a/configs/stm32mp15_trusted_defconfig > +++ b/configs/stm32mp15_trusted_defconfig > @@ -76,7 +76,6 @@ CONFIG_SET_DFU_ALT_INFO=y > CONFIG_USB_FUNCTION_FASTBOOT=y > CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 > CONFIG_FASTBOOT_BUF_SIZE=0x02000000 > -CONFIG_FASTBOOT_USB_DEV=1 > CONFIG_FASTBOOT_FLASH=y > CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> Thanks Patrice
On 5/30/23 14:26, Patrick Delaunay wrote: > The CONFIG_FASTBOOT_USB_DEV is used to select USB OTG controller other > than 0 but it is not the case for STM32MP15 boards; it can be removed > to simplify the STM32MP15 defconfig files. > > On STM32MP15x boards, we have only one USB device with instance 0, > so the device is hardcoded arch/arm/mach-stm32mp/cpu.c with > the command "fastboot 0" and this define is not used in config files > (include/configs/stm32mp15_st_common.h). > > Fixes: 4633fd51c5d7 ("stm32mp1: activate FASTBOOT on eMMC") > Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com> > --- > > configs/stm32mp15_basic_defconfig | 1 - > configs/stm32mp15_defconfig | 1 - > configs/stm32mp15_trusted_defconfig | 1 - > 3 files changed, 3 deletions(-) > > diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig > index 13355ebb4692..174eb42d6447 100644 > --- a/configs/stm32mp15_basic_defconfig > +++ b/configs/stm32mp15_basic_defconfig > @@ -102,7 +102,6 @@ CONFIG_SET_DFU_ALT_INFO=y > CONFIG_USB_FUNCTION_FASTBOOT=y > CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 > CONFIG_FASTBOOT_BUF_SIZE=0x02000000 > -CONFIG_FASTBOOT_USB_DEV=1 > CONFIG_FASTBOOT_FLASH=y > CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y > diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig > index 2669aae0f2f4..b25477c64d03 100644 > --- a/configs/stm32mp15_defconfig > +++ b/configs/stm32mp15_defconfig > @@ -75,7 +75,6 @@ CONFIG_SET_DFU_ALT_INFO=y > CONFIG_USB_FUNCTION_FASTBOOT=y > CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 > CONFIG_FASTBOOT_BUF_SIZE=0x02000000 > -CONFIG_FASTBOOT_USB_DEV=1 > CONFIG_FASTBOOT_FLASH=y > CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y > diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig > index 5f0fb4565105..e93a66f867cf 100644 > --- a/configs/stm32mp15_trusted_defconfig > +++ b/configs/stm32mp15_trusted_defconfig > @@ -76,7 +76,6 @@ CONFIG_SET_DFU_ALT_INFO=y > CONFIG_USB_FUNCTION_FASTBOOT=y > CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 > CONFIG_FASTBOOT_BUF_SIZE=0x02000000 > -CONFIG_FASTBOOT_USB_DEV=1 > CONFIG_FASTBOOT_FLASH=y > CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y Applied to u-boot-stm/next Thanks Patrice
diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index 13355ebb4692..174eb42d6447 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -102,7 +102,6 @@ CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000 -CONFIG_FASTBOOT_USB_DEV=1 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig index 2669aae0f2f4..b25477c64d03 100644 --- a/configs/stm32mp15_defconfig +++ b/configs/stm32mp15_defconfig @@ -75,7 +75,6 @@ CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000 -CONFIG_FASTBOOT_USB_DEV=1 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig index 5f0fb4565105..e93a66f867cf 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -76,7 +76,6 @@ CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000 -CONFIG_FASTBOOT_USB_DEV=1 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y
The CONFIG_FASTBOOT_USB_DEV is used to select USB OTG controller other than 0 but it is not the case for STM32MP15 boards; it can be removed to simplify the STM32MP15 defconfig files. On STM32MP15x boards, we have only one USB device with instance 0, so the device is hardcoded arch/arm/mach-stm32mp/cpu.c with the command "fastboot 0" and this define is not used in config files (include/configs/stm32mp15_st_common.h). Fixes: 4633fd51c5d7 ("stm32mp1: activate FASTBOOT on eMMC") Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com> --- configs/stm32mp15_basic_defconfig | 1 - configs/stm32mp15_defconfig | 1 - configs/stm32mp15_trusted_defconfig | 1 - 3 files changed, 3 deletions(-)