This converts the following to Kconfig: CONFIG_SYS_USB_FAT_BOOT_PARTITION
Signed-off-by: Tom Rini trini@konsulko.com --- common/spl/Kconfig | 7 +++++++ include/configs/am43xx_evm.h | 6 ------ include/configs/am64x_evm.h | 2 -- include/configs/am65x_evm.h | 2 -- 4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 42f2c95228a6..3fd564480061 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1317,6 +1317,13 @@ config SPL_USB_STORAGE config options. This enables loading from USB using a configured device.
+config SYS_USB_FAT_BOOT_PARTITION + int "Partition on USB to use to load U-Boot from" + depends on SPL_USB_STORAGE + default 1 + help + Partition on the USB storage device to load U-Boot from + config SPL_USB_GADGET bool "Suppport USB Gadget drivers" help diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index e0138fe1db83..e3a01adae971 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -48,12 +48,6 @@ /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
-/* SPL USB Support */ - -#if defined(CONFIG_SPL_USB_HOST) || !defined(CONFIG_SPL_BUILD) -#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 -#endif - #ifndef CONFIG_SPL_BUILD /* USB Device Firmware Update support */ #define DFUARGS \ diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index 6da11b86c4b1..140940730d0e 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -106,6 +106,4 @@ /* Now for the remaining common defines */ #include <configs/ti_armv7_common.h>
-#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 - #endif /* __CONFIG_AM642_EVM_H */ diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index db35af98d9aa..65b0a576a6f4 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -110,8 +110,6 @@ EXTRA_ENV_DFUARGS \ BOOTENV
-#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 - /* Now for the remaining common defines */ #include <configs/ti_armv7_common.h>