aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2019-06-02 22:11:20 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-06-02 22:11:20 +0200
commitf590097045ee5d399c42a2700475353361babcf9 (patch)
treec8d6feffb86fec6bc0399470392683d5a78051a2 /arch
parent2421c246b2ff8b9492ce98f2d2f4838f148fa51b (diff)
parent852df15f317fed37c780e79a253907ee1241cad7 (diff)
downloadbuildroot-f590097045ee5d399c42a2700475353361babcf9.tar.gz
buildroot-f590097045ee5d399c42a2700475353361babcf9.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/Config.in1
-rw-r--r--arch/Config.in.arc3
-rw-r--r--arch/Config.in.arm3
-rw-r--r--arch/Config.in.csky29
-rw-r--r--arch/Config.in.m68k3
-rw-r--r--arch/Config.in.microblaze3
-rw-r--r--arch/Config.in.mips3
-rw-r--r--arch/Config.in.nios23
-rw-r--r--arch/Config.in.or1k3
-rw-r--r--arch/Config.in.powerpc3
-rw-r--r--arch/Config.in.riscv3
-rw-r--r--arch/Config.in.sh3
-rw-r--r--arch/Config.in.sparc3
-rw-r--r--arch/Config.in.x863
-rw-r--r--arch/Config.in.xtensa3
-rw-r--r--arch/arch.mk.csky26
16 files changed, 79 insertions, 16 deletions
diff --git a/arch/Config.in b/arch/Config.in
index d82803c828..db1199c6a2 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -77,7 +77,6 @@ config BR2_aarch64_be
config BR2_csky
bool "csky"
- select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
select BR2_ARCH_HAS_MMU_MANDATORY
help
csky is processor IP from china.
diff --git a/arch/Config.in.arc b/arch/Config.in.arc
index 156384b9a5..6cddbb961f 100644
--- a/arch/Config.in.arc
+++ b/arch/Config.in.arc
@@ -79,3 +79,6 @@ config BR2_ARC_PAGE_SIZE
default "4K" if BR2_ARC_PAGE_SIZE_4K
default "8K" if BR2_ARC_PAGE_SIZE_8K
default "16K" if BR2_ARC_PAGE_SIZE_16K
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index a9972978d4..93031ab147 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -866,3 +866,6 @@ config BR2_GCC_TARGET_MODE
config BR2_READELF_ARCH_NAME
default "ARM" if BR2_arm || BR2_armeb
default "AArch64" if BR2_aarch64 || BR2_aarch64_be
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.csky b/arch/Config.in.csky
index e88e4e2d12..4bdfbfae4b 100644
--- a/arch/Config.in.csky
+++ b/arch/Config.in.csky
@@ -13,19 +13,26 @@ config BR2_ck807
config BR2_ck810
bool "ck810"
+config BR2_ck860
+ bool "ck860"
+
endchoice
config BR2_CSKY_FPU
bool "Enable FPU coprocessor"
- depends on BR2_ck810 || BR2_ck807
+ depends on BR2_ck810 || BR2_ck807 || BR2_ck860
help
You can say N here if your C-SKY CPU doesn't have a
Floating-Point Coprocessor or if you don't need FPU support
for your user-space programs.
-config BR2_CSKY_DSP
- bool "Enable DSP enhanced instructions"
- depends on BR2_ck810 || BR2_ck807
+config BR2_CSKY_VDSP
+ bool "Enable VDSP enhanced instructions Co-processor"
+ depends on BR2_CSKY_FPU
+
+config BR2_GCC_TARGET_FLOAT_ABI
+ default "soft" if !BR2_CSKY_FPU
+ default "hard" if BR2_CSKY_FPU
config BR2_ARCH
default "csky"
@@ -33,16 +40,8 @@ config BR2_ARCH
config BR2_ENDIAN
default "LITTLE"
-config BR2_GCC_TARGET_CPU
- default "ck610" if (BR2_ck610 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
- default "ck807" if (BR2_ck807 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
- default "ck807e" if (BR2_ck807 && !BR2_CSKY_FPU && BR2_CSKY_DSP)
- default "ck807f" if (BR2_ck807 && BR2_CSKY_FPU && !BR2_CSKY_DSP)
- default "ck807ef" if (BR2_ck807 && BR2_CSKY_FPU && BR2_CSKY_DSP)
- default "ck810" if (BR2_ck810 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
- default "ck810e" if (BR2_ck810 && !BR2_CSKY_FPU && BR2_CSKY_DSP)
- default "ck810f" if (BR2_ck810 && BR2_CSKY_FPU && !BR2_CSKY_DSP)
- default "ck810ef" if (BR2_ck810 && BR2_CSKY_FPU && BR2_CSKY_DSP)
-
config BR2_READELF_ARCH_NAME
default "CSKY"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k
index c134df2f14..275f47f1d3 100644
--- a/arch/Config.in.m68k
+++ b/arch/Config.in.m68k
@@ -38,3 +38,6 @@ config BR2_GCC_TARGET_CPU
config BR2_READELF_ARCH_NAME
default "MC68000"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.microblaze b/arch/Config.in.microblaze
index 042712a1b6..5fe2906d40 100644
--- a/arch/Config.in.microblaze
+++ b/arch/Config.in.microblaze
@@ -12,3 +12,6 @@ config BR2_READELF_ARCH_NAME
config BR2_microblaze
bool
default y if BR2_microblazeel || BR2_microblazebe
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index 7f7aa63f06..619456c2d5 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -271,3 +271,6 @@ config BR2_GCC_TARGET_ABI
config BR2_READELF_ARCH_NAME
default "MIPS R3000"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.nios2 b/arch/Config.in.nios2
index 7466331016..aae435fa17 100644
--- a/arch/Config.in.nios2
+++ b/arch/Config.in.nios2
@@ -6,3 +6,6 @@ config BR2_ENDIAN
config BR2_READELF_ARCH_NAME
default "Altera Nios II"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.or1k b/arch/Config.in.or1k
index b31ab3e95b..abdf498fb8 100644
--- a/arch/Config.in.or1k
+++ b/arch/Config.in.or1k
@@ -6,3 +6,6 @@ config BR2_ENDIAN
config BR2_READELF_ARCH_NAME
default "OpenRISC 1000"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
index 394f2e625c..56c4b526ec 100644
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -208,3 +208,6 @@ config BR2_GCC_TARGET_CPU
config BR2_READELF_ARCH_NAME
default "PowerPC" if BR2_powerpc
default "PowerPC64" if BR2_powerpc64 || BR2_powerpc64le
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv
index 097719e846..bdd2672602 100644
--- a/arch/Config.in.riscv
+++ b/arch/Config.in.riscv
@@ -125,3 +125,6 @@ config BR2_GCC_TARGET_ABI
config BR2_READELF_ARCH_NAME
default "RISC-V"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.sh b/arch/Config.in.sh
index 1cb2db90ad..b5cce18e22 100644
--- a/arch/Config.in.sh
+++ b/arch/Config.in.sh
@@ -30,3 +30,6 @@ config BR2_ENDIAN
config BR2_READELF_ARCH_NAME
default "Renesas / SuperH SH"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc
index b22b55142e..4c4dc61745 100644
--- a/arch/Config.in.sparc
+++ b/arch/Config.in.sparc
@@ -32,3 +32,6 @@ config BR2_GCC_TARGET_CPU
config BR2_READELF_ARCH_NAME
default "Sparc" if BR2_sparc
default "Sparc v9" if BR2_sparc64
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.x86 b/arch/Config.in.x86
index f7c53a0fae..ce91317dc6 100644
--- a/arch/Config.in.x86
+++ b/arch/Config.in.x86
@@ -290,3 +290,6 @@ config BR2_GCC_TARGET_ARCH
config BR2_READELF_ARCH_NAME
default "Intel 80386" if BR2_i386
default "Advanced Micro Devices X86-64" if BR2_x86_64
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa
index 14049480ec..a79d906985 100644
--- a/arch/Config.in.xtensa
+++ b/arch/Config.in.xtensa
@@ -50,3 +50,6 @@ config BR2_ARCH
config BR2_READELF_ARCH_NAME
default "Tensilica Xtensa Processor"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/arch.mk.csky b/arch/arch.mk.csky
new file mode 100644
index 0000000000..fb59ae22fd
--- /dev/null
+++ b/arch/arch.mk.csky
@@ -0,0 +1,26 @@
+#
+# Configure the GCC_TARGET_ARCH variable and append the
+# appropriate C-SKY ISA extensions.
+#
+
+ifeq ($(BR2_csky),y)
+
+ifeq ($(BR2_ck610),y)
+GCC_TARGET_CPU := ck610
+else ifeq ($(BR2_ck807),y)
+GCC_TARGET_CPU := ck807
+else ifeq ($(BR2_ck810),y)
+GCC_TARGET_CPU := ck810
+else ifeq ($(BR2_ck860),y)
+GCC_TARGET_CPU := ck860
+endif
+
+ifeq ($(BR2_CSKY_FPU),y)
+GCC_TARGET_CPU := $(GCC_TARGET_CPU)f
+endif
+
+ifeq ($(BR2_CSKY_VDSP),y)
+GCC_TARGET_CPU := $(GCC_TARGET_CPU)v
+endif
+
+endif