From b432b1ebdf3422caa3b714ef5a417a4e8864fad6 Mon Sep 17 00:00:00 2001 From: Faiz Abbas Date: Fri, 16 Feb 2018 21:17:44 +0530 Subject: spl: Kconfig: Rename SPL_USBETH_SUPPORT to SPL_USB_ETHER to match with the U-boot CONFIG Rename CONFIG_SPL_USBETH_SUPPORT to CONFIG_SPL_USB_ETHER. This enables users to block text using CONFIG_IS_ENABLED() instead of resorting to #if ladders with SPL and non-SPL cases. Signed-off-by: Faiz Abbas --- include/configs/am335x_evm.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/baltos.h | 2 +- include/configs/bav335x.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include/configs') diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 80a523ddce..158b7d4e8e 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -242,7 +242,7 @@ #undef CONFIG_DM_USB #endif -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* Remove other SPL modes. */ /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 569220ea35..739a99860b 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -74,7 +74,7 @@ /* Bootcount using the RTC block */ #define CONFIG_SYS_BOOTCOUNT_BE -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* Remove other SPL modes. */ /* disable host part of MUSB in SPL */ #undef CONFIG_MUSB_HOST diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index a0d2b36d99..663f861706 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -80,7 +80,7 @@ #define CONFIG_AM437X_USB2PHY2_HOST #endif -#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USB_ETHER) #undef CONFIG_USB_DWC3_PHY_OMAP #undef CONFIG_USB_DWC3_OMAP #undef CONFIG_USB_DWC3 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 10979c72ca..5766a36f91 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -273,7 +273,7 @@ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_OTG -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ /* diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 48cd285d46..e7f65d6d03 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -395,7 +395,7 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ #endif -- cgit