Merge git://git.denx.de/u-boot-nds32

- Support nds32 prebuilt toolchain.
- Fix some compile issues.
- Fix dts mmc node compatible string.

3 files changed, 5 insertions, 5 deletions

diff --git a/arch/nds32/config.mk b/arch/nds32/config.mk
index 12cec368d3b..a1c3371ddcf 100644
--- a/arch/nds32/config.mk
+++ b/arch/nds32/config.mk
@@ -15,8 +15,8 @@ endif
 CONFIG_STANDALONE_LOAD_ADDR = 0x300000
 LDFLAGS_STANDALONE	+= -T $(srctree)/examples/standalone/nds32.lds
 
-PLATFORM_RELFLAGS	+= -fno-common -mrelax
+PLATFORM_RELFLAGS	+= -fno-common -mrelax -mno-ext-fpu-dp -mfloat-abi=soft
 PLATFORM_RELFLAGS	+= -gdwarf-2
-PLATFORM_CPPFLAGS	+= -D__nds32__ -G0 -ffixed-10 -fpie
+PLATFORM_CPPFLAGS	+= -D__nds32__ -ffixed-10 -fpie -mcmodel=large
 
-LDFLAGS_u-boot		= --gc-sections --relax -pie
+LDFLAGS_u-boot		= --gc-sections --relax -pie --mabi=AABI
diff --git a/arch/nds32/dts/ae3xx.dts b/arch/nds32/dts/ae3xx.dts
index b19ba988dbf..272eb3359ab 100644
--- a/arch/nds32/dts/ae3xx.dts
+++ b/arch/nds32/dts/ae3xx.dts
@@ -70,7 +70,7 @@
 	};
 
 	mmc0: mmc@f0e00000 {
-		compatible = "andestech,atsdc010";
+		compatible = "andestech,atfsdc010";
 		max-frequency = <100000000>;
 		fifo-depth = <0x10>;
 		reg = <0xf0e00000 0x1000>;
diff --git a/arch/nds32/dts/ag101p.dts b/arch/nds32/dts/ag101p.dts
index 7832efb12fb..d2ed9efe93d 100644
--- a/arch/nds32/dts/ag101p.dts
+++ b/arch/nds32/dts/ag101p.dts
@@ -62,7 +62,7 @@
 	};
 
 	mmc0: mmc@98e00000 {
-		compatible = "andestech,atsdc010";
+		compatible = "andestech,atfsdc010";
 		max-frequency = <30000000>;
 		fifo-depth = <0x10>;
 		reg = <0x98e00000 0x1000>;