Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 573c577a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze update from Michal Simek.

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  elf-em.h: move EM_MICROBLAZE to the common header
parents 0cdf5a46 b1413279

arch/microblaze/include/uapi/asm/elf.h

+2 −1
Original line number Diff line number Diff line
@@ -11,12 +11,13 @@ 
#ifndef _UAPI_ASM_MICROBLAZE_ELF_H

#define _UAPI_ASM_MICROBLAZE_ELF_H



#include <linux/elf-em.h>



/*

 * Note there is no "official" ELF designation for Microblaze.

 * I've snaffled the value from the microblaze binutils source code

 * /binutils/microblaze/include/elf/microblaze.h

 */

#define EM_MICROBLAZE		189

#define EM_MICROBLAZE_OLD	0xbaab

#define ELF_ARCH		EM_MICROBLAZE

include/uapi/linux/elf-em.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define EM_TI_C6000	140	/* TI C6X DSPs */

#define EM_AARCH64	183	/* ARM 64 bit */

#define EM_TILEPRO	188	/* Tilera TILEPro */

#define EM_MICROBLAZE	189	/* Xilinx MicroBlaze */

#define EM_TILEGX	191	/* Tilera TILE-Gx */

#define EM_FRV		0x5441	/* Fujitsu FR-V */

#define EM_AVR32	0x18ad	/* Atmel AVR32 */