From 1d8c93939194fb075c429fa1cdc0f1e2a916d192 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 9 Jul 2015 23:26:34 +0200 Subject: [PATCH] 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 --- arch/arm/mach-socfpga/u-boot-spl.lds | 45 ---------------------------- include/configs/socfpga_common.h | 3 -- 2 files changed, 48 deletions(-) delete mode 100644 arch/arm/mach-socfpga/u-boot-spl.lds 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 569fa418f4..0000000000 --- a/arch/arm/mach-socfpga/u-boot-spl.lds +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2012 Altera Corporation - * - * 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 a5f39b4c34..1235aaafde 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 -- 2.39.5