On Wed, May 25, 2016 at 11:49:47AM +0100, Matt Redfearn wrote:
> Allow KASLR to be selected on Pistachio based systems. Tested on a
> Creator Ci40.
>
> Signed-off-by: Matt Redfearn <matt.redfearn@xxxxxxxxxx>
>
> ---
>
> arch/mips/Kconfig | 1 +
> arch/mips/pistachio/init.c | 8 ++++++--
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index c5bedce4122d..f1e59cbf5fe4 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -398,6 +398,7 @@ config MACH_PISTACHIO
> select SYS_SUPPORTS_MIPS_CPS
> select SYS_SUPPORTS_MULTITHREADING
> select SYS_SUPPORTS_ZBOOT
> + select SYS_SUPPORTS_RELOCATABLE
This list is (mostly) already sorted, so probably best to add this
before SYS_SUPPORTS_ZBOOT.
Other than that,
Reviewed-by: James Hogan <james.hogan@xxxxxxxxxx>
Cheers
James
> select SYS_HAS_EARLY_PRINTK
> select USE_GENERIC_EARLY_PRINTK_8250
> select USE_OF
> diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c
> index 96ba2cc9ad3e..95f8767ce52e 100644
> --- a/arch/mips/pistachio/init.c
> +++ b/arch/mips/pistachio/init.c
> @@ -52,12 +52,16 @@ static void __init plat_setup_iocoherency(void)
> }
> }
>
> -void __init plat_mem_setup(void)
> +void __init *plat_get_fdt(void)
> {
> if (fw_arg0 != -2)
> 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();
> }
> --
> 2.5.0
>
Attachment:
signature.asc
Description: Digital signature
