diff options
| author | Peter Crosthwaite <crosthwaitepeter@gmail.com> | 2015-05-10 23:29:10 -0700 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-09-25 12:04:44 +0200 |
| commit | 99a4434ed7355ba9b282b872ba2c2eb294f5dbec (patch) | |
| tree | eb3cda4522ac58de4cd9b9d3d1dcffef9d2a702f | |
| parent | bf337d4eae5ccf4d7f5d91b8d4471e7523f051de (diff) | |
s390: Remove ELF_MACHINE from cpu.h
The bootloader can just pass EM_S390 directly, as that
is architecture specific code.
This removes another architecture specific definition from the global
namespace.
Cc: Richard Henderson <rth@twiddle.net>
Cc: Alexander Graf <agraf@suse.de>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Acked-By: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/s390x/ipl.c | 4 | ||||
| -rw-r--r-- | target-s390x/cpu.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 2e0a8b6e0c..31473e749e 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -132,7 +132,7 @@ static int s390_ipl_init(SysBusDevice *dev) bios_size = load_elf(bios_filename, bios_translate_addr, &fwbase, &ipl->bios_start_addr, NULL, NULL, 1, - ELF_MACHINE, 0); + EM_S390, 0); if (bios_size > 0) { /* Adjust ELF start address to final location */ ipl->bios_start_addr += fwbase; @@ -154,7 +154,7 @@ static int s390_ipl_init(SysBusDevice *dev) if (ipl->kernel) { kernel_size = load_elf(ipl->kernel, NULL, NULL, &pentry, NULL, - NULL, 1, ELF_MACHINE, 0); + NULL, 1, EM_S390, 0); if (kernel_size < 0) { kernel_size = load_image_targphys(ipl->kernel, 0, ram_size); } diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 9aeb0241fb..5acd54c6ca 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -27,7 +27,6 @@ #define TARGET_LONG_BITS 64 -#define ELF_MACHINE EM_S390 #define ELF_MACHINE_UNAME "S390X" #define CPUArchState struct CPUS390XState |