[U-Boot] [PATCH 1/4] sh: Fix incorrect linking with new binutils

[U-Boot] [PATCH 1/4] sh: Fix incorrect linking with new binutils

[Marek Vasut]

Since binutils 2.30 , the resulting U-Boot binary was incorrectly linked
against address 0 instead of text base, fix it.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 arch/sh/cpu/u-boot.lds | 1 +
 1 file changed, 1 insertion(+)

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 = .);
-- 
2.23.0.rc1

[U-Boot] [PATCH 2/4] sh: Fix SH4 build with GCC versions without -m4-nofpu

[Marek Vasut]

Pass -m4 instead of -m4-nofpu to GCC versions which do not support
the -m4-nofpu option.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 arch/sh/cpu/sh4/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
2.23.0.rc1

[U-Boot] [PATCH 3/4] sh: r2dplus: Fix missing PCI range

[Marek Vasut]

Add missing PCI range for translating DRAM to bus addresses.
This fixes e.g. PCI NIC interface and allows network to work
in QEMU.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
NOTE: Use qemu e.g. this way:
	qemu-system-sh4 -machine r2d -nographic \
		-serial null -serial mon:stdio -kernel u-boot.bin \
		-netdev user,id=n1,tftp=/srv/tftp \
		-device rtl8139,netdev=n1,mac=00:aa:bb:cc:dd:ee
NOTE: Tested with qemu 4.1.0
---
 arch/sh/dts/sh7751-r2dplus.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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>;
 	};
 };
-- 
2.23.0.rc1

[U-Boot] [PATCH 4/4] sh: r2dplus: Enable DHCP command

[Marek Vasut]

Enable the "dhcp" command as a minor convenience.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 configs/r2dplus_defconfig | 1 +
 1 file changed, 1 insertion(+)

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
-- 
2.23.0.rc1