UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2015-09-10 16:20:00 -07:00
parent 0cdf5a4640 b14132797d
commit 573c577af0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/microblaze/include/uapi/asm/elf.h
View File

@ -11,12 +11,13 @@
#ifndef _UAPI_ASM_MICROBLAZE_ELF_H #ifndef _UAPI_ASM_MICROBLAZE_ELF_H
#define _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. * Note there is no "official" ELF designation for Microblaze.
* I've snaffled the value from the microblaze binutils source code * I've snaffled the value from the microblaze binutils source code
* /binutils/microblaze/include/elf/microblaze.h * /binutils/microblaze/include/elf/microblaze.h
*/ */
#define EM_MICROBLAZE 189
#define EM_MICROBLAZE_OLD 0xbaab #define EM_MICROBLAZE_OLD 0xbaab
#define ELF_ARCH EM_MICROBLAZE #define ELF_ARCH EM_MICROBLAZE

1
include/uapi/linux/elf-em.h
View File

@ -39,6 +39,7 @@
#define EM_TI_C6000 140 /* TI C6X DSPs */ #define EM_TI_C6000 140 /* TI C6X DSPs */
#define EM_AARCH64 183 /* ARM 64 bit */ #define EM_AARCH64 183 /* ARM 64 bit */
#define EM_TILEPRO 188 /* Tilera TILEPro */ #define EM_TILEPRO 188 /* Tilera TILEPro */
#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */
#define EM_TILEGX 191 /* Tilera TILE-Gx */ #define EM_TILEGX 191 /* Tilera TILE-Gx */
#define EM_FRV 0x5441 /* Fujitsu FR-V */ #define EM_FRV 0x5441 /* Fujitsu FR-V */
#define EM_AVR32 0x18ad /* Atmel AVR32 */ #define EM_AVR32 0x18ad /* Atmel AVR32 */