diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-15 21:14:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-15 21:14:26 -0400 |
| commit | a314ec1bfda3d0db0ce8ae02dde1b06650d82e7f (patch) | |
| tree | b857645825bd276c2db0415adfe30f453cd2e3b2 | |
| parent | 6f4001315af2f818bfc656df81e138d1434d1fc2 (diff) | |
| parent | b32882dadbcbef9e11fd0f0efea0c2b622cae019 (diff) | |
| download | u-boot-a314ec1bfda3d0db0ce8ae02dde1b06650d82e7f.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
| -rw-r--r-- | arch/sh/cpu/sh4/config.mk | 2 | ||||
| -rw-r--r-- | arch/sh/cpu/u-boot.lds | 1 | ||||
| -rw-r--r-- | arch/sh/dts/sh7751-r2dplus.dts | 3 | ||||
| -rw-r--r-- | configs/r2dplus_defconfig | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/arch/sh/cpu/sh4/config.mk b/arch/sh/cpu/sh4/config.mk index d62d285e60..23fec66492 100644 --- a/arch/sh/cpu/sh4/config.mk +++ b/arch/sh/cpu/sh4/config.mk @@ -6,4 +6,4 @@ # (C) Copyright 2007 # Nobuhiro Iwamatsu <iwamatsu@nigauri.org> # -PLATFORM_CPPFLAGS += -m4-nofpu +PLATFORM_CPPFLAGS += $(call cc-option,-m4-nofpu,-m4) diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds index 47302da252..4cc97737f1 100644 --- a/arch/sh/cpu/u-boot.lds +++ b/arch/sh/cpu/u-boot.lds @@ -25,6 +25,7 @@ ENTRY(_start) SECTIONS { + . = CONFIG_SYS_TEXT_BASE; reloc_dst = .; PROVIDE (_ftext = .); diff --git a/arch/sh/dts/sh7751-r2dplus.dts b/arch/sh/dts/sh7751-r2dplus.dts index ecaf0772d8..efaeb33e36 100644 --- a/arch/sh/dts/sh7751-r2dplus.dts +++ b/arch/sh/dts/sh7751-r2dplus.dts @@ -21,6 +21,7 @@ #size-cells = <2>; #interrupt-cells = <1>; ranges = <0x01000000 0 0xfe240000 0 0xfe240000 0 0x00040000 - 0x02000000 0 0xfd000000 0 0xfd000000 0 0x01000000>; + 0x02000000 0 0xfd000000 0 0xfd000000 0 0x01000000 + 0x42000000 0 0x0c000000 0 0x8c000000 0 0x04000000>; }; }; diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig index b2334affc3..e10ac939c5 100644 --- a/configs/r2dplus_defconfig +++ b/configs/r2dplus_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_DM=y CONFIG_CMD_IDE=y CONFIG_CMD_PCI=y # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y |