From b8e7e5d8c5216d48e2e2d6b42e80a5b6cba8b949 Mon Sep 17 00:00:00 2001
From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Date: Sun, 6 Jan 2019 20:42:44 +0100
Subject: [PATCH] MIPS: jz47xx: remove custom u-boot-spl.lds

There is no real difference between the generic variant and
the custom variant except that the generic variant is more
optimised. This also saves 24 Bytes in the SPL binary.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Tested-by: Ezequiel Garcia <ezequiel@collabora.com>
---
 arch/mips/mach-jz47xx/jz4780/u-boot-spl.lds | 50 ---------------------
 configs/ci20_mmc_defconfig                  |  1 -
 2 files changed, 51 deletions(-)
 delete mode 100644 arch/mips/mach-jz47xx/jz4780/u-boot-spl.lds

diff --git a/arch/mips/mach-jz47xx/jz4780/u-boot-spl.lds b/arch/mips/mach-jz47xx/jz4780/u-boot-spl.lds
deleted file mode 100644
index 347cabc450..0000000000
--- a/arch/mips/mach-jz47xx/jz4780/u-boot-spl.lds
+++ /dev/null
@@ -1,50 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-
-MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE,\
-		LENGTH = CONFIG_SPL_MAX_SIZE }
-MEMORY { .sdram : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \
-		LENGTH = CONFIG_SPL_BSS_MAX_SIZE }
-
-OUTPUT_ARCH(mips)
-ENTRY(_start)
-SECTIONS
-{
-	.text :
-	{
-		__image_copy_start = .;
-		arch/mips/mach-jz47xx/start.o	(.text*)
-		*(.text*)
-	} >.sram
-
-	. = ALIGN(4);
-	.rodata : { *(SORT_BY_ALIGNMENT(.rodata*)) } >.sram
-
-	. = ALIGN(4);
-	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
-
-	. = ALIGN(4);
-	__image_copy_end = .;
-
-	.bss : {
-		. = ALIGN(4);
-		__bss_start = .;
-		*(.sbss.*)
-		*(.bss.*)
-		*(COMMON)
-		. = ALIGN(4);
-		__bss_end = .;
-	} >.sdram
-
-	/DISCARD/ : {
-		*(.dynbss)
-		*(.dynstr)
-		*(.dynamic)
-		*(.interp)
-		*(.hash)
-		*(.gnu.*)
-		*(.plt)
-		*(.got.plt)
-		*(.rel.plt)
-		*(.rel.dyn)
-	}
-}
diff --git a/configs/ci20_mmc_defconfig b/configs/ci20_mmc_defconfig
index c1b1c3f7e9..9602c8c6fe 100644
--- a/configs/ci20_mmc_defconfig
+++ b/configs/ci20_mmc_defconfig
@@ -1,5 +1,4 @@
 CONFIG_MIPS=y
-CONFIG_SPL_LDSCRIPT="arch/mips/mach-jz47xx/jz4780/u-boot-spl.lds"
 CONFIG_SYS_TEXT_BASE=0x80010000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-- 
2.39.5