From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGOd6-0008MV-6B for qemu-devel@nongnu.org; Sat, 18 Jul 2015 05:42:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZGOd4-0004lo-Ds for qemu-devel@nongnu.org; Sat, 18 Jul 2015 05:41:59 -0400 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]:33656) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGOd4-0004lj-7j for qemu-devel@nongnu.org; Sat, 18 Jul 2015 05:41:58 -0400 Received: by padck2 with SMTP id ck2so73399341pad.0 for ; Sat, 18 Jul 2015 02:41:57 -0700 (PDT) From: Peter Crosthwaite Date: Sat, 18 Jul 2015 02:40:40 -0700 Message-Id: <3c2299a64ec17a8c43fb95371c0a50c12d25fd3c.1437212383.git.crosthwaite.peter@gmail.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v3 30/35] mb: Remove ELF_MACHINE from cpu.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Peter Crosthwaite , Peter Crosthwaite , edgar.iglesias@gmail.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net From: Peter Crosthwaite The only generic code relying on this is linux-user. Linux user already has a lot of #ifdef TARGET_ customisation so just define ELF_MACHINE locally there. The microblaze bootloader can just pass EM_MICROBLAZE directly, as that is architecture specific code. This remove another architecture specific definition from the global namespace. Signed-off-by: Peter Crosthwaite --- hw/microblaze/boot.c | 4 ++-- linux-user/elfload.c | 1 + target-microblaze/cpu.h | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 3e8820f..d7eaa1f 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -141,12 +141,12 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, /* Boots a kernel elf binary. */ kernel_size = load_elf(kernel_filename, NULL, NULL, &entry, &low, &high, - big_endian, ELF_MACHINE, 0); + big_endian, EM_MICROBLAZE, 0); base32 = entry; if (base32 == 0xc0000000) { kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL, &entry, NULL, NULL, - big_endian, ELF_MACHINE, 0); + big_endian, EM_MICROBLAZE, 0); } /* Always boot into physical ram. */ boot_info.bootstrap_pc = (uint32_t)entry; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index cb4f2ed..7ee5602 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -947,6 +947,7 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUMIPSState *e #ifdef TARGET_MICROBLAZE #define ELF_START_MMAP 0x80000000 +#define ELF_MACHINE EM_MICROBLAZE #define elf_check_arch(x) ( (x) == EM_MICROBLAZE || (x) == EM_MICROBLAZE_OLD) diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index d4089ff..9bac856 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -35,8 +35,6 @@ typedef struct CPUMBState CPUMBState; #include "mmu.h" #endif -#define ELF_MACHINE EM_MICROBLAZE - #define EXCP_MMU 1 #define EXCP_IRQ 2 #define EXCP_BREAK 3 -- 1.9.1