Provide null return plat_get_fdt(). Loongson64 start supporting KASLR. Signed-off-by: Jinyang He <hejinyang@xxxxxxxxxxx> --- arch/mips/Kconfig | 4 +++- arch/mips/loongson64/setup.c | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 0f638bf..1508829 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -488,6 +488,7 @@ config MACH_LOONGSON64 select SYS_SUPPORTS_HIGHMEM select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_ZBOOT + select SYS_SUPPORTS_RELOCATABLE select ZONE_DMA32 select NUMA select SMP @@ -2778,7 +2779,8 @@ config RELOCATABLE depends on CPU_MIPS32_R2 || CPU_MIPS64_R2 || \ CPU_MIPS32_R5 || CPU_MIPS64_R5 || \ CPU_MIPS32_R6 || CPU_MIPS64_R6 || \ - CPU_P5600 || CAVIUM_OCTEON_SOC + CPU_P5600 || CAVIUM_OCTEON_SOC || \ + CPU_LOONGSON64 help This builds a kernel image that retains relocation information so it can be loaded someplace besides the default 1MB. diff --git a/arch/mips/loongson64/setup.c b/arch/mips/loongson64/setup.c index 6fe3fff..5a5b745 100644 --- a/arch/mips/loongson64/setup.c +++ b/arch/mips/loongson64/setup.c @@ -31,6 +31,13 @@ static void wbflush_loongson(void) void (*__wbflush)(void) = wbflush_loongson; EXPORT_SYMBOL(__wbflush); +#ifdef CONFIG_RELOCATABLE +void __init *plat_get_fdt(void) +{ + return NULL; +} +#endif + void __init plat_mem_setup(void) { if (loongson_fdt_blob) -- 2.1.0