diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/Config.in | 6 | ||||
-rw-r--r-- | arch/Config.in.aarch64 | 7 | ||||
-rw-r--r-- | arch/Config.in.arm | 14 |
3 files changed, 10 insertions, 17 deletions
diff --git a/arch/Config.in b/arch/Config.in index df4db0b79..d59cbd762 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -354,14 +354,10 @@ if BR2_arcle || BR2_arceb source "arch/Config.in.arc" endif -if BR2_arm || BR2_armeb +if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be source "arch/Config.in.arm" endif -if BR2_aarch64 || BR2_aarch64_be -source "arch/Config.in.aarch64" -endif - if BR2_bfin source "arch/Config.in.bfin" endif diff --git a/arch/Config.in.aarch64 b/arch/Config.in.aarch64 deleted file mode 100644 index 34cd409a5..000000000 --- a/arch/Config.in.aarch64 +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_ARCH - default "aarch64" if BR2_aarch64 - default "aarch64_be" if BR2_aarch64_be - -config BR2_ENDIAN - default "LITTLE" if BR2_aarch64 - default "BIG" if BR2_aarch64_be diff --git a/arch/Config.in.arm b/arch/Config.in.arm index ee612f50c..002ed04d7 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -399,6 +399,7 @@ endchoice choice prompt "ARM instruction set" + depends on BR2_arm || BR2_armeb config BR2_ARM_INSTRUCTIONS_ARM bool "ARM" @@ -434,12 +435,14 @@ config BR2_ARM_INSTRUCTIONS_THUMB2 endchoice config BR2_ARCH - default "arm" if BR2_arm - default "armeb" if BR2_armeb + default "arm" if BR2_arm + default "armeb" if BR2_armeb + default "aarch64" if BR2_aarch64 + default "aarch64_be" if BR2_aarch64_be config BR2_ENDIAN - default "LITTLE" if BR2_arm - default "BIG" if BR2_armeb + default "LITTLE" if (BR2_arm || BR2_aarch64) + default "BIG" if (BR2_armeb || BR2_aarch64_be) config BR2_GCC_TARGET_CPU default "arm920t" if BR2_arm920t @@ -467,9 +470,10 @@ config BR2_GCC_TARGET_CPU default "iwmmxt" if BR2_iwmmxt config BR2_GCC_TARGET_ABI - default "aapcs-linux" + default "aapcs-linux" if BR2_arm || BR2_armeb config BR2_GCC_TARGET_FPU + depends on BR2_arm || BR2_armeb default "vfp" if BR2_ARM_FPU_VFPV2 default "vfpv3" if BR2_ARM_FPU_VFPV3 default "vfpv3-d16" if BR2_ARM_FPU_VFPV3D16 |