From patchwork Tue Oct 4 13:01:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 612226 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp168302pvb; Tue, 4 Oct 2022 06:21:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ElKNDY7hY+UNt5ViW6gMZJ13oSsbIpvbGpS1rW0e9vETPMBANf7FgdlIr4prpYtGzJeg+ X-Received: by 2002:a05:620a:1b89:b0:6ce:8b2b:7f0e with SMTP id dv9-20020a05620a1b8900b006ce8b2b7f0emr16734811qkb.15.1664889711047; Tue, 04 Oct 2022 06:21:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664889711; cv=none; d=google.com; s=arc-20160816; b=GnI0zhO0p0QBR2Vko7nkpt/EFGJcXzw590p7bnNYndp0aFZ+Y1Ku7bozp73hEcxTHs gIqrB3WRE1dqjePdUfAwAbtTAlI2mGPQW7vLFR4q/JH2faGGTuBv+COsOp53DTEl9sa2 WqtBtO2IwcgXPwxgU9fgci9Ov5ZIAeVv3Yde18fcGL/UDWlfIb/L7VIxIKZDT3njGoLt glz7Ai4CJJeAiwGJyTnMe86zrZlOGe58/Cj+ze3wDArZmjUyXhAftBz7fKGEdWkr6j81 Fs9+JYhzrX5k/GytFycMNfiLfuqVZDzdy9IFoMz9Mi8xPlk91yra9/rTAUJ1dBq7WYtL hUBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uq8LfhcioJyFhfpF+Nws+weqCLsrNs+3nFRic6rgmME=; b=1G2wIZvh467S2Wc92p0eYQ2OTFO470kOpRH3ZHruDTsDeAficwJjoBWIjycxxvOpwZ v4c/+v85tEVZZ8gWUc3oPb3Fue989D3njWHuwOYi1+jT+9a7Hb3gPtpOk22IDWjyX5xf neAB1LGsSyVDUxvT9V4MLtX0XVg6nVTXOLnK8lDU8tbRiz3F1EZpj8tkEsBj2U9E48kO Q3Im3IsLFJhHNM+miYcVUP56EjC2e7wsjbOLJ9RkeLs0cFh6xyy6w6iju+rYm8abUJle 4i5EClAs4OWO9Y5Q9svP5qro0UGIPwX4SCr4bcpOgvEhfdUMcw6mU17fmSUWSRyM1QMU zy7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DUKHHWqH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c2-20020a05620a268200b006cc20c380b6si5502829qkp.426.2022.10.04.06.21.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Oct 2022 06:21:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DUKHHWqH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ofhrq-0000lG-FP for patch@linaro.org; Tue, 04 Oct 2022 09:21:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ofhYb-0008K8-Sj for qemu-devel@nongnu.org; Tue, 04 Oct 2022 09:01:57 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ofhYZ-0007Pr-Ag for qemu-devel@nongnu.org; Tue, 04 Oct 2022 09:01:57 -0400 Received: by mail-wr1-x42d.google.com with SMTP id a10so8867898wrm.12 for ; Tue, 04 Oct 2022 06:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=uq8LfhcioJyFhfpF+Nws+weqCLsrNs+3nFRic6rgmME=; b=DUKHHWqH8xjWzP+lAIsOaqus+R4AVkN147cn+h/5y93wJQo29R2tvXIC5LSCtiDnWA zIaCNoLMyFn9uIpL9ZFN2AJ8nSwSdxveERJL7bDqDtCy+NGwFwMQXgX3i4/kOtNy2olC D5bYuZuHZeD9+ouAUn2/M0ri7n2pXMv2i/2M0jCA8maGCzK7TXhCjATcbgAGd1xFxVjk juBDjIT8EHew5s3vNQpExWSqeCDuYMce9UAV+l9tJEDlu53wU8LVz2vAA0kAk5cLuGD4 oNrRImCrOToALw0c9YjVQj/NWtl/ELVJymSqiMsB0C1GVDFFUqyq88mYQSXL0PY2fy65 6YHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=uq8LfhcioJyFhfpF+Nws+weqCLsrNs+3nFRic6rgmME=; b=Zb6fQkbCZ3uTrCe9IVyp68jGnesDr1sg2A/B8NYIUQ7KiasIiY8AGzoCWD3sMGLBQm wi5F06al3R+FpskTKba5DDBazjjxQkxDN2lQ6lr3iFbK3ypN8F4RqXEu0+rdAmRM/HS+ YsYrghY5/1Ap53Ltz6VWGt6BB+F2xsQjPHTI8ZVhnrpmNUlQYJ1H3SDWbq2fdHDNJMwe 44wjYjUA+/FNzDb+erRHWChJ2FJd+UXHelHOBt0Z69lzw4BJ+XlEXJGbgtrATRyFqKft zEkTVNSEFgKT0eP6vtSejVfCZnJoSuMlARNew5FA0p05kgBguk7LO+Uuh3dAuurOXw25 SvNA== X-Gm-Message-State: ACrzQf3ylBmekWjNHaCNlv1rw0Y3PYbkbYEI1pOeqs5VP6eHItrCgGn5 02WpWScFkdKdqYqho00w0dJCqw== X-Received: by 2002:a5d:5944:0:b0:22e:3c67:75de with SMTP id e4-20020a5d5944000000b0022e3c6775demr6576749wri.5.1664888513322; Tue, 04 Oct 2022 06:01:53 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o20-20020a05600c339400b003a5c999cd1asm17690494wmp.14.2022.10.04.06.01.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 06:01:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9F26F1FFD1; Tue, 4 Oct 2022 14:01:41 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Paolo Bonzini , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= Subject: [PULL 29/54] pc-bios/optionrom: Adopt meson style Make output Date: Tue, 4 Oct 2022 14:01:13 +0100 Message-Id: <20221004130138.2299307-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221004130138.2299307-1-alex.bennee@linaro.org> References: <20221004130138.2299307-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée Message-Id: <20220929114231.583801-30-alex.bennee@linaro.org> diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index f514e4f84b..b1fff0ba6c 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -12,8 +12,8 @@ NULL := SPACE := $(NULL) # TARGET_PREFIX := $(patsubst %/,%:$(SPACE),$(TARGET_DIR)) -quiet-@ = $(if $(V),,@) -quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) +quiet-@ = $(if $(V),,@$(if $1,printf "%s\n" "$(TARGET_PREFIX)$1" && )) +quiet-command = $(call quiet-@,$2 $@)$1 # Flags for dependency generation override CPPFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d @@ -41,19 +41,19 @@ override LDFLAGS = -nostdlib -Wl,-T,$(SRC_DIR)/flat.lds pvh.img: pvh.o pvh_main.o %.o: %.S - $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"AS","$@") + $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,Assembling) %.o: %.c - $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@") + $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,Compiling) %.img: %.o - $(call quiet-command,$(CC) $(CFLAGS) $(LDFLAGS) -s -o $@ $^,"BUILD","$@") + $(call quiet-command,$(CC) $(CFLAGS) $(LDFLAGS) -s -o $@ $^,Linking) %.raw: %.img - $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$@") + $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,Extracting raw object) %.bin: %.raw - $(call quiet-command,$(PYTHON) $(TOPSRC_DIR)/scripts/signrom.py $< $@,"SIGN","$@") + $(call quiet-command,$(PYTHON) $(TOPSRC_DIR)/scripts/signrom.py $< $@,Computing checksum into) include $(wildcard *.d)