powerpc: Drop probecpu() in favour of arch_cpu_init()

To avoid an unnecessary arch-specific call in board_init_f(), rename this
function.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 584f3b8d61666d34147d60866a12886726f94a90..afb5b512ba5cdc4cfdaafa566282b421ee005c5d 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -308,7 +308,7 @@ int is_core_valid(unsigned int core)
        return !!((1 << core) & cpu_mask());
 }
 
-int probecpu (void)
+int arch_cpu_init(void)
 {
        uint svr;
        uint ver;

diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 9c19c87b7278dc7ff615cf915752f42fff8bd9df..3a775be9ae9eec6128722283607de6e9b4dd820f 100644 (file)
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -83,7 +83,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
        bd->bi_memsize = CONFIG_SYS_L2_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/b4860qds/spl.c b/board/freescale/b4860qds/spl.c
index fabc78301a05b522525c1fcbdfa705d6b04bac0d..35b812cb1843ec90611b27ee7a94ad37d1d51fe8 100644 (file)
--- a/board/freescale/b4860qds/spl.c
+++ b/board/freescale/b4860qds/spl.c
@@ -87,7 +87,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
        bd->bi_memsize = CONFIG_SYS_L3_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/c29xpcie/spl.c b/board/freescale/c29xpcie/spl.c
index d8d73c70b8e8e31a7b99b94947e87800780d761a..6613216950aaa35e3cb874cf105a11e7efdb422f 100644 (file)
--- a/board/freescale/c29xpcie/spl.c
+++ b/board/freescale/c29xpcie/spl.c
@@ -53,7 +53,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
        bd->bi_memsize = CONFIG_SYS_L2_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index c22e21567530d196effa004d4ea328b3854fcf88..05c76f2e45c08aefd5c9e3211b9fecc219d32464 100644 (file)
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -69,7 +69,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
        bd->bi_memsize = CONFIG_SYS_L2_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/p1022ds/spl.c b/board/freescale/p1022ds/spl.c
index 6a5fe74343788c355e0adc5a463a79fae471bc3e..ef385516005f09fe3b6450f50d47898b6a812838 100644 (file)
--- a/board/freescale/p1022ds/spl.c
+++ b/board/freescale/p1022ds/spl.c
@@ -83,7 +83,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
        bd->bi_memsize = CONFIG_SYS_L2_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 9e8f359d0db53f11827e46436800b2c0c91c5f25..2af5576ff72ba9473f7025357eec99be25340a6f 100644 (file)
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -80,7 +80,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
        bd->bi_memsize = CONFIG_SYS_L2_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/t102xqds/spl.c b/board/freescale/t102xqds/spl.c
index c9239b87db13896634844c900ff322bb89c70928..3e96b33c40d82ea561ae439122fc3700d6d257df 100644 (file)
--- a/board/freescale/t102xqds/spl.c
+++ b/board/freescale/t102xqds/spl.c
@@ -117,7 +117,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
        bd->bi_memsize = CONFIG_SYS_L3_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index 6d8866e87d9e0abaa1d48adf541df5df3001903e..b70c2c5d7910b8aa5f8d7a4e96ea382d9b4dc09f 100644 (file)
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -104,7 +104,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
        bd->bi_memsize = CONFIG_SYS_L3_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 1c2023b6a324958b8e7eb7f78b1c15c14dd69a6d..4402e0f4b049d3d03421ab4be3cadd18fd15dae4 100644 (file)
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -95,7 +95,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
        bd->bi_memsize = CONFIG_SYS_L3_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index b1e1cf17e7c76c5a96688bf37ed7fc9fad270085..334f5083b8edb8167809599e32e81d95dafeb687 100644 (file)
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -103,7 +103,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
        bd->bi_memsize = CONFIG_SYS_L3_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index bb23865d3beeb0c56b5204a6556a689cdd110f9c..aa8e9285fefe595cebafd5d5b1d369517b6b08ba 100644 (file)
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -73,7 +73,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
        bd->bi_memsize = CONFIG_SYS_L3_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/t4qds/spl.c b/board/freescale/t4qds/spl.c
index 6ca0f03ffe837b6ec886107b1248b5cb31d0c131..5e946dc84f6263746319fa5b9af986f1aaa10865 100644 (file)
--- a/board/freescale/t4qds/spl.c
+++ b/board/freescale/t4qds/spl.c
@@ -112,7 +112,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
        bd->bi_memsize = CONFIG_SYS_L3_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index b148a7fd1fad974269307032d8788e30cc13831b..a32e34ef96c2a445b74cb96516c2bbc92e27484b 100644 (file)
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -76,7 +76,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
        bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
        bd->bi_memsize = CONFIG_SYS_L3_SIZE;
 
-       probecpu();
+       arch_cpu_init();
        get_clocks();
        mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
                        CONFIG_SPL_RELOC_MALLOC_SIZE);

diff --git a/common/board_f.c b/common/board_f.c
index cc8aee74f0396762d7e40352a9ec4d0e3be29549..5e2b8d14d47983c832363cbb12b51b3634d1f81b 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -858,10 +858,6 @@ static init_fnc_t init_sequence_f[] = {
 #endif
        initf_malloc,
        initf_console_record,
-#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
-       /* TODO: can this go into arch_cpu_init()? */
-       probecpu,
-#endif
 #if defined(CONFIG_X86) && defined(CONFIG_HAVE_FSP)
        x86_fsp_init,
 #endif

diff --git a/include/common.h b/include/common.h
index 2af555ee00ce69adc85de58d533464dbdb173268..53cdadf09cc6ebb5dfcd24a0c598499c6c359246 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -600,7 +600,17 @@ int        cpu_num_dspcores(void);
 u32    cpu_mask      (void);
 u32    cpu_dsp_mask(void);
 int    is_core_valid (unsigned int);
-int    probecpu      (void);
+
+/**
+ * arch_cpu_init() - basic cpu-dependent setup for an architecture
+ *
+ * This is called after early malloc is available. It should handle any
+ * CPU- or SoC- specific init needed to continue the init sequence. See
+ * board_f.c for where it is called. If this is not provided, a default
+ * version (which does nothing) will be used.
+ */
+int arch_cpu_init(void);
+
 int    checkcpu      (void);
 int    checkicache   (void);
 int    checkdcache   (void);