From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754132AbcEYKt4 (ORCPT ); Wed, 25 May 2016 06:49:56 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:30264 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753134AbcEYKty (ORCPT ); Wed, 25 May 2016 06:49:54 -0400 From: Matt Redfearn To: Ralf Baechle CC: Matt Redfearn , , Andrew Bresticker , , James Hogan , Jonas Gorski Subject: [PATCH] MIPS: Pistachio: Enable KASLR Date: Wed, 25 May 2016 11:49:47 +0100 Message-ID: <1464173387-16847-1-git-send-email-matt.redfearn@imgtec.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.154.116] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allow KASLR to be selected on Pistachio based systems. Tested on a Creator Ci40. Signed-off-by: Matt Redfearn --- 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 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