From 98dbe5aca8c328b40a0598d6ab478d9b869d1b5c Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Sat, 29 Aug 2015 12:07:50 -0700 Subject: elf: Update EM_MOXIE definition EM_MOXIE now has a proper assigned elf code. Use it. Register the old interim value as EM_MOXIE_OLD and accept either in elf loading. Cc: Anthony Green Reviewed-by: Richard Henderson Signed-off-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- target-moxie/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target-moxie/cpu.h') diff --git a/target-moxie/cpu.h b/target-moxie/cpu.h index 15ca15bf53..7d47e0d956 100644 --- a/target-moxie/cpu.h +++ b/target-moxie/cpu.h @@ -26,7 +26,7 @@ #define CPUArchState struct CPUMoxieState -#define ELF_MACHINE 0xFEED /* EM_MOXIE */ +#define ELF_MACHINE EM_MOXIE #define MOXIE_EX_DIV0 0 #define MOXIE_EX_BAD 1 -- cgit v1.2.3 From b744d332f3ef17adc1219be7098b0a4cc30b2dbe Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Sun, 10 May 2015 23:29:10 -0700 Subject: moxie: Remove ELF_MACHINE from cpu.h 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 Reviewed-by: Richard Henderson Acked-By: Riku Voipio Signed-off-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- target-moxie/cpu.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'target-moxie/cpu.h') diff --git a/target-moxie/cpu.h b/target-moxie/cpu.h index 7d47e0d956..2bac15bf60 100644 --- a/target-moxie/cpu.h +++ b/target-moxie/cpu.h @@ -26,8 +26,6 @@ #define CPUArchState struct CPUMoxieState -#define ELF_MACHINE EM_MOXIE - #define MOXIE_EX_DIV0 0 #define MOXIE_EX_BAD 1 #define MOXIE_EX_IRQ 2 -- cgit v1.2.3