From 9ff67e5e4c719556d57f136a6453f8e4798d85c0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 14 Jun 2009 06:29:07 -0400 Subject: Blackfin: unify u-boot linker scripts All the Blackfin linker scripts were duplicated across the board dirs with no difference save from the semi-often used ENV_IS_EMBEDDED option. So unify all of them in the lib_blackfin/ dir and for the few boards that need to embedded the environment directly, add a LDS_BOARD_TEXT define for them to customize via their board config file. This is much simpler than forcing them to duplicate the rest of the linker script. Signed-off-by: Mike Frysinger --- board/bf537-minotaur/.gitignore | 1 - board/bf537-minotaur/Makefile | 5 +- board/bf537-minotaur/config.mk | 2 - board/bf537-minotaur/u-boot.lds.S | 143 -------------------------------------- 4 files changed, 1 insertion(+), 150 deletions(-) delete mode 100644 board/bf537-minotaur/.gitignore delete mode 100644 board/bf537-minotaur/u-boot.lds.S (limited to 'board/bf537-minotaur') diff --git a/board/bf537-minotaur/.gitignore b/board/bf537-minotaur/.gitignore deleted file mode 100644 index 945f324..0000000 --- a/board/bf537-minotaur/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/u-boot.lds diff --git a/board/bf537-minotaur/Makefile b/board/bf537-minotaur/Makefile index 1b21728..f2bd2c2 100644 --- a/board/bf537-minotaur/Makefile +++ b/board/bf537-minotaur/Makefile @@ -35,12 +35,9 @@ SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y)) SOBJS := $(addprefix $(obj),$(SOBJS-y)) -$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds +$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) -$(obj)u-boot.lds: u-boot.lds.S - $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P $^ > $@ - clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/bf537-minotaur/config.mk b/board/bf537-minotaur/config.mk index feafcef..d830843 100644 --- a/board/bf537-minotaur/config.mk +++ b/board/bf537-minotaur/config.mk @@ -26,8 +26,6 @@ # This is not actually used for Blackfin boards so do not change it #TEXT_BASE = do-not-use-me -LDSCRIPT = $(obj)board/$(BOARDDIR)/u-boot.lds - # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf537-minotaur/u-boot.lds.S b/board/bf537-minotaur/u-boot.lds.S deleted file mode 100644 index 8ddfa81..0000000 --- a/board/bf537-minotaur/u-boot.lds.S +++ /dev/null @@ -1,143 +0,0 @@ -/* - * U-boot - u-boot.lds.S - * - * Copyright (c) 2005-2008 Analog Device Inc. - * - * (C) Copyright 2000-2004 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include -#include -#undef ALIGN -#undef ENTRY -#undef bfin - -/* If we don't actually load anything into L1 data, this will avoid - * a syntax error. If we do actually load something into L1 data, - * we'll get a linker memory load error (which is what we'd want). - * This is here in the first place so we can quickly test building - * for different CPU's which may lack non-cache L1 data. - */ -#ifndef L1_DATA_B_SRAM -# define L1_DATA_B_SRAM CONFIG_SYS_MONITOR_BASE -# define L1_DATA_B_SRAM_SIZE 0 -#endif - -OUTPUT_ARCH(bfin) - -MEMORY -{ - ram : ORIGIN = CONFIG_SYS_MONITOR_BASE, LENGTH = CONFIG_SYS_MONITOR_LEN - l1_code : ORIGIN = L1_INST_SRAM, LENGTH = L1_INST_SRAM_SIZE - l1_data : ORIGIN = L1_DATA_B_SRAM, LENGTH = L1_DATA_B_SRAM_SIZE -} - -ENTRY(_start) -SECTIONS -{ - .text : - { - cpu/blackfin/start.o (.text .text.*) - -#ifdef ENV_IS_EMBEDDED - /* WARNING - the following is hand-optimized to fit within - * the sector before the environment sector. If it throws - * an error during compilation remove an object here to get - * it linked after the configuration sector. - */ - - cpu/blackfin/traps.o (.text .text.*) - cpu/blackfin/interrupt.o (.text .text.*) - cpu/blackfin/serial.o (.text .text.*) - common/dlmalloc.o (.text .text.*) - lib_generic/crc32.o (.text .text.*) - - . = DEFINED(env_offset) ? env_offset : .; - common/env_embedded.o (.text .text.*) -#endif - - __initcode_start = .; - cpu/blackfin/initcode.o (.text .text.*) - __initcode_end = .; - - *(.text .text.*) - } >ram - - .rodata : - { - . = ALIGN(4); - *(.rodata .rodata.*) - *(.rodata1) - *(.eh_frame) - . = ALIGN(4); - } >ram - - .data : - { - . = ALIGN(256); - *(.data .data.*) - *(.data1) - *(.sdata) - *(.sdata2) - *(.dynamic) - CONSTRUCTORS - } >ram - - .u_boot_cmd : - { - ___u_boot_cmd_start = .; - *(.u_boot_cmd) - ___u_boot_cmd_end = .; - } >ram - - .text_l1 : - { - . = ALIGN(4); - __stext_l1 = .; - *(.l1.text) - . = ALIGN(4); - __etext_l1 = .; - } >l1_code AT>ram - __stext_l1_lma = LOADADDR(.text_l1); - - .data_l1 : - { - . = ALIGN(4); - __sdata_l1 = .; - *(.l1.data) - *(.l1.bss) - . = ALIGN(4); - __edata_l1 = .; - } >l1_data AT>ram - __sdata_l1_lma = LOADADDR(.data_l1); - - .bss : - { - . = ALIGN(4); - __bss_start = .; - *(.sbss) *(.scommon) - *(.dynbss) - *(.bss .bss.*) - *(COMMON) - __bss_end = .; - } >ram -} -- cgit v1.1