From 7cee0f1a0cc7a1a0707e313d6afa6047bdc39f59 Mon Sep 17 00:00:00 2001
From: Guo Ren <ren_guo@c-sky.com>
Date: Fri, 24 Nov 2017 21:36:39 +0800
Subject: csky: ck610 doesn't support FPU.

1. No FPU for ck610
2. Only little endian is supported.
3. linux-4.9.56 for now.

Signed-off-by: Guo Ren <ren_guo@c-sky.com>
---
 mk/vars.mk                            | 2 +-
 target/config/Config.in.cpu           | 9 ++++++---
 target/config/Config.in.endian        | 1 +
 target/config/Config.in.kernelversion | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mk/vars.mk b/mk/vars.mk
index 922ab5d82..6c2a813b1 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -76,7 +76,7 @@ ifeq ($(ADK_TARGET_ARCH_C6X),y)
 GNU_TARGET_NAME:=	$(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_LINUXTYPE)
 endif
 ifeq ($(ADK_TARGET_ARCH_CSKY),y)
-ifeq ($(ADK_TARGET_CPU_CSKY_CK610F),y)
+ifeq ($(ADK_TARGET_CPU_CSKY_CK610),y)
 GNU_TARGET_NAME:=	$(ADK_TARGET_CPU_ARCH)-unknown-$(ADK_TARGET_LINUXTYPE)
 else
 GNU_TARGET_NAME:=	$(ADK_TARGET_CPU_ARCH)-abiv2-$(ADK_TARGET_LINUXTYPE)
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index 94d65946f..b7d17d942 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -489,13 +489,14 @@ config ADK_TARGET_CPU_CRIS_CRISV32
 	depends on ADK_TARGET_ARCH_CRIS
 
 # c-sky
-config ADK_TARGET_CPU_CSKY_CK610F
-	bool "ck610f"
+config ADK_TARGET_CPU_CSKY_CK610
+	bool "ck610"
 	select ADK_TARGET_SUPPORTS_THREADS
 	select ADK_TARGET_SUPPORTS_LT
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	depends on ADK_TARGET_ARCH_CSKY
+	depends on ADK_TARGET_LITTLE_ENDIAN
 
 config ADK_TARGET_CPU_CSKY_CK810F
 	bool "ck810f"
@@ -504,6 +505,7 @@ config ADK_TARGET_CPU_CSKY_CK810F
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	depends on ADK_TARGET_ARCH_CSKY
+	depends on ADK_TARGET_LITTLE_ENDIAN
 
 config ADK_TARGET_CPU_CSKY_CK807F
 	bool "ck807f"
@@ -512,6 +514,7 @@ config ADK_TARGET_CPU_CSKY_CK807F
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	depends on ADK_TARGET_ARCH_CSKY
+	depends on ADK_TARGET_LITTLE_ENDIAN
 
 # epiphany
 config ADK_TARGET_CPU_EPIPHANY
@@ -2077,7 +2080,7 @@ config ADK_TARGET_CPU_FLAGS
 	default "-mcpu=bf549m" if ADK_TARGET_CPU_BFIN_BF549M
 	default "-mcpu=bf561" if ADK_TARGET_CPU_BFIN_BF561
 	default "-mcpu=bf592" if ADK_TARGET_CPU_BFIN_BF592
-	default "-mcpu=ck610f" if ADK_TARGET_CPU_CSKY_CK610F
+	default "-mcpu=ck610" if ADK_TARGET_CPU_CSKY_CK610
 	default "-mcpu=ck810f" if ADK_TARGET_CPU_CSKY_CK810F
 	default "-mcpu=ck807f" if ADK_TARGET_CPU_CSKY_CK807F
 	default "-mcpu=v10" if ADK_TARGET_CPU_CRIS_CRISV10
diff --git a/target/config/Config.in.endian b/target/config/Config.in.endian
index 07a16d09f..6803d5d25 100644
--- a/target/config/Config.in.endian
+++ b/target/config/Config.in.endian
@@ -6,6 +6,7 @@ prompt "Endianess"
 depends on ADK_TARGET_ARCH_ARC \
 	|| ADK_TARGET_ARCH_AARCH64 \
 	|| ADK_TARGET_ARCH_ARM \
+	|| ADK_TARGET_ARCH_CSKY \
 	|| ADK_TARGET_ARCH_C6X \
 	|| ADK_TARGET_ARCH_MICROBLAZE \
 	|| ADK_TARGET_ARCH_MIPS \
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index 8d003ce69..062df0129 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -227,7 +227,7 @@ config ADK_TARGET_KERNEL_GIT_REPO_NAME
 config ADK_TARGET_KERNEL_GIT
 	string "git version"
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
-	default "314c498ddc8c43a66ca96ff3af7da98e10fa1cc6" if ADK_TARGET_ARCH_CSKY
+	default "6064a9bdf48cefbccc4f6472dd04251f0dec1931" if ADK_TARGET_ARCH_CSKY
 	default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32
 	default "1cd2e072bbd1a518e11b551435be0ad84a2c52af" if ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64
 	default "cfa29b46af94d83e31aa000dbaee553f9c4d670c" if ADK_TARGET_BOARD_BCM28XX
@@ -241,7 +241,7 @@ config ADK_TARGET_KERNEL_GIT
 config ADK_TARGET_KERNEL_GIT_VER
 	string "kernel version"
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
-	default "4.9.13" if ADK_TARGET_ARCH_CSKY
+	default "4.9.56" if ADK_TARGET_ARCH_CSKY
 	default "4.9.37" if ADK_TARGET_BOARD_BCM28XX
 	default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA
-- 
cgit v1.2.3