summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-07-09 23:26:34 +0200
committerMarek Vasut <marex@denx.de>2015-08-08 14:14:08 +0200
commit1d8c93939194fb075c429fa1cdc0f1e2a916d192 (patch)
treedac2d2e42ea2bf52a70cc9e4c869e89ba06d505c
parent6473054a125f712648038c100d3c5ab9743cb1f1 (diff)
downloadu-boot-imx-1d8c93939194fb075c429fa1cdc0f1e2a916d192.zip
u-boot-imx-1d8c93939194fb075c429fa1cdc0f1e2a916d192.tar.gz
u-boot-imx-1d8c93939194fb075c429fa1cdc0f1e2a916d192.tar.bz2
arm: socfpga: spl: Remove custom linker script
Remove the custom SPL linker script, use the generic one instead. The custom script doesn't bring in anything new and is only burden to maintain. Signed-off-by: Marek Vasut <marex@denx.de>
-rw-r--r--arch/arm/mach-socfpga/u-boot-spl.lds45
-rw-r--r--include/configs/socfpga_common.h3
2 files changed, 0 insertions, 48 deletions
diff --git a/arch/arm/mach-socfpga/u-boot-spl.lds b/arch/arm/mach-socfpga/u-boot-spl.lds
deleted file mode 100644
index 569fa41..0000000
--- a/arch/arm/mach-socfpga/u-boot-spl.lds
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2012 Altera Corporation <www.altera.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-MEMORY { .sdram : ORIGIN = (0), LENGTH = (0xffffffff) }
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
- . = 0x00000000;
-
- . = ALIGN(4);
- .text :
- {
- *(.vectors)
- arch/arm/cpu/armv7/start.o (.text*)
- *(.text*)
- } >.sdram
-
- . = ALIGN(4);
- .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } >.sdram
-
- . = ALIGN(4);
- .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sdram
-
- . = ALIGN(4);
- __image_copy_end = .;
-
- .end :
- {
- *(.__end)
- }
-
- .bss : {
- . = ALIGN(4);
- __bss_start = .;
- *(.bss*)
- . = ALIGN(4);
- __bss_end = .;
- } >.sdram
-}
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index a5f39b4..1235aaa 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -296,9 +296,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
#define CHUNKSZ_CRC32 (1 * 1024) /* FIXME: ewww */
#define CONFIG_CRC32_VERIFY
-/* Linker script for SPL */
-#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-socfpga/u-boot-spl.lds"
-
#define CONFIG_SPL_LIBCOMMON_SUPPORT
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_WATCHDOG_SUPPORT