[U-Boot] [PATCH V2] common: Simplify get_clocks() #ifdef

[U-Boot] [PATCH V2] common: Simplify get_clocks() #ifdef

[Peng Fan]

get_clocks is wrapped by CONFIG_FSL_CLK and CONFIG_M68K in seperate
piece code. They can be merged into one snippet.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: "angelo at sysam.it" <angelo@sysam.it>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: "Andreas Bie?mann" <andreas.devel@googlemail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes V2:
 Refine patch subject as Simon suggested.
 Add Simon's Reviewed-by

 common/board_f.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/common/board_f.c b/common/board_f.c
index 486e828..7bc05b1 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -806,10 +806,7 @@ static init_fnc_t init_sequence_f[] = {
 #if defined(CONFIG_BOARD_POSTCLK_INIT)
 	board_postclk_init,
 #endif
-#ifdef CONFIG_FSL_CLK
-	get_clocks,
-#endif
-#ifdef CONFIG_M68K
+#if defined(CONFIG_FSL_CLK) || defined(CONFIG_M68K)
 	get_clocks,
 #endif
 	env_init,		/* initialize environment */
-- 
1.8.4

[U-Boot] [PATCH V2] common: Simplify get_clocks() #ifdef

[Angelo Dureghello]

Hi Peng,

On 30/10/2015 10:30, Peng Fan wrote:
> get_clocks is wrapped by CONFIG_FSL_CLK and CONFIG_M68K in seperate
> piece code. They can be merged into one snippet.
>
> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Bin Meng <bmeng.cn@gmail.com>
> Cc: Alexey Brodkin <abrodkin@synopsys.com>
> Cc: "angelo at sysam.it" <angelo@sysam.it>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: "Andreas Bie?mann" <andreas.devel@googlemail.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes V2:
>   Refine patch subject as Simon suggested.
>   Add Simon's Reviewed-by
>
>   common/board_f.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/common/board_f.c b/common/board_f.c
> index 486e828..7bc05b1 100644
> --- a/common/board_f.c
> +++ b/common/board_f.c
> @@ -806,10 +806,7 @@ static init_fnc_t init_sequence_f[] = {
>   #if defined(CONFIG_BOARD_POSTCLK_INIT)
>   	board_postclk_init,
>   #endif
> -#ifdef CONFIG_FSL_CLK
> -	get_clocks,
> -#endif
> -#ifdef CONFIG_M68K
> +#if defined(CONFIG_FSL_CLK) || defined(CONFIG_M68K)
>   	get_clocks,
>   #endif
>   	env_init,		/* initialize environment */
>


change is ok for me.

Acked-by: Angelo Dureghello <angelo@sysam.it>

[U-Boot] [U-Boot,V2] common: Simplify get_clocks() #ifdef

[Tom Rini]

On Fri, Oct 30, 2015 at 05:30:02PM +0800, Peng Fan wrote:

> get_clocks is wrapped by CONFIG_FSL_CLK and CONFIG_M68K in seperate
> piece code. They can be merged into one snippet.
> 
> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Bin Meng <bmeng.cn@gmail.com>
> Cc: Alexey Brodkin <abrodkin@synopsys.com>
> Cc: "angelo at sysam.it" <angelo@sysam.it>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: "Andreas Bie?mann" <andreas.devel@googlemail.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Acked-by: Angelo Dureghello <angelo@sysam.it>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151112/cc5c3b6a/attachment.sig>