summaryrefslogtreecommitdiff
path: root/arch/mips/mach-octeon/cpu.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2022-04-07 10:11:46 +0300
committerStefan Roese <sr@denx.de>2022-05-04 04:38:21 +0300
commit787e0d7d12e731829a699063374e7d896dc1c481 (patch)
tree306c6254626788f90f167244418164d65ace71bd /arch/mips/mach-octeon/cpu.c
parent6c71b10729ddab067e869f8fa5300a6bd88e9d10 (diff)
downloadu-boot-787e0d7d12e731829a699063374e7d896dc1c481.tar.xz
mips: octeon: cpu.c: Move bootmem init to arch_early_init_r()
Call octeon_bootmem_init() earlier in the boot process, so that this bootmemory infrastructure is already initialized when e.g. the networking support gets probed. Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch/mips/mach-octeon/cpu.c')
-rw-r--r--arch/mips/mach-octeon/cpu.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c
index 6cfcc3eae0..fffd9dfb85 100644
--- a/arch/mips/mach-octeon/cpu.c
+++ b/arch/mips/mach-octeon/cpu.c
@@ -393,14 +393,25 @@ static int init_bootcmd_console(void)
return ret;
}
-int arch_misc_init(void)
+int arch_early_init_r(void)
{
int ret;
+ /*
+ * Needs to be called pretty early, so that e.g. networking etc
+ * can access the bootmem infrastructure
+ */
ret = octeon_bootmem_init();
if (ret)
return ret;
+ return 0;
+}
+
+int arch_misc_init(void)
+{
+ int ret;
+
ret = octeon_configure_load_memory();
if (ret)
return ret;