From patchwork Sat May 23 17:59:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 475923 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 65E751402BA for ; Sun, 24 May 2015 03:59:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 96FF84B6A1; Sat, 23 May 2015 19:59:22 +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 6HpWna_zhzn6; Sat, 23 May 2015 19:59:22 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E535D4B667; Sat, 23 May 2015 19:59:21 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8B1FA4B667 for ; Sat, 23 May 2015 19:59:16 +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 Ot6uoFmJECgB for ; Sat, 23 May 2015 19:59:16 +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-ig0-f201.google.com (mail-ig0-f201.google.com [209.85.213.201]) by theia.denx.de (Postfix) with ESMTPS id 27EAE4B61F for ; Sat, 23 May 2015 19:59:12 +0200 (CEST) Received: by igdh15 with SMTP id h15so1027442igd.1 for ; Sat, 23 May 2015 10:59:11 -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=OWQaqjV+uXNbTu6TmMWZifBZcO+Ra4p5Trg1aYVJePY=; b=Plo7M0TX1fXEMyZ2GbNKCY8kVze+5QrqajlLNCjQ5PRL3OAvuB9to+++z8qux55uJI IKUj/KA32uPL2rHYxPkTB23x/BwqyiabO28i/y7diVOiC+NkxfO60QmjG0YBtEOr7fDK xZqOKRUciuN78HV6Al4CImowcXogp/nnvA5bG9f6R72ty0atNh5ly0CM/bW3B67Ap3KE NnhIJgCwfHatHuqs/a1Lp8LEAc7Lu+oDh5TkRbCTk4JWOUfaYkpZoqOZQz3oD3BlwHCl XSkhpqCKiL5rN9qEZRKS7Ak//mE2Z9MHiMEFBnvzrbB3z0UVk4MrL/yXLHFBa431IbTN hyhw== X-Gm-Message-State: ALoCoQk+KSEktQAZmtoXPRiysyrRXSRZ2tJlGD089WwU3gc4DgTtnI472SwM5ueZKz/YKMmGkstV X-Received: by 10.182.79.99 with SMTP id i3mr17826119obx.12.1432403951154; Sat, 23 May 2015 10:59:11 -0700 (PDT) Received: from corpmail-nozzle1-2.hot.corp.google.com ([100.108.1.103]) by gmr-mx.google.com with ESMTPS id v23si305533yhv.4.2015.05.23.10.59.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 May 2015 10:59:11 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-2.hot.corp.google.com with ESMTP id aamHdOoW.1; Sat, 23 May 2015 10:59:11 -0700 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 62839220A8F; Sat, 23 May 2015 11:59:10 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 23 May 2015 11:59:09 -0600 Message-Id: <1432403949-11604-1-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c Cc: Joe Hershberger , Przemyslaw Marczak , Tom Rini Subject: [U-Boot] [PATCH] sandbox: Compile test device tree when CONFIG_UT_DM is defined 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" A conflict between the PMIC and unit test work means that the sandbox test device tree file is no-longer built. Fix this. Signed-off-by: Simon Glass Acked-by: Joe Hershberger --- arch/sandbox/dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sandbox/dts/Makefile b/arch/sandbox/dts/Makefile index 562a078..517b555 100644 --- a/arch/sandbox/dts/Makefile +++ b/arch/sandbox/dts/Makefile @@ -1,5 +1,5 @@ dtb-$(CONFIG_SANDBOX) += sandbox.dtb -dtb-$(CONFIG_DM_TEST) += test.dtb +dtb-$(CONFIG_UT_DM) += test.dtb targets += $(dtb-y)