Hexagon: change arch version config to allow comparisons

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
This commit is contained in:
Richard Kuo 2012-03-27 17:37:33 -05:00
parent 8f5a0b9dff
commit 66b03dbfe6
3 changed files with 10 additions and 31 deletions

View File

@ -33,19 +33,6 @@ config HEXAGON
Qualcomm Hexagon is a processor architecture designed for high Qualcomm Hexagon is a processor architecture designed for high
performance and low power across a wide variety of applications. performance and low power across a wide variety of applications.
config HEXAGON_ARCH_V1
bool
config HEXAGON_ARCH_V2
bool
config HEXAGON_ARCH_V3
bool
config HEXAGON_ARCH_V4
bool
config HEXAGON_PHYS_OFFSET config HEXAGON_PHYS_OFFSET
def_bool y def_bool y
---help--- ---help---
@ -109,12 +96,15 @@ choice
config HEXAGON_COMET config HEXAGON_COMET
bool "Comet Board" bool "Comet Board"
select HEXAGON_ARCH_V2
---help--- ---help---
Support for the Comet platform. Support for the Comet platform.
endchoice endchoice
config HEXAGON_ARCH_VERSION
int "Architecture version"
default 2
config HEXAGON_VM config HEXAGON_VM
def_bool y def_bool y

View File

@ -15,20 +15,9 @@ KBUILD_CFLAGS += -fno-short-enums
# LDFLAGS_MODULE += -shared # LDFLAGS_MODULE += -shared
CFLAGS_MODULE += -mlong-calls CFLAGS_MODULE += -mlong-calls
cflags-$(CONFIG_HEXAGON_ARCH_V1) += $(call cc-option,-mv1) cflags-y += $(call cc-option,-mv${CONFIG_HEXAGON_ARCH_VERSION})
cflags-$(CONFIG_HEXAGON_ARCH_V2) += $(call cc-option,-mv2) aflags-y += $(call cc-option,-mv${CONFIG_HEXAGON_ARCH_VERSION})
cflags-$(CONFIG_HEXAGON_ARCH_V3) += $(call cc-option,-mv3) ldflags-y += $(call cc-option,-mv${CONFIG_HEXAGON_ARCH_VERSION})
cflags-$(CONFIG_HEXAGON_ARCH_V4) += $(call cc-option,-mv4)
aflags-$(CONFIG_HEXAGON_ARCH_V1) += $(call cc-option,-mv1)
aflags-$(CONFIG_HEXAGON_ARCH_V2) += $(call cc-option,-mv2)
aflags-$(CONFIG_HEXAGON_ARCH_V3) += $(call cc-option,-mv3)
aflags-$(CONFIG_HEXAGON_ARCH_V4) += $(call cc-option,-mv4)
ldflags-$(CONFIG_HEXAGON_ARCH_V1) += $(call cc-option,-mv1)
ldflags-$(CONFIG_HEXAGON_ARCH_V2) += $(call cc-option,-mv2)
ldflags-$(CONFIG_HEXAGON_ARCH_V3) += $(call cc-option,-mv3)
ldflags-$(CONFIG_HEXAGON_ARCH_V4) += $(call cc-option,-mv4)
KBUILD_CFLAGS += $(cflags-y) KBUILD_CFLAGS += $(cflags-y)
KBUILD_AFLAGS += $(aflags-y) KBUILD_AFLAGS += $(aflags-y)

View File

@ -168,15 +168,15 @@ do { \
#define ELF_DATA ELFDATA2LSB #define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_HEXAGON #define ELF_ARCH EM_HEXAGON
#ifdef CONFIG_HEXAGON_ARCH_V2 #if CONFIG_HEXAGON_ARCH_VERSION == 2
#define ELF_CORE_EFLAGS 0x1 #define ELF_CORE_EFLAGS 0x1
#endif #endif
#ifdef CONFIG_HEXAGON_ARCH_V3 #if CONFIG_HEXAGON_ARCH_VERSION == 3
#define ELF_CORE_EFLAGS 0x2 #define ELF_CORE_EFLAGS 0x2
#endif #endif
#ifdef CONFIG_HEXAGON_ARCH_V4 #if CONFIG_HEXAGON_ARCH_VERSION == 4
#define ELF_CORE_EFLAGS 0x3 #define ELF_CORE_EFLAGS 0x3
#endif #endif