From patchwork Wed Aug 14 08:23:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1146833 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lY9lMqiC"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 467jJj6KvMz9sDQ for ; Wed, 14 Aug 2019 18:23:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 76B81C21D4A; Wed, 14 Aug 2019 08:23:14 +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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 47935C21C27; Wed, 14 Aug 2019 08:23:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 52F9FC21C27; Wed, 14 Aug 2019 08:23:12 +0000 (UTC) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by lists.denx.de (Postfix) with ESMTPS id ABFEEC21BE5 for ; Wed, 14 Aug 2019 08:23:11 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id w2so2324704pfi.3 for ; Wed, 14 Aug 2019 01:23:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=tiFExmiJmZPUKQY3ybdvZpHS7fwMsjdlCHB5jrGRxKM=; b=lY9lMqiCi8U7MmkKWa221SX+jh/daE9b4+t+CUD90cKSRQEuN4Istdp5+nIvCYrs1y dRJlaWpiM9vNqswsROrVsXNYjj/IElTHrk+xQOKrh7p14cByKSpQNB3gseq/HpK7Q8R8 /cG+XAJpIOa3CTnr9WiqPzbliQafmWlnOfcQywv3s7OS60WtuwyCCxOeYFPBJhCzOxxi Gjt3emRYNxCbZIK8/FwcW2QuS/N0jHccrLFNJXCukxGDjhhQDtIx8BBYn7QiglS+s3Cb 28mF+l8qU8iMuB03fWhMaTW91RYg02V5WQjYARIFJZ6tNHOtPzBBG+EHFg9XShMMz0fC wrtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=tiFExmiJmZPUKQY3ybdvZpHS7fwMsjdlCHB5jrGRxKM=; b=K3kPt8ie3YziXAhKjEC3X37qE4JbhX/NfY4j8wfINYqIPkeD3V0fEgjG4V1XLpIjC2 i3+K6lz6GIjILWi1RjN4TDCBAEeMlFVEtvTKO1UkvhefLYuVlxIszWyOqBh/Otb9iy05 6jnfYwJzjSVdgpzSZ3Gn7ErqfQhOiSpzjtOTEW0LFTTsyAkzOfsg2k0YcmTc4Rrkfged CQK8qpBQCt5hDvhoaDcOSsRGItjefSWFEeye8rVqCpMpLCnp0wFWApEiMLZgcq1Lsars tzPPbYZcWhgVTx+HFhomsW/UzUOot1MAYHOzVX/dsinhOfP+bchFOCVR0vyTtZLs5dki QzMg== X-Gm-Message-State: APjAAAVvvyKo5tMRXHsXvJi70IYYc0eWJZP2peYObew9eTSzZdEEAogA Dl/PXqpkM/OFXclUqewyQpI= X-Google-Smtp-Source: APXvYqwlzJQX++NWGq9MA+s3IFXOs+s9JMNH4ui6W/CXNW/xgQ3fq/trFW9QDbmH62xhV9efRSPuiA== X-Received: by 2002:a63:5f95:: with SMTP id t143mr37592295pgb.304.1565770989974; Wed, 14 Aug 2019 01:23:09 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id g11sm129193175pgu.11.2019.08.14.01.23.08 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 14 Aug 2019 01:23:09 -0700 (PDT) From: Bin Meng To: Simon Glass , Joshua Watt , Heinrich Schuchardt , U-Boot Mailing List Date: Wed, 14 Aug 2019 01:23:05 -0700 Message-Id: <1565770985-7754-1-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [U-Boot] [PATCH] x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n 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" Use DISTRO_BOOTENV to decouple BOOTENV from CONFIG_DISTRO_DEFAULTS. Reported-by: Heinrich Schuchardt Signed-off-by: Bin Meng --- include/configs/x86-common.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index ca27a4f..54214f9 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -105,11 +105,14 @@ #define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0" #endif -#ifndef CONFIG_DISTRO_DEFAULTS -#define BOOTENV +#if defined(CONFIG_DISTRO_DEFAULTS) +#define DISTRO_BOOTENV BOOTENV +#else +#define DISTRO_BOOTENV #endif #define CONFIG_EXTRA_ENV_SETTINGS \ + DISTRO_BOOTENV \ CONFIG_STD_DEVICES_SETTINGS \ "pciconfighost=1\0" \ "netdev=eth0\0" \ @@ -118,8 +121,8 @@ "scriptaddr=0x7000000\0" \ "kernel_addr_r=0x1000000\0" \ "ramdisk_addr_r=0x4000000\0" \ - "ramdiskfile=initramfs.gz\0" \ - BOOTENV + "ramdiskfile=initramfs.gz\0" + #define CONFIG_RAMBOOTCOMMAND \ "setenv bootargs root=/dev/ram rw " \