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

- Support nds32 prebuilt toolchain.
- Fix some compile issues.
- Fix dts mmc node compatible string.
diff --git a/.travis.yml b/.travis.yml
index 8dfe4cf..59e615a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,6 +79,11 @@
        wget https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2018.09-release/arc_gnu_2018.09_prebuilt_uclibc_le_archs_linux_install.tar.gz &&
        tar -C /tmp -xf arc_gnu_2018.09_prebuilt_uclibc_le_archs_linux_install.tar.gz;
     fi
+  - if [[ "${TOOLCHAIN}" == "nds32" ]]; then
+       wget https://github.com/vincentzwc/prebuilt-nds32-toolchain/releases/download/20180521/nds32le-linux-glibc-v3-upstream.tar.gz &&
+       tar -C /tmp -xf nds32le-linux-glibc-v3-upstream.tar.gz &&
+       echo -e "\n[toolchain-prefix]\nnds32 = /tmp/nds32le-linux-glibc-v3-upstream/bin/nds32le-linux-" >> ~/.buildman;
+    fi
   - if [[ "${TOOLCHAIN}" == *xtensa* ]]; then
        wget https://github.com/foss-xtensa/toolchain/releases/download/2018.02/x86_64-2018.02-${TOOLCHAIN}.tar.gz &&
        tar -C /tmp -xf x86_64-2018.02-${TOOLCHAIN}.tar.gz &&
@@ -311,6 +316,10 @@
       env:
         - BUILDMAN="riscv"
           TOOLCHAIN="riscv"
+    - name: "buildman nds32"
+      env:
+        - BUILDMAN="nds32"
+          TOOLCHAIN="nds32"
 
     # QA jobs for code analytics
     # static code analysis with cppcheck (we can add --enable=all later)
diff --git a/arch/nds32/config.mk b/arch/nds32/config.mk
index 12cec36..a1c3371 100644
--- a/arch/nds32/config.mk
+++ b/arch/nds32/config.mk
@@ -15,8 +15,8 @@
 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 b19ba98..272eb33 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 7832efb..d2ed9ef 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>;