From: Tom Rini <trini@konsulko.com>
Date: Sun, 27 Aug 2017 15:50:16 +0000 (-0400)
Subject: sh: Fix linking of ms7722se
X-Git-Tag: v2017.09-rc3~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=34f98a3d2e10a273bf5b707ce941b4b8c9fc0e87;p=oweals%2Fu-boot.git

sh: Fix linking of ms7722se

While it is true that we no longer have 'ppcenv' and similar sections,
including env/embedded.o at all results in the text/etc sections being
available for the rest of the link.  This in turn is required for the
setup used on ms7722se.  This also, likely, needs further fine-tuning.

Fixes: f40ad66fa066 ("arch/sh: don't bring common/env_embedded.o into the link")
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds
index 2f2bdb5b83..db5b14c554 100644
--- a/arch/sh/cpu/u-boot.lds
+++ b/arch/sh/cpu/u-boot.lds
@@ -38,6 +38,10 @@ SECTIONS
 		KEEP(CONFIG_BOARDDIR/lowlevel_init.o	(.text .spiboot1.text))
 		KEEP(*(.spiboot2.text))
 		. = ALIGN(8192);
+#ifdef CONFIG_ENV_IS_IN_FLASH
+		env/embedded.o  (.doesnotexist)
+		. = ALIGN(8192);
+#endif
 		*(.text)
 		. = ALIGN(4);
 	} >ram =0xFF