From patchwork Tue Jun 12 15:50:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 928406 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 414vVn0bMMz9s0w for ; Wed, 13 Jun 2018 01:50:56 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A02F9C21E15; Tue, 12 Jun 2018 15:50:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 63C6AC21CB6; Tue, 12 Jun 2018 15:50:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1A44EC21CB6; Tue, 12 Jun 2018 15:50:49 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lists.denx.de (Postfix) with ESMTPS id B6F95C21BE5 for ; Tue, 12 Jun 2018 15:50:48 +0000 (UTC) Received: from workstation4.fritz.box ([95.223.128.184]) by mail.gmx.com (mrgmx102 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MQMBU-1fpl0L0VSe-00TliT; Tue, 12 Jun 2018 17:50:29 +0200 From: Heinrich Schuchardt To: Simon Glass , Bin Meng Date: Tue, 12 Jun 2018 17:50:13 +0200 Message-Id: <20180612155013.10993-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.17.1 X-Provags-ID: V03:K1:YgLo33rfkXYA96y/K0l9rEokISlxsaFGd9ElhJqGQ6pwA5vsTID 13z1a+wshoK1xt/BhYhkPw0q8nVTgW0yFObr2hA+bDXvXGF1SezBOrCHFOL7HQ3jls0atV5 wLNPyDApwUqSYm84y31+8bUcIlft3BLeK6OweoLS9976cZjr/jIO+VcMLFjfAjFYZeMP24R Z4+Mq++9CkVHiTh4DwnXA== X-UI-Out-Filterresults: notjunk:1; V01:K0:3WWzoJdmVUg=:AyjwF4ru5ujdDKr9kDO/AF NgNcTAWInare/MgcoGfB0JNudQwTRbCFi9HEVOZAPhLc3rBhorIcV1PcFLzS7tVw+YlrP4zsq M28MMucLYjiau5s3hoBUD+uh/nDrac/aP5zEEEGGXMr6GNOvQCiGFkGtNl2K0KQ5ZFbvqkELD 4mCQJu2t+5Ve24WKtNZ3sW64zAUQ1ThODij/lxoMwcpg3deekNfPB7MIvLj/TflOTyEmrTgzP CHtErljdF9ZXFrFGG2T7TgVPpG8CaNNf7zb8TXbpCZ5A+lQKlPdsHATaIyQvTggJdQ1PMaTz9 1k5i9IDOcMfJnUMeNK1sJ9hnEkWH5mZ5WqXBTIC3t5Flf012tKa9PX8aKu0kGUlSp9QVSrDVn 6LuGuaRnsR/SFf2LT3fqpgOquDrWpn6MIvv505H/i5wOeEmGdBVyCXNcq5ns5vDgoR66uhNf9 y5mu7OkIRnzCZP/R8C1b2tw2UupEAcyBQl+RM+PmO0jrKgTnF/p2wU97+anYAT6hmrK80VTzs y35bpki4frslZuPGGGS6GYp53o1VZNYWq0g0uopWbVP5DGvt4RhNGOc072m+I3sEzsgmWCJW+ VnhHgOLdK9SwVNvxndCpZWbp+Ccp+ZMMRJJByzwj3JAaa8Fwl3j3/IlU4oFEO1SWa+zvQgfO7 MlSjOSO1GQ1sQymv9d0YTXx4nnAv+Mt5Ju6Bmu0xA/hiI1zhePVzTg+7B9f6a2WCugy1Ou3Ll E71RwCuF3wUolhvj7UkZMl/U0jhiKW1szcXpMnd93RO52qIokE7UjAnjkeU= Cc: Heinrich Schuchardt , u-boot@lists.denx.de, Andy Shevchenko , Alexander Graf Subject: [U-Boot] [PATCH 1/1] x86: qemu: do not build car.o with start64.o X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" car.o can only be used with start.o, not with start64.o. So on qemu 64bit it should only be built for 32bit SPL but not for u-boot. Without this patch but with an unrelated pending patch ("x86: Add 64-bit setjmp/longjmp implementation") the following error occurred for qemu-x86_64_defconfig: arch/x86/cpu/built-in.o: In function `car_init': arch/x86/cpu/qemu/car.S:25: undefined reference to `car_init_ret' Signed-off-by: Heinrich Schuchardt --- arch/x86/cpu/qemu/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile index e5ea92545e3..b1daffd4a32 100644 --- a/arch/x86/cpu/qemu/Makefile +++ b/arch/x86/cpu/qemu/Makefile @@ -2,8 +2,11 @@ # # Copyright (C) 2015, Bin Meng +ifndef CONFIG_$(SPL_)X86_64 +obj-y += car.o +endif ifndef CONFIG_EFI_STUB -obj-y += car.o dram.o +obj-y += dram.o endif obj-y += qemu.o obj-$(CONFIG_QFW) += cpu.o e820.o