diff options
| -rw-r--r-- | mk/vars.mk | 3 | ||||
| -rw-r--r-- | rules.mk | 1 | ||||
| -rw-r--r-- | target/config/Config.in.cpu | 25 | ||||
| -rw-r--r-- | target/config/Config.in.tc | 26 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 4 |
5 files changed, 57 insertions, 2 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index bf51a378b..e73cdc698 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -16,6 +16,9 @@ endif ifneq ($(ADK_TARGET_ABI),) ADK_SUFFIX:= $(ADK_SUFFIX)_$(ADK_TARGET_ABI) endif +ifneq ($(ADK_TARGET_CPU_TYPE),) +ADK_SUFFIX:= $(ADK_SUFFIX)_$(ADK_TARGET_CPU_TYPE) +endif ifeq ($(ADK_TARGET_WITH_MMU),) ADK_SUFFIX:= $(ADK_SUFFIX)_nommu endif @@ -30,6 +30,7 @@ ADK_TARGET_ARCH:= $(strip $(subst ",, $(ADK_TARGET_ARCH))) ADK_TARGET_SYSTEM:= $(strip $(subst ",, $(ADK_TARGET_SYSTEM))) ADK_TARGET_BOARD:= $(strip $(subst ",, $(ADK_TARGET_BOARD))) ADK_TARGET_CPU_ARCH:= $(strip $(subst ",, $(ADK_TARGET_CPU_ARCH))) +ADK_TARGET_CPU_TYPE:= $(strip $(subst ",, $(ADK_TARGET_CPU_TYPE))) ADK_TARGET_KERNEL:= $(strip $(subst ",, $(ADK_TARGET_KERNEL))) ADK_TARGET_LIBC:= $(strip $(subst ",, $(ADK_TARGET_LIBC))) ADK_TARGET_LIBC_PATH:= $(strip $(subst ",, $(ADK_TARGET_LIBC_PATH))) diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 98b060616..cade126d3 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -116,6 +116,13 @@ config ADK_CPU_CORTEX_A15 select ADK_TARGET_CPU_WITH_FPU_VFPV4 select ADK_TARGET_CPU_WITH_NEON +config ADK_CPU_CORTEX_A17 + bool + select ADK_TARGET_WITH_NPTL + select ADK_TARGET_WITH_MMU + select ADK_TARGET_CPU_WITH_FPU_VFPV4 + select ADK_TARGET_CPU_WITH_NEON + config ADK_CPU_CORTEX_A53 bool select ADK_LINUX_64 @@ -341,6 +348,7 @@ config ADK_TARGET_GCC_CPU default "cortex-a8" if ADK_CPU_CORTEX_A8 default "cortex-a9" if ADK_CPU_CORTEX_A9 default "cortex-a15" if ADK_CPU_CORTEX_A15 + default "cortex-a17" if ADK_CPU_CORTEX_A17 default "cortex-a53" if ADK_CPU_CORTEX_A53 default "cortex-a57" if ADK_CPU_CORTEX_A57 default "cortex-m3" if ADK_CPU_CORTEX_M3 @@ -374,6 +382,23 @@ config ADK_TARGET_CPU_FLAGS default "-mcpu=v32" if ADK_CPU_CRIS_V32 default "-mcpu=v7.10.d" if ADK_CPU_MICROBLAZE +config ADK_TARGET_CPU_TYPE + string + default "arc700" if ADK_TARGET_ARCH_ARC && ADK_CPU_ARC700 + default "archs" if ADK_TARGET_ARCH_ARC && ADK_CPU_ARC_HS + default "cortex_a5" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A5 + default "cortex_a7" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A7 + default "cortex_a8" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A8 + default "cortex_a9" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A9 + default "cortex_a15" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A15 + default "cortex_a17" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A17 + default "cortex_m3" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_M3 + default "cortex_m4" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_M4 + default "arm1176jzf_s" if ADK_TARGET_ARCH_ARM && ADK_CPU_ARM1176JZF_S + default "arm926ej_s" if ADK_TARGET_ARCH_ARM && ADK_CPU_ARM926EJ_S + default "cortex_a53" if ADK_TARGET_ARCH_AARCH64 && ADK_CPU_CORTEX_A53 + default "cortex_a57" if ADK_TARGET_ARCH_AARCH64 && ADK_CPU_CORTEX_A57 + config ADK_TARGET_CPU_ARCH string default "aarch64" if ADK_TARGET_ARCH_AARCH64 && ADK_TARGET_LITTLE_ENDIAN diff --git a/target/config/Config.in.tc b/target/config/Config.in.tc index 5e3805100..0777282e9 100644 --- a/target/config/Config.in.tc +++ b/target/config/Config.in.tc @@ -5,6 +5,7 @@ choice ADK_TARGET_CPU prompt "CPU type" depends on ADK_TARGET_TOOLCHAIN && \ ( ADK_TARGET_ARCH_CRIS \ + || ADK_TARGET_ARCH_AARCH64 \ || ADK_TARGET_ARCH_ARC \ || ADK_TARGET_ARCH_ARM \ || ADK_TARGET_ARCH_X86 ) @@ -19,6 +20,16 @@ config ADK_TARGET_CPU_ARC_ARC_HS select ADK_CPU_ARC_HS depends on ADK_TARGET_ARCH_ARC +config ADK_TARGET_CPU_ARM_CORTEX_A53 + bool "cortex-a53" + select ADK_CPU_CORTEX_A53 + depends on ADK_TARGET_ARCH_AARCH64 + +config ADK_TARGET_CPU_ARM_CORTEX_A57 + bool "cortex-a57" + select ADK_CPU_CORTEX_A57 + depends on ADK_TARGET_ARCH_AARCH64 + config ADK_TARGET_CPU_ARM_CORTEX_A9 bool "cortex-a9" select ADK_CPU_CORTEX_A9 @@ -34,6 +45,21 @@ config ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_CPU_CORTEX_A7 depends on ADK_TARGET_ARCH_ARM +config ADK_TARGET_CPU_ARM_CORTEX_A5 + bool "cortex-a5" + select ADK_CPU_CORTEX_A5 + depends on ADK_TARGET_ARCH_ARM + +config ADK_TARGET_CPU_ARM_CORTEX_A15 + bool "cortex-a15" + select ADK_CPU_CORTEX_A15 + depends on ADK_TARGET_ARCH_ARM + +config ADK_TARGET_CPU_ARM_CORTEX_A17 + bool "cortex-a17" + select ADK_CPU_CORTEX_A17 + depends on ADK_TARGET_ARCH_ARM + config ADK_TARGET_CPU_ARM_CORTEX_M4 bool "cortex-m4" select ADK_CPU_CORTEX_M4 diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index caeba532b..c34ff91e8 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -163,12 +163,12 @@ endif # arc ifeq ($(ADK_TARGET_ARCH_ARC),y) ifeq ($(ADK_TARGET_CPU_ARC_ARC700),y) - $(SED) 's/.*\(CONFIG_ARC_CPU_700\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(CONFIG_ARC_CPU_HS\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(CONFIG_ARC_CPU_700\).*/\1=y/' ${WRKBUILD}/.config endif ifeq ($(ADK_TARGET_CPU_ARC_ARC_HS),y) - $(SED) 's/.*\(CONFIG_ARC_CPU_HS\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(CONFIG_ARC_CPU_700\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(CONFIG_ARC_CPU_HS\).*/\1=y/' ${WRKBUILD}/.config endif endif |