[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/19] tricore: Remove ELF_MACHINE from cpu.h
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH 11/19] tricore: Remove ELF_MACHINE from cpu.h |
Date: |
Sat, 15 Aug 2015 16:28:21 -0700 |
From: Peter Crosthwaite <address@hidden>
The bootloader can just pass EM_TRICORE directly, as that
is architecture specific code.
This removes another architecture specific definition from the global
namespace.
Cc: Bastian Koppelmann <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/tricore/tricore_testboard.c | 2 +-
target-tricore/cpu.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index a059a20..62b406b 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -44,7 +44,7 @@ static void tricore_load_kernel(CPUTriCoreState *env)
kernel_size = load_elf(tricoretb_binfo.kernel_filename, NULL,
NULL, (uint64_t *)&entry, NULL,
NULL, 0,
- ELF_MACHINE, 1);
+ EM_TRICORE, 1);
if (kernel_size <= 0) {
error_report("qemu: no kernel file '%s'",
tricoretb_binfo.kernel_filename);
diff --git a/target-tricore/cpu.h b/target-tricore/cpu.h
index 916ee27..a72a7d8 100644
--- a/target-tricore/cpu.h
+++ b/target-tricore/cpu.h
@@ -25,8 +25,6 @@
#include "exec/cpu-defs.h"
#include "fpu/softfloat.h"
-#define ELF_MACHINE EM_TRICORE
-
#define CPUArchState struct CPUTriCoreState
struct CPUTriCoreState;
--
1.9.1
- [Qemu-devel] [PATCH 04/19] mb: Remove ELF_MACHINE from cpu.h, (continued)
- [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 <=
- [Qemu-devel] [PATCH 12/19] xtensa: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 13/19] sh4: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 15/19] sparc: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 14/19] s390: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 16/19] mips: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 17/19] alpha: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 18/19] i386: Rename ELF_MACHINE to be x86 specific, Peter Crosthwaite, 2015/08/15