linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

omap3: Drop CONFIG_OMAP3_EVM, switch to CONFIG_TARGET_OMAP3_EVM when needed

Browse Source 
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)" <albert.aribaud@3adev.fr>
Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2017-05-12 22:33:18 -04:00
parent d87f82967f
commit 864896be3b
5 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
board/quipos/cairo/cairo.c
View File

@ -25,18 +25,6 @@
DECLARE_GLOBAL_DATA_PTR; 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 * Routine: board_init
* Description: Early hardware init. * Description: Early hardware init.

2
drivers/usb/musb/omap3.c
View File

@ -118,7 +118,7 @@ int musb_platform_init(void)
stdby &= ~OMAP3_OTG_FORCESTDBY_STANDBY; stdby &= ~OMAP3_OTG_FORCESTDBY_STANDBY;
writel(stdby, &otg->forcestdby); writel(stdby, &otg->forcestdby);
#ifdef CONFIG_OMAP3_EVM #ifdef CONFIG_TARGET_OMAP3_EVM
musb_cfg.extvbus = omap3_evm_need_extvbus(); musb_cfg.extvbus = omap3_evm_need_extvbus();
#endif #endif

2
drivers/usb/musb/omap3.h
View File

@ -32,7 +32,7 @@
int musb_platform_init(void); int musb_platform_init(void);
#ifdef CONFIG_OMAP3_EVM #ifdef CONFIG_TARGET_OMAP3_EVM
extern u8 omap3_evm_need_extvbus(void); extern u8 omap3_evm_need_extvbus(void);
#endif #endif

2
include/configs/omap3_evm.h
View File

@ -87,8 +87,6 @@
#define CONFIG_SDRC /* The chip has SDRC controller */ #define CONFIG_SDRC /* The chip has SDRC controller */
#define CONFIG_OMAP3_EVM /* This is a OMAP3 EVM */
/* /*
* Clock related definitions * Clock related definitions
*/ */

1
scripts/config_whitelist.txt
View File

@ -1981,7 +1981,6 @@ CONFIG_OF_STDOUT_PATH
CONFIG_OF_SUPPORT_OLD_DEVICE_TREES CONFIG_OF_SUPPORT_OLD_DEVICE_TREES
CONFIG_OMAP3_AM3517CRANE CONFIG_OMAP3_AM3517CRANE
CONFIG_OMAP3_DEVKIT8000 CONFIG_OMAP3_DEVKIT8000
CONFIG_OMAP3_EVM
CONFIG_OMAP3_GPIO_2 CONFIG_OMAP3_GPIO_2
CONFIG_OMAP3_GPIO_3 CONFIG_OMAP3_GPIO_3
CONFIG_OMAP3_GPIO_4 CONFIG_OMAP3_GPIO_4