Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41cc07be authored by Matt Redfearn's avatar Matt Redfearn Committed by Ralf Baechle
Browse files

MIPS: Pistachio: Enable KASLR 



Allow KASLR to be selected on Pistachio based systems. Tested on a
Creator Ci40.

Signed-off-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Andrew Bresticker <abrestic@chromium.org>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13356/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent aedcfbe0

arch/mips/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -399,6 +399,7 @@ config MACH_PISTACHIO 
	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_MIPS_CPS

	select SYS_SUPPORTS_MIPS_CPS

	select SYS_SUPPORTS_MULTITHREADING

	select SYS_SUPPORTS_MULTITHREADING

	select SYS_SUPPORTS_RELOCATABLE

	select SYS_SUPPORTS_ZBOOT

	select SYS_SUPPORTS_ZBOOT

	select SYS_HAS_EARLY_PRINTK

	select SYS_HAS_EARLY_PRINTK

	select USE_GENERIC_EARLY_PRINTK_8250

	select USE_GENERIC_EARLY_PRINTK_8250

arch/mips/pistachio/init.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -83,12 +83,16 @@ static void __init plat_setup_iocoherency(void) 
	}

	}

}

}





void __init plat_mem_setup(void)

void __init *plat_get_fdt(void)

{

{

	if (fw_arg0 != -2)

	if (fw_arg0 != -2)

		panic("Device-tree not present");

		panic("Device-tree not present");

	return (void *)fw_arg1;

}





	__dt_setup_arch((void *)fw_arg1);

void __init plat_mem_setup(void)

{

	__dt_setup_arch(plat_get_fdt());





	plat_setup_iocoherency();

	plat_setup_iocoherency();

}

}