[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/19] moxie: Remove ELF_MACHINE from cpu.h
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH 07/19] moxie: Remove ELF_MACHINE from cpu.h |
Date: |
Sat, 15 Aug 2015 16:28:17 -0700 |
From: Peter Crosthwaite <address@hidden>
The bootloader can just pass EM_MOXIE directly, as that is architecture
specific code.
This removes another architecture specific definition from the global
namespace.
Cc: Anthony Green <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/moxie/moxiesim.c | 2 +-
target-moxie/cpu.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index 80bcc5b..c3697c6 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -53,7 +53,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams
*loader_params)
kernel_size = load_elf(loader_params->kernel_filename, NULL, NULL,
&entry, &kernel_low, &kernel_high, 1,
- ELF_MACHINE, 0);
+ 0xFEED /* EM_MOXIE */, 0);
if (kernel_size <= 0) {
fprintf(stderr, "qemu: could not load kernel '%s'\n",
diff --git a/target-moxie/cpu.h b/target-moxie/cpu.h
index 29572aa..e27a6a3 100644
--- a/target-moxie/cpu.h
+++ b/target-moxie/cpu.h
@@ -26,8 +26,6 @@
#define CPUArchState struct CPUMoxieState
-#define ELF_MACHINE 0xFEED /* EM_MOXIE */
-
#define MOXIE_EX_DIV0 0
#define MOXIE_EX_BAD 1
#define MOXIE_EX_IRQ 2
--
1.9.1
- [Qemu-devel] [PATCH 00/19] multi-arch+linux-user: Cleanup ELF_MACHINE, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 01/19] linux_user: elfload: Default ELF_MACHINE to ELF_ARCH, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 03/19] arm: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 02/19] linux-user: elfload: Provide default for elf_check_arch, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 04/19] mb: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 05/19] m68k: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 06/19] cris: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 07/19] moxie: Remove ELF_MACHINE from cpu.h,
Peter Crosthwaite <=
[Qemu-devel] [PATCH 08/19] unicore: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
[Qemu-devel] [PATCH 10/19] or32: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
[Qemu-devel] [PATCH 11/19] tricore: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15