diff options
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/Kconfig | 1 | ||||
| -rw-r--r-- | arch/mips/mach-octeon/cpu.c | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 06cae68ee57..9b62764f4fe 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -101,6 +101,7 @@ config ARCH_JZ47XX config ARCH_OCTEON bool "Support Marvell Octeon CN7xxx platforms" + select ARCH_EARLY_INIT_R select CPU_CAVIUM_OCTEON select DISPLAY_CPUINFO select DMA_ADDR_T_64BIT diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c index 6cfcc3eae04..fffd9dfb858 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; |