From patchwork Fri Jun 29 07:37:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 168009 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 9AAECB7020 for ; Fri, 29 Jun 2012 17:38:29 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CE4512809D; Fri, 29 Jun 2012 09:38:24 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aXHJerL0QOGX; Fri, 29 Jun 2012 09:38:24 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2E1FE28090; Fri, 29 Jun 2012 09:38:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1792528096 for ; Fri, 29 Jun 2012 09:38:10 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kID86XlyKySb for ; Fri, 29 Jun 2012 09:38:09 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ey0-f172.google.com (mail-ey0-f172.google.com [209.85.215.172]) by theia.denx.de (Postfix) with ESMTPS id 677C92808B for ; Fri, 29 Jun 2012 09:38:04 +0200 (CEST) Received: by eaaq13 with SMTP id q13so1276123eaa.3 for ; Fri, 29 Jun 2012 00:38:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=f8JAYisdEG3rV3wDXplnZHlgyblfIHuuysXbPk3+/3s=; b=KhJed37nMd/xj3iAHokojPG0b++6mstffx2zrI6L6y6dtLh+aD38TjulPuQOwaEOn7 phiTepqoKmTTSLGnmKYqNnbqKIF3rsO1jQDm9CVyzSPvPnOu08gcsNwi9zI/kYTuaBxD pkvLTwsUJ477FvS0qa8GSA10JeK2S37VfCubpS28T21LGvj046PHew6oJN1OdBYTY0De X0vqutuzYp1OJmN/daszpAcmAqkyvMb7N4f5QcnLYObRIRzWWnh6WdDIJfIypQxC+qz5 /kUheH0fJ+INq0S2qSsj8lw4cxFSAv/u6b/L3UvO7+uIqptu3SxW4sZTJYFBDuKyi1I3 MVVw== Received: by 10.216.217.228 with SMTP id i78mr208144wep.126.1340955483416; Fri, 29 Jun 2012 00:38:03 -0700 (PDT) Received: from localhost (11.161.broadband5.iol.cz. [88.100.161.11]) by mx.google.com with ESMTPS id dg2sm7003036wib.4.2012.06.29.00.38.01 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 29 Jun 2012 00:38:02 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de Date: Fri, 29 Jun 2012 09:37:55 +0200 Message-Id: <1340955478-22251-2-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1340955478-22251-1-git-send-email-monstr@monstr.eu> References: <1340955478-22251-1-git-send-email-monstr@monstr.eu> X-Gm-Message-State: ALoCoQlqAg0fvwipPlhWnkFVdjvUtQdXr47kZWc5YweokTcilboMG98Kb532XaW34UgIVOluxxtZ Subject: [U-Boot] [PATCH 2/5] microblaze: Move individual board linker scripts to common script in cpu tree. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Unification for all microblaze boards. Signed-off-by: Michal Simek --- arch/microblaze/config.mk | 2 + arch/microblaze/cpu/u-boot.lds | 71 ++++++++++++++++++++++++++++ board/xilinx/microblaze-generic/u-boot.lds | 71 ---------------------------- 3 files changed, 73 insertions(+), 71 deletions(-) create mode 100644 arch/microblaze/cpu/u-boot.lds delete mode 100644 board/xilinx/microblaze-generic/u-boot.lds diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk index abea70b..aca79e2 100644 --- a/arch/microblaze/config.mk +++ b/arch/microblaze/config.mk @@ -29,3 +29,5 @@ CROSS_COMPILE ?= mb- CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000 PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__ + +LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds diff --git a/arch/microblaze/cpu/u-boot.lds b/arch/microblaze/cpu/u-boot.lds new file mode 100644 index 0000000..ee41145 --- /dev/null +++ b/arch/microblaze/cpu/u-boot.lds @@ -0,0 +1,71 @@ +/* + * (C) Copyright 2004 Atmark Techno, Inc. + * + * Yasushi SHOJI + * + * 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 + */ + +OUTPUT_ARCH(microblaze) +ENTRY(_start) + +SECTIONS +{ + .text ALIGN(0x4): + { + __text_start = .; + arch/microblaze/cpu/start.o (.text) + *(.text) + __text_end = .; + } + + .rodata ALIGN(0x4): + { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + __rodata_end = .; + } + + .data ALIGN(0x4): + { + __data_start = .; + *(.data) + __data_end = .; + } + + .u_boot_cmd ALIGN(0x4): + { + . = .; + __u_boot_cmd_start = .; + *(.u_boot_cmd) + __u_boot_cmd_end = .; + } + + .bss ALIGN(0x4): + { + __bss_start = .; + *(.sbss) + *(.scommon) + *(.bss) + *(COMMON) + . = ALIGN(4); + __bss_end = .; + } + __end = . ; +} diff --git a/board/xilinx/microblaze-generic/u-boot.lds b/board/xilinx/microblaze-generic/u-boot.lds deleted file mode 100644 index ee41145..0000000 --- a/board/xilinx/microblaze-generic/u-boot.lds +++ /dev/null @@ -1,71 +0,0 @@ -/* - * (C) Copyright 2004 Atmark Techno, Inc. - * - * Yasushi SHOJI - * - * 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 - */ - -OUTPUT_ARCH(microblaze) -ENTRY(_start) - -SECTIONS -{ - .text ALIGN(0x4): - { - __text_start = .; - arch/microblaze/cpu/start.o (.text) - *(.text) - __text_end = .; - } - - .rodata ALIGN(0x4): - { - __rodata_start = .; - *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) - __rodata_end = .; - } - - .data ALIGN(0x4): - { - __data_start = .; - *(.data) - __data_end = .; - } - - .u_boot_cmd ALIGN(0x4): - { - . = .; - __u_boot_cmd_start = .; - *(.u_boot_cmd) - __u_boot_cmd_end = .; - } - - .bss ALIGN(0x4): - { - __bss_start = .; - *(.sbss) - *(.scommon) - *(.bss) - *(COMMON) - . = ALIGN(4); - __bss_end = .; - } - __end = . ; -}