From: Tom Rini Date: Sat, 13 May 2017 02:33:18 +0000 (-0400) Subject: omap3: Drop CONFIG_OMAP3_EVM, switch to CONFIG_TARGET_OMAP3_EVM when needed X-Git-Tag: v2017.07-rc1~274 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=864896be3bd50fd751c1d6e5ae14cc2f2da150c8;p=u-boot omap3: Drop CONFIG_OMAP3_EVM, switch to CONFIG_TARGET_OMAP3_EVM when needed We make use of CONFIG_OMAP3_EVM today to know when to do a specific tweak in MUSB. This can be tested on via CONFIG_TARGET_OMAP3_EVM instead, so switch there so we can drop the now unused symbol CONFIG_OMAP3_EVM. In investigating what to do about the symbol usage we see that the cairo board defines the same function, but never called it (as it does not define CONFIG_OMAP3_EVM) and was just returning anyhow, so drop that function from that board. Cc: "Albert ARIBAUD (3ADEV)" Cc: Marek Vasut Signed-off-by: Tom Rini --- diff --git a/board/quipos/cairo/cairo.c b/board/quipos/cairo/cairo.c index 7a1a61e386..5e2f486f8e 100644 --- a/board/quipos/cairo/cairo.c +++ b/board/quipos/cairo/cairo.c @@ -25,18 +25,6 @@ DECLARE_GLOBAL_DATA_PTR; -/* - * MUSB port on OMAP3EVM Rev >= E requires extvbus programming. - */ -u8 omap3_evm_need_extvbus(void) -{ - u8 retval = 0; - - /* TODO: verify if cairo handheld platform needs extvbus programming */ - - return retval; -} - /* * Routine: board_init * Description: Early hardware init. diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c index 97da529b44..99b4291a27 100644 --- a/drivers/usb/musb/omap3.c +++ b/drivers/usb/musb/omap3.c @@ -118,7 +118,7 @@ int musb_platform_init(void) stdby &= ~OMAP3_OTG_FORCESTDBY_STANDBY; writel(stdby, &otg->forcestdby); -#ifdef CONFIG_OMAP3_EVM +#ifdef CONFIG_TARGET_OMAP3_EVM musb_cfg.extvbus = omap3_evm_need_extvbus(); #endif diff --git a/drivers/usb/musb/omap3.h b/drivers/usb/musb/omap3.h index ae645c72de..d91ad0a85b 100644 --- a/drivers/usb/musb/omap3.h +++ b/drivers/usb/musb/omap3.h @@ -32,7 +32,7 @@ int musb_platform_init(void); -#ifdef CONFIG_OMAP3_EVM +#ifdef CONFIG_TARGET_OMAP3_EVM extern u8 omap3_evm_need_extvbus(void); #endif diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index c4cac83bb8..2239a029c4 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -87,8 +87,6 @@ #define CONFIG_SDRC /* The chip has SDRC controller */ -#define CONFIG_OMAP3_EVM /* This is a OMAP3 EVM */ - /* * Clock related definitions */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 87719048ca..4382b6aa1a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1981,7 +1981,6 @@ CONFIG_OF_STDOUT_PATH CONFIG_OF_SUPPORT_OLD_DEVICE_TREES CONFIG_OMAP3_AM3517CRANE CONFIG_OMAP3_DEVKIT8000 -CONFIG_OMAP3_EVM CONFIG_OMAP3_GPIO_2 CONFIG_OMAP3_GPIO_3 CONFIG_OMAP3_GPIO_4