Skip to contentSkip to conversation

sh: Fix incorrect linking with new binutils

PATCH New Marek Vasut 1 participant 4 messages Sep 14, 2019 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 sh: Fix incorrect linking with new binutils

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

Cc Nobuhiro Iwamatsu <[email protected]>
---
 arch/sh/cpu/u-boot.lds | 1 +
 1 file changed, 1 insertion(+)
arch/sh/cpu/u-boot.lds +1 -0
index 47302da252..4cc97737f1 100644
@@ -25,6 +25,7 @@ ENTRY(_start)
 
 SECTIONS
 {
+	. = CONFIG_SYS_TEXT_BASE;
 	reloc_dst = .;
 
 	PROVIDE (_ftext = .);
Signature · 1 line
2.23.0.rc1
#1 lore raw

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

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

Cc Nobuhiro Iwamatsu <[email protected]>
---
 arch/sh/cpu/sh4/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/cpu/sh4/config.mk +1 -1
index d62d285e60..23fec66492 100644
@@ -6,4 +6,4 @@
 # (C) Copyright 2007
 # Nobuhiro Iwamatsu <[email protected]>
 #
-PLATFORM_CPPFLAGS += -m4-nofpu
+PLATFORM_CPPFLAGS += $(call cc-option,-m4-nofpu,-m4)
Signature · 1 line
2.23.0.rc1
#2 lore raw

PATCH 3/4 sh: r2dplus: Fix missing PCI range

In reply to 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.

Cc Nobuhiro Iwamatsu <[email protected]>

---
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(-)
arch/sh/dts/sh7751-r2dplus.dts +2 -1
index ecaf0772d8..efaeb33e36 100644
@@ -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>;
 	};
 };
Signature · 1 line
2.23.0.rc1
#3 lore raw

PATCH 4/4 sh: r2dplus: Enable DHCP command

In reply to Marek Vasut

Enable the "dhcp" command as a minor convenience.

Cc Nobuhiro Iwamatsu <[email protected]>
---
 configs/r2dplus_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/r2dplus_defconfig +1 -0
index b2334affc3..e10ac939c5 100644
@@ -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
Signature · 1 line
2.23.0.rc1