diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-22 22:00:20 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-22 22:00:20 -0500 |
| commit | 7794fe2c8c1303d303dbc515955c6c5be706da88 (patch) | |
| tree | 5c67f13246e16cae32b6fb7094f6e94d0e26a829 /arch | |
| parent | e8ddbefccd0193340ebbe6fe53c5490624b7c110 (diff) | |
| parent | 866ab879c94f837150af6c5094372de23ca3bd17 (diff) | |
| download | u-boot-7794fe2c8c1303d303dbc515955c6c5be706da88.tar.gz u-boot-7794fe2c8c1303d303dbc515955c6c5be706da88.tar.xz u-boot-7794fe2c8c1303d303dbc515955c6c5be706da88.zip | |
Merge git://git.denx.de/u-boot-nds32
- Support nds32 prebuilt toolchain.
- Fix some compile issues.
- Fix dts mmc node compatible string.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/nds32/config.mk | 6 | ||||
| -rw-r--r-- | arch/nds32/dts/ae3xx.dts | 2 | ||||
| -rw-r--r-- | arch/nds32/dts/ag101p.dts | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/nds32/config.mk b/arch/nds32/config.mk index 12cec368d3..a1c3371ddc 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 b19ba988db..272eb3359a 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 7832efb12f..d2ed9efe93 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>; |