From patchwork Tue Jun 23 21:38:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 487781 X-Patchwork-Delegate: sjg@chromium.org 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 34F9A14012C for ; Wed, 24 Jun 2015 07:41:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=LbgjE/2C; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0BA694A03A; Tue, 23 Jun 2015 23:40:44 +0200 (CEST) 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 m1s6Ifpkfdu3; Tue, 23 Jun 2015 23:40:43 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F257A4B6D7; Tue, 23 Jun 2015 23:40:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C76724B615 for ; Tue, 23 Jun 2015 23:39:58 +0200 (CEST) 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 C1eWAPt490Dj for ; Tue, 23 Jun 2015 23:39:58 +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-ie0-f171.google.com (mail-ie0-f171.google.com [209.85.223.171]) by theia.denx.de (Postfix) with ESMTPS id 3E2404A01C for ; Tue, 23 Jun 2015 23:39:54 +0200 (CEST) Received: by iebmu5 with SMTP id mu5so21060455ieb.1 for ; Tue, 23 Jun 2015 14:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xrswCRSKNeTgi5IamOcvU9OHxUdQp5rTh/eLQ1UoLJM=; b=LbgjE/2CyPSluqeEpP+CxyhG8fZzCiH4+LYiPXGzQO5KQ3ynUp4f71Yhr32uOOVlWM 2hL2/6JdGCos/3+wfkXJ+F4pfnmdmWpTpuehNAsh5JQpRecUzL2evqvB0mUBEi2qalop hKBBixpBzETPQ+SHsn2OxGz9fGZW9SaZOSUQTEm3y2eh3th3cYFDCngIcuB0lNI9Ezqs FWFGEWMsY8Qkl8ZKpaXOOk30Y4hN3ZALNXlCL8IjuO4kMcUgJoJBNaL6nQPYVGaUvCmk iQhhaST5cgcjHxDTI5l/SkwNtPt/O/kAeYPiRoYBHLl3qtoUvfu5mIzKZUteXChF1c/2 YJBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=xrswCRSKNeTgi5IamOcvU9OHxUdQp5rTh/eLQ1UoLJM=; b=TxOZ9CO6aF1cjLms46fmR991YI5dIJSj736pkaYBYp8RKLP80JuygOekjU9If6Ty3U 3sjPOzfPuWbIzvjm2cyZNrEBTVAEGK5s4289mI//QYYQZA1P4/XOXBDir4ZL5w22DnRg CsiKe+ykqrmFbUYqBR0phYblk/bdkT9FsSpy4AWKs245zCJOsy118W1aqewOnJumCjQS EkCU8M4XqaIrdRXxxGfFK6IDoQv7/6bdw4XMbrckI2JRG73dADhNmC60ijT+bivuUU1A XZc0ULrJnbWQ3lM6G9UNw5+EbQyo85t/DIiu9fmfBXI8E+WoJzmJOokRxlxmwS0wGi4K Ky+g== X-Gm-Message-State: ALoCoQmSRV0V8HAvipFg/1JDwDrBfhx777IXCSqVF5To7HeMaoo9g8GEamrnRpg1/Goulm/SXxfv X-Received: by 10.42.44.129 with SMTP id b1mr34274032icf.90.1435095593556; Tue, 23 Jun 2015 14:39:53 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by mx.google.com with ESMTPSA id j192sm15928604ioe.27.2015.06.23.14.39.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jun 2015 14:39:52 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id A29A7220FC5; Tue, 23 Jun 2015 15:39:49 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Tue, 23 Jun 2015 15:38:30 -0600 Message-Id: <1435095556-15924-9-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.4.3.573.g4eafbef In-Reply-To: <1435095556-15924-1-git-send-email-sjg@chromium.org> References: <1435095556-15924-1-git-send-email-sjg@chromium.org> Cc: Tom Rini , Przemyslaw Marczak Subject: [U-Boot] [PATCH v3 08/54] dm: arm: Put driver model I2C drivers before legacy ones 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" Driver-model I2C drivers can be picked up by the linker script rule for legacy drivers. Change the order to avoid this. We could make the legacy code depend on !CONFIG_DM_I2C but that is not necessary and it is good to keep conditions to a minimum. Signed-off-by: Simon Glass --- Changes in v3: None Changes in v2: None arch/arm/cpu/u-boot-spl.lds | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds index 4b6e0f6..c5b4f7c 100644 --- a/arch/arm/cpu/u-boot-spl.lds +++ b/arch/arm/cpu/u-boot-spl.lds @@ -32,17 +32,17 @@ SECTIONS } . = ALIGN(4); - .u_boot_list : { - KEEP(*(SORT(.u_boot_list*_i2c_*))); - } - - . = .; #ifdef CONFIG_SPL_DM .u_boot_list : { KEEP(*(SORT(.u_boot_list_*_driver_*))); KEEP(*(SORT(.u_boot_list_*_uclass_*))); } #endif + . = .; + .u_boot_list : { + KEEP(*(SORT(.u_boot_list*_i2c_*))); + } + . = ALIGN(4); __image_copy_end = .;