From patchwork Tue Mar 15 21:58:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 597872 X-Patchwork-Delegate: trini@ti.com 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 3qPpPm3dqZz9sD9 for ; Wed, 16 Mar 2016 08:57:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C1508A75F5; Tue, 15 Mar 2016 22:57:27 +0100 (CET) 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 1tzKfUywUOug; Tue, 15 Mar 2016 22:57:27 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C6BD9A749F; Tue, 15 Mar 2016 22:57:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 70E3BA749F for ; Tue, 15 Mar 2016 22:57:24 +0100 (CET) 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 VFq49B1r-jn5 for ; Tue, 15 Mar 2016 22:57:24 +0100 (CET) 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-yw0-f176.google.com (mail-yw0-f176.google.com [209.85.161.176]) by theia.denx.de (Postfix) with ESMTPS id 0ACB5A745C for ; Tue, 15 Mar 2016 22:57:21 +0100 (CET) Received: by mail-yw0-f176.google.com with SMTP id m126so15144479ywd.0 for ; Tue, 15 Mar 2016 14:57:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+fqn2SaW7yc7JUSLG/MCJ5VRZ5YcYRgepeygCas8SXE=; b=J1b74jElRmE+INZviMT048Raut6DJ8efTy3p+OOPlYA/1HvotmpdO7IMVh1+Xb/V55 mWFenoqiQ77rRLjtwRc77/rdZ7kcOT0HxFJZkHM7lN1YpfnPfauhLYf7N17558NhGIyA eHDyQofDvGxnfdXZzCOZcovRLI+H9m7iJ5DbKFHzdZ3vwxQ743h9UkrIKkadE5D1oScI sueHycoaViNZC6shHEPDAPj1ZTXmuJVis1AfkPqK8ZQeLO5weeRPGJb2WCRbOm4Dv7EP vBaTANmTtzK/ZU3TQ6kqt+YuqvqWBDWX4dC8VuPzMWQJdx0+qsJwc2FoFyirxOoFzVv5 hpNQ== X-Gm-Message-State: AD7BkJLTA+Y8P2yEEWZ3uQMl8FeCwlghUrOFNEsYRn3atsDK6L6gzqTXuNb27h3ifLc6wQ== X-Received: by 10.129.17.66 with SMTP id 63mr207358ywr.122.1458079040069; Tue, 15 Mar 2016 14:57:20 -0700 (PDT) Received: from localhost.localdomain (cpe-75-180-230-22.ec.res.rr.com. [75.180.230.22]) by smtp.gmail.com with ESMTPSA id i189sm133795ywc.30.2016.03.15.14.57.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2016 14:57:19 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Tue, 15 Mar 2016 17:58:33 -0400 Message-Id: <1458079113-21823-1-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 1.7.9.5 Cc: Michal Simek Subject: [U-Boot] [PATCH] spl: arm: Make sure to include u_boot_list_*_part_disk_* X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Starting with 96e5b03 we use a linker list for partition table information. However since we use this in SPL we need to make sure that the SPL linker scripts include these as well. Cc: Nishanth Menon Cc: Michal Simek Cc: Simon Glass Reported-by: Nishanth Menon Signed-off-by: Tom Rini Reviewed-by: Simon Glass Tested-by: Nishanth Menon --- arch/arm/cpu/armv7/omap-common/u-boot-spl.lds | 1 + arch/arm/cpu/u-boot-spl.lds | 1 + arch/arm/mach-zynq/u-boot-spl.lds | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds index ccd0c83..9dccdc0 100644 --- a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds +++ b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds @@ -35,6 +35,7 @@ SECTIONS . = ALIGN(4); .u_boot_list : { + KEEP(*(SORT(.u_boot_list_*_part_driver_*))); KEEP(*(SORT(.u_boot_list*_i2c_*))); } >.sram diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds index c5b4f7c..1805043 100644 --- a/arch/arm/cpu/u-boot-spl.lds +++ b/arch/arm/cpu/u-boot-spl.lds @@ -40,6 +40,7 @@ SECTIONS #endif . = .; .u_boot_list : { + KEEP(*(SORT(.u_boot_list_*_part_driver_*))); KEEP(*(SORT(.u_boot_list*_i2c_*))); } diff --git a/arch/arm/mach-zynq/u-boot-spl.lds b/arch/arm/mach-zynq/u-boot-spl.lds index ecdf6a0..6ea7996 100644 --- a/arch/arm/mach-zynq/u-boot-spl.lds +++ b/arch/arm/mach-zynq/u-boot-spl.lds @@ -38,14 +38,15 @@ SECTIONS } > .sram . = ALIGN(4); -#ifdef CONFIG_SPL_DM .u_boot_list : { + KEEP(*(SORT(.u_boot_list_*_part_driver_*))); +#ifdef CONFIG_SPL_DM KEEP(*(SORT(.u_boot_list_*_driver_*))); KEEP(*(SORT(.u_boot_list_*_uclass_*))); +#endif } > .sram . = ALIGN(4); -#endif . = .;