Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 727e94a4ac9662d2e9e7ae8b4136013d6cd0832b

Authored by Simon Glass
Committed by Tom Rini
1 parent 11b33e64dd
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

powerpc: freescale: Unify the two get_clocks() calls 

Combine the conditions so this appears in the init list only once.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: York Sun <york.sun@nxp.com>
Reviewed-by: Stefan Roese <sr@denx.de>

Showing 1 changed file with 1 additions and 4 deletions Side-by-side Diff

... ... @@ -828,16 +828,13 @@
828 828 #if defined(CONFIG_BOARD_EARLY_INIT_F)
829 829 board_early_init_f,
830 830 #endif
831   -#ifdef CONFIG_PPC
  831 +#if defined(CONFIG_PPC) || defined(CONFIG_SYS_FSL_CLK) || defined(CONFIG_M68K)
832 832 /* get CPU and bus clocks according to the environment variable */
833 833 get_clocks, /* get CPU and bus clocks (etc.) */
834 834 #endif
835 835 timer_init, /* initialize timer */
836 836 #if defined(CONFIG_BOARD_POSTCLK_INIT)
837 837 board_postclk_init,
838   -#endif
839   -#if defined(CONFIG_SYS_FSL_CLK) || defined(CONFIG_M68K)
840   - get_clocks,
841 838 #endif
842 839 env_init, /* initialize environment */
843 840 init_baud_rate, /* initialze baudrate settings */