From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw9Kx-0004S1-Bk for qemu-devel@nongnu.org; Tue, 10 Nov 2015 08:51:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zw9Kw-0006Hq-9C for qemu-devel@nongnu.org; Tue, 10 Nov 2015 08:51:51 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:35389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw9Kw-0006HI-2K for qemu-devel@nongnu.org; Tue, 10 Nov 2015 08:51:50 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Zw9Kt-0006wC-Kj for qemu-devel@nongnu.org; Tue, 10 Nov 2015 13:51:47 +0000 From: Peter Maydell Date: Tue, 10 Nov 2015 13:51:44 +0000 Message-Id: <1447163507-26627-5-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1447163507-26627-1-git-send-email-peter.maydell@linaro.org> References: <1447163507-26627-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 4/7] arm: highbank: Defeature CPU override List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Peter Crosthwaite This board should not support CPU model override. This allows for easier patching of the board with being able to rely on the CPU type being correct. Reviewed-by: Peter Maydell Signed-off-by: Peter Crosthwaite Message-id: 471a61e049c7ca6e82f5ef6668889a1d518c7e00.1447007690.git.crosthwaite.peter@gmail.com Signed-off-by: Peter Maydell --- hw/arm/highbank.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index be04b27..f2e248b 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -223,15 +223,13 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) MemoryRegion *sysmem; char *sysboot_filename; - if (!cpu_model) { - switch (machine_id) { - case CALXEDA_HIGHBANK: - cpu_model = "cortex-a9"; - break; - case CALXEDA_MIDWAY: - cpu_model = "cortex-a15"; - break; - } + switch (machine_id) { + case CALXEDA_HIGHBANK: + cpu_model = "cortex-a9"; + break; + case CALXEDA_MIDWAY: + cpu_model = "cortex-a15"; + break; } for (n = 0; n < smp_cpus; n++) { @@ -240,11 +238,6 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) ARMCPU *cpu; Error *err = NULL; - if (!oc) { - error_report("Unable to find CPU definition"); - exit(1); - } - cpuobj = object_new(object_class_get_name(oc)); cpu = ARM_CPU(cpuobj); -- 1.9.1