diff mbox series

[U-Boot] configs: Enable CONFIG_BLK in a few TI boards

Message ID 20190108124631.29201-1-faiz_abbas@ti.com
State Accepted
Delegated to: Tom Rini
Headers show
Series [U-Boot] configs: Enable CONFIG_BLK in a few TI boards | expand

Commit Message

Faiz Abbas Jan. 8, 2019, 12:46 p.m. UTC
With DM conversion completed, enable CONFIG_BLK for a
few pending TI boards.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
---
 configs/am335x_boneblack_vboot_defconfig  | 1 -
 configs/am335x_evm_defconfig              | 1 -
 configs/am335x_hs_evm_defconfig           | 1 -
 configs/am335x_hs_evm_uart_defconfig      | 1 -
 configs/am43xx_evm_defconfig              | 1 -
 configs/am43xx_evm_qspiboot_defconfig     | 1 -
 configs/am43xx_evm_rtconly_defconfig      | 1 -
 configs/am43xx_evm_usbhost_boot_defconfig | 1 -
 configs/am43xx_hs_evm_defconfig           | 1 -
 configs/am57xx_evm_defconfig              | 1 -
 configs/am57xx_hs_evm_defconfig           | 1 -
 configs/k2g_evm_defconfig                 | 1 -
 configs/k2g_hs_evm_defconfig              | 1 -
 13 files changed, 13 deletions(-)

Comments

Lokesh Vutla Jan. 8, 2019, 1:30 p.m. UTC | #1
+ Tom

On 08/01/19 6:16 PM, Faiz Abbas wrote:
> With DM conversion completed, enable CONFIG_BLK for a
> few pending TI boards.
> 
> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>

Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>

Thanks and regards,
Lokesh

> ---
>  configs/am335x_boneblack_vboot_defconfig  | 1 -
>  configs/am335x_evm_defconfig              | 1 -
>  configs/am335x_hs_evm_defconfig           | 1 -
>  configs/am335x_hs_evm_uart_defconfig      | 1 -
>  configs/am43xx_evm_defconfig              | 1 -
>  configs/am43xx_evm_qspiboot_defconfig     | 1 -
>  configs/am43xx_evm_rtconly_defconfig      | 1 -
>  configs/am43xx_evm_usbhost_boot_defconfig | 1 -
>  configs/am43xx_hs_evm_defconfig           | 1 -
>  configs/am57xx_evm_defconfig              | 1 -
>  configs/am57xx_hs_evm_defconfig           | 1 -
>  configs/k2g_evm_defconfig                 | 1 -
>  configs/k2g_hs_evm_defconfig              | 1 -
>  13 files changed, 13 deletions(-)
> 
> diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
> index c62e8322fb..093a9b1c8e 100644
> --- a/configs/am335x_boneblack_vboot_defconfig
> +++ b/configs/am335x_boneblack_vboot_defconfig
> @@ -29,7 +29,6 @@ CONFIG_OF_CONTROL=y
>  CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
>  CONFIG_ENV_IS_IN_MMC=y
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> -# CONFIG_BLK is not set
>  CONFIG_BOOTCOUNT_LIMIT=y
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
> diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
> index 0931c1e97f..a0951b05ee 100644
> --- a/configs/am335x_evm_defconfig
> +++ b/configs/am335x_evm_defconfig
> @@ -26,7 +26,6 @@ CONFIG_OF_CONTROL=y
>  CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
>  CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> -# CONFIG_BLK is not set
>  CONFIG_BOOTCOUNT_LIMIT=y
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_NAND=y
> diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig
> index 1a7c5cfb17..4de09f8bab 100644
> --- a/configs/am335x_hs_evm_defconfig
> +++ b/configs/am335x_hs_evm_defconfig
> @@ -32,7 +32,6 @@ CONFIG_OF_CONTROL=y
>  CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
>  CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> -# CONFIG_BLK is not set
>  CONFIG_BOOTCOUNT_LIMIT=y
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_NAND=y
> diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig
> index 147da80f0d..3613c7023d 100644
> --- a/configs/am335x_hs_evm_uart_defconfig
> +++ b/configs/am335x_hs_evm_uart_defconfig
> @@ -34,7 +34,6 @@ CONFIG_OF_CONTROL=y
>  CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
>  CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> -# CONFIG_BLK is not set
>  CONFIG_BOOTCOUNT_LIMIT=y
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_NAND=y
> diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
> index 481aa4fad9..d58c9c1a25 100644
> --- a/configs/am43xx_evm_defconfig
> +++ b/configs/am43xx_evm_defconfig
> @@ -36,7 +36,6 @@ CONFIG_REGMAP=y
>  CONFIG_SPL_REGMAP=y
>  CONFIG_SYSCON=y
>  CONFIG_SPL_SYSCON=y
> -# CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
>  CONFIG_DFU_SF=y
> diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
> index 0d7bd72157..9dd67f6c44 100644
> --- a/configs/am43xx_evm_qspiboot_defconfig
> +++ b/configs/am43xx_evm_qspiboot_defconfig
> @@ -31,7 +31,6 @@ CONFIG_MULTI_DTB_FIT=y
>  CONFIG_ENV_IS_IN_SPI_FLASH=y
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
>  CONFIG_DM=y
> -# CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
>  CONFIG_DFU_SF=y
> diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig
> index 7d56db43fd..1448262ba2 100644
> --- a/configs/am43xx_evm_rtconly_defconfig
> +++ b/configs/am43xx_evm_rtconly_defconfig
> @@ -28,7 +28,6 @@ CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
>  CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
>  CONFIG_DM=y
> -# CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
>  CONFIG_DFU_SF=y
> diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
> index 5131f190a7..6e90bd02c6 100644
> --- a/configs/am43xx_evm_usbhost_boot_defconfig
> +++ b/configs/am43xx_evm_usbhost_boot_defconfig
> @@ -40,7 +40,6 @@ CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
>  CONFIG_ENV_IS_IN_FAT=y
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
>  CONFIG_DM=y
> -# CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
>  CONFIG_DFU_SF=y
> diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
> index 5d98e0edee..bff6f0a401 100644
> --- a/configs/am43xx_hs_evm_defconfig
> +++ b/configs/am43xx_hs_evm_defconfig
> @@ -38,7 +38,6 @@ CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
>  CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
>  CONFIG_DM=y
> -# CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
>  CONFIG_DFU_SF=y
> diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
> index 91293daee7..1ee0b42618 100644
> --- a/configs/am57xx_evm_defconfig
> +++ b/configs/am57xx_evm_defconfig
> @@ -39,7 +39,6 @@ CONFIG_DM=y
>  CONFIG_SPL_DM=y
>  CONFIG_SPL_DM_SEQ_ALIAS=y
>  CONFIG_SCSI_AHCI=y
> -# CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
>  CONFIG_USB_FUNCTION_FASTBOOT=y
> diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
> index 6924b0bd06..207157f191 100644
> --- a/configs/am57xx_hs_evm_defconfig
> +++ b/configs/am57xx_hs_evm_defconfig
> @@ -42,7 +42,6 @@ CONFIG_DM=y
>  CONFIG_SPL_DM=y
>  CONFIG_SPL_DM_SEQ_ALIAS=y
>  CONFIG_SCSI_AHCI=y
> -# CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
>  CONFIG_USB_FUNCTION_FASTBOOT=y
> diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig
> index ab9e695b02..a8c7301060 100644
> --- a/configs/k2g_evm_defconfig
> +++ b/configs/k2g_evm_defconfig
> @@ -34,7 +34,6 @@ CONFIG_DTB_RESELECT=y
>  CONFIG_MULTI_DTB_FIT=y
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
>  CONFIG_DM=y
> -# CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_SYS_I2C_DAVINCI=y
>  CONFIG_MISC=y
> diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig
> index a6757cc0b4..ab7b4998d6 100644
> --- a/configs/k2g_hs_evm_defconfig
> +++ b/configs/k2g_hs_evm_defconfig
> @@ -27,7 +27,6 @@ CONFIG_DTB_RESELECT=y
>  CONFIG_MULTI_DTB_FIT=y
>  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
>  CONFIG_DM=y
> -# CONFIG_BLK is not set
>  CONFIG_DFU_MMC=y
>  CONFIG_SYS_I2C_DAVINCI=y
>  CONFIG_MISC=y
>
Tom Rini Jan. 15, 2019, 2:28 p.m. UTC | #2
On Tue, Jan 08, 2019 at 06:16:31PM +0530, Faiz Abbas wrote:

> With DM conversion completed, enable CONFIG_BLK for a
> few pending TI boards.
> 
> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
> ---
>  configs/am335x_boneblack_vboot_defconfig  | 1 -
>  configs/am335x_evm_defconfig              | 1 -
>  configs/am335x_hs_evm_defconfig           | 1 -
>  configs/am335x_hs_evm_uart_defconfig      | 1 -
>  configs/am43xx_evm_defconfig              | 1 -
>  configs/am43xx_evm_qspiboot_defconfig     | 1 -
>  configs/am43xx_evm_rtconly_defconfig      | 1 -
>  configs/am43xx_evm_usbhost_boot_defconfig | 1 -
>  configs/am43xx_hs_evm_defconfig           | 1 -
>  configs/am57xx_evm_defconfig              | 1 -
>  configs/am57xx_hs_evm_defconfig           | 1 -
>  configs/k2g_evm_defconfig                 | 1 -
>  configs/k2g_hs_evm_defconfig              | 1 -
>  13 files changed, 13 deletions(-)

So, a problem with this patch is that we can't only enable CONFIG_BLK in
all cases, we also need to make sure that if we have MMC we have DM_MMC
and if we have USB we have DM_USB.  This latter case is what tripped me
up as am43xx_evm_usbhost_boot_defconfig will have a warning with this
patch applied as SPL_USB_SUPPORT really requires CONFIG_USB_STORAGE
support and that in turn depends on either (BLK==n && DM_USB==n) or
(BLK==y && DM_USB==y).
Jean-Jacques Hiblot Jan. 25, 2019, 2:40 p.m. UTC | #3
On 15/01/2019 15:28, Tom Rini wrote:
> On Tue, Jan 08, 2019 at 06:16:31PM +0530, Faiz Abbas wrote:
>
>> With DM conversion completed, enable CONFIG_BLK for a
>> few pending TI boards.
>>
>> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
>> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
>> ---
>>   configs/am335x_boneblack_vboot_defconfig  | 1 -
>>   configs/am335x_evm_defconfig              | 1 -
>>   configs/am335x_hs_evm_defconfig           | 1 -
>>   configs/am335x_hs_evm_uart_defconfig      | 1 -
>>   configs/am43xx_evm_defconfig              | 1 -
>>   configs/am43xx_evm_qspiboot_defconfig     | 1 -
>>   configs/am43xx_evm_rtconly_defconfig      | 1 -
>>   configs/am43xx_evm_usbhost_boot_defconfig | 1 -
>>   configs/am43xx_hs_evm_defconfig           | 1 -
>>   configs/am57xx_evm_defconfig              | 1 -
>>   configs/am57xx_hs_evm_defconfig           | 1 -
>>   configs/k2g_evm_defconfig                 | 1 -
>>   configs/k2g_hs_evm_defconfig              | 1 -
>>   13 files changed, 13 deletions(-)
> So, a problem with this patch is that we can't only enable CONFIG_BLK in
> all cases, we also need to make sure that if we have MMC we have DM_MMC
> and if we have USB we have DM_USB.  This latter case is what tripped me
> up as am43xx_evm_usbhost_boot_defconfig will have a warning with this
> patch applied as SPL_USB_SUPPORT really requires CONFIG_USB_STORAGE
> support and that in turn depends on either (BLK==n && DM_USB==n) or
> (BLK==y && DM_USB==y).

Maybe we should break this down.

1) k2g and am57: they already have the right options enabled.

2) am335x: the options are also present, although some are disabled in SPL

3) am43x: some configs need to be converted to DM_USB and DM_MMC first.


JJ


>
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
Tom Rini Jan. 25, 2019, 2:54 p.m. UTC | #4
On Fri, Jan 25, 2019 at 03:40:35PM +0100, Jean-Jacques Hiblot wrote:
> 
> On 15/01/2019 15:28, Tom Rini wrote:
> >On Tue, Jan 08, 2019 at 06:16:31PM +0530, Faiz Abbas wrote:
> >
> >>With DM conversion completed, enable CONFIG_BLK for a
> >>few pending TI boards.
> >>
> >>Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
> >>Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
> >>---
> >>  configs/am335x_boneblack_vboot_defconfig  | 1 -
> >>  configs/am335x_evm_defconfig              | 1 -
> >>  configs/am335x_hs_evm_defconfig           | 1 -
> >>  configs/am335x_hs_evm_uart_defconfig      | 1 -
> >>  configs/am43xx_evm_defconfig              | 1 -
> >>  configs/am43xx_evm_qspiboot_defconfig     | 1 -
> >>  configs/am43xx_evm_rtconly_defconfig      | 1 -
> >>  configs/am43xx_evm_usbhost_boot_defconfig | 1 -
> >>  configs/am43xx_hs_evm_defconfig           | 1 -
> >>  configs/am57xx_evm_defconfig              | 1 -
> >>  configs/am57xx_hs_evm_defconfig           | 1 -
> >>  configs/k2g_evm_defconfig                 | 1 -
> >>  configs/k2g_hs_evm_defconfig              | 1 -
> >>  13 files changed, 13 deletions(-)
> >So, a problem with this patch is that we can't only enable CONFIG_BLK in
> >all cases, we also need to make sure that if we have MMC we have DM_MMC
> >and if we have USB we have DM_USB.  This latter case is what tripped me
> >up as am43xx_evm_usbhost_boot_defconfig will have a warning with this
> >patch applied as SPL_USB_SUPPORT really requires CONFIG_USB_STORAGE
> >support and that in turn depends on either (BLK==n && DM_USB==n) or
> >(BLK==y && DM_USB==y).
> 
> Maybe we should break this down.
> 
> 1) k2g and am57: they already have the right options enabled.
> 
> 2) am335x: the options are also present, although some are disabled in SPL
> 
> 3) am43x: some configs need to be converted to DM_USB and DM_MMC first.

Yes, submitting this as a 3 or 4 part change that goes per-SoC would be
good, and clear that you're also changing a bit more on am43xx.  Thanks!
Faiz Abbas Jan. 30, 2019, 11:55 a.m. UTC | #5
Hi,

On 25/01/19 8:24 PM, Tom Rini wrote:
> On Fri, Jan 25, 2019 at 03:40:35PM +0100, Jean-Jacques Hiblot wrote:
>>
>> On 15/01/2019 15:28, Tom Rini wrote:
>>> On Tue, Jan 08, 2019 at 06:16:31PM +0530, Faiz Abbas wrote:
>>>
>>>> With DM conversion completed, enable CONFIG_BLK for a
>>>> few pending TI boards.
>>>>
>>>> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
>>>> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
>>>> ---
>>>>  configs/am335x_boneblack_vboot_defconfig  | 1 -
>>>>  configs/am335x_evm_defconfig              | 1 -
>>>>  configs/am335x_hs_evm_defconfig           | 1 -
>>>>  configs/am335x_hs_evm_uart_defconfig      | 1 -
>>>>  configs/am43xx_evm_defconfig              | 1 -
>>>>  configs/am43xx_evm_qspiboot_defconfig     | 1 -
>>>>  configs/am43xx_evm_rtconly_defconfig      | 1 -
>>>>  configs/am43xx_evm_usbhost_boot_defconfig | 1 -
>>>>  configs/am43xx_hs_evm_defconfig           | 1 -
>>>>  configs/am57xx_evm_defconfig              | 1 -
>>>>  configs/am57xx_hs_evm_defconfig           | 1 -
>>>>  configs/k2g_evm_defconfig                 | 1 -
>>>>  configs/k2g_hs_evm_defconfig              | 1 -
>>>>  13 files changed, 13 deletions(-)
>>> So, a problem with this patch is that we can't only enable CONFIG_BLK in
>>> all cases, we also need to make sure that if we have MMC we have DM_MMC
>>> and if we have USB we have DM_USB.  This latter case is what tripped me
>>> up as am43xx_evm_usbhost_boot_defconfig will have a warning with this
>>> patch applied as SPL_USB_SUPPORT really requires CONFIG_USB_STORAGE
>>> support and that in turn depends on either (BLK==n && DM_USB==n) or
>>> (BLK==y && DM_USB==y).
>>
>> Maybe we should break this down.
>>
>> 1) k2g and am57: they already have the right options enabled.
>>
>> 2) am335x: the options are also present, although some are disabled in SPL
>>
>> 3) am43x: some configs need to be converted to DM_USB and DM_MMC first.
> 
> Yes, submitting this as a 3 or 4 part change that goes per-SoC would be
> good, and clear that you're also changing a bit more on am43xx.  Thanks!
> 

Sounds good. Will post a patch for each defconfig.

Thanks,
Faiz
diff mbox series

Patch

diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index c62e8322fb..093a9b1c8e 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -29,7 +29,6 @@  CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 0931c1e97f..a0951b05ee 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -26,7 +26,6 @@  CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
 CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig
index 1a7c5cfb17..4de09f8bab 100644
--- a/configs/am335x_hs_evm_defconfig
+++ b/configs/am335x_hs_evm_defconfig
@@ -32,7 +32,6 @@  CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
 CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig
index 147da80f0d..3613c7023d 100644
--- a/configs/am335x_hs_evm_uart_defconfig
+++ b/configs/am335x_hs_evm_uart_defconfig
@@ -34,7 +34,6 @@  CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
 CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index 481aa4fad9..d58c9c1a25 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -36,7 +36,6 @@  CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_SPL_SYSCON=y
-# CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
index 0d7bd72157..9dd67f6c44 100644
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -31,7 +31,6 @@  CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
-# CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig
index 7d56db43fd..1448262ba2 100644
--- a/configs/am43xx_evm_rtconly_defconfig
+++ b/configs/am43xx_evm_rtconly_defconfig
@@ -28,7 +28,6 @@  CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
 CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
-# CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index 5131f190a7..6e90bd02c6 100644
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -40,7 +40,6 @@  CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
-# CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
index 5d98e0edee..bff6f0a401 100644
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -38,7 +38,6 @@  CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
 CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
-# CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index 91293daee7..1ee0b42618 100644
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -39,7 +39,6 @@  CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SCSI_AHCI=y
-# CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
index 6924b0bd06..207157f191 100644
--- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig
@@ -42,7 +42,6 @@  CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SCSI_AHCI=y
-# CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig
index ab9e695b02..a8c7301060 100644
--- a/configs/k2g_evm_defconfig
+++ b/configs/k2g_evm_defconfig
@@ -34,7 +34,6 @@  CONFIG_DTB_RESELECT=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
-# CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_MISC=y
diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig
index a6757cc0b4..ab7b4998d6 100644
--- a/configs/k2g_hs_evm_defconfig
+++ b/configs/k2g_hs_evm_defconfig
@@ -27,7 +27,6 @@  CONFIG_DTB_RESELECT=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
-# CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_MISC=y