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 8dfe4cfb15eec20621ebf4a27ba7821e062e0e5c..59e615abb25e8845088bd9a519f74fc8bdcabbef 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,6 +79,11 @@ before_script:
        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 @@ matrix:
       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 12cec368d3b8eba06f387f5941526fc98203560f..a1c3371ddcfd2f6311980d8ebbb6e01ef06e9fb1 100644 (file)
--- 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 b19ba988dbfb030ceb49a0ec47bad2a93a1f37d4..272eb3359abd45aed6597a79e685621248275be6 100644 (file)
--- 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 7832efb12fbea6e273c0858f8b906a00d8077b2f..d2ed9efe93d61d938f3f70e4b793633b8ad0466a 100644 (file)
--- 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>;