From patchwork Mon Oct 12 02:51:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1380642 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.helo=coreboot.org (client-ip=78.46.105.101; helo=coreboot.org; envelope-from=flashrom-bounces@flashrom.org; 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.a=rsa-sha256 header.s=20161025 header.b=MJeUnkkT; dkim-atps=neutral Received: from coreboot.org (coreboot.org [78.46.105.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C8pd03hT0z9sSs for ; Mon, 12 Oct 2020 17:27:32 +1100 (AEDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id AC58410C0087; Mon, 12 Oct 2020 06:27:26 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id 852AC10C0039 for ; Mon, 12 Oct 2020 02:51:58 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) for ; Sun, 11 Oct 2020 19:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=3Zmwn42KeFf2dnvWrlywPKE1VL+fh5d6vqhvuVVzjbU=; b=MJeUnkkTcJTo6wyQPWFJeoZob70yjYqkn/GuoMHtSKngTPWqLuEsZLQww1IY3sNbjI ZZvZyHBYEpJ4Atp9mZ7GWELo2lmoTiaVNuu5EsZVdTx6IymtvhUmnM3kQ3P/b5tu0Ey6 Zc7a3qJ4fIQ/DhVY5d3USXTuuutqcb4NnH47HByjDX0g+YNHpsYKOXBuMsl6RgwndsAF VVt1z1fUgcdLmL6eIQUOlALbhamj5/cIxTmzhiFQTd7iEgj9DljEITw7IjxgU2M2M6lZ 4MQJPJ2Gpr0GO1Bz0lveLO8imfPns6s8x+Lz9QNECqSgBMnWcl8zmfa/Zv+IdQOVc9Ne H5lg== 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:mime-version :content-transfer-encoding; bh=3Zmwn42KeFf2dnvWrlywPKE1VL+fh5d6vqhvuVVzjbU=; b=bKivLjorkesi+8lW9GEs7k1TacPyAcHieN0njqbZy+ekm7z0KApI+0DOBURdAZbT1q R8gJMChtahY0M3TLNxL0ms5QCl+cByN3n1s251iXCTy+kYsv8PhIsJrGuA80+irMn9AY Dg8TV3NAci8kZ9G0X0cHmRWFLjm8bYe+0mwXyTHY8Wz8qZ13/C0TwNF9+u9hJ9z7lNYZ x9qnQzXfAa6NQP6cgZIyqn0S/BYYhbYoknW2f7D1crK3GSrS/oVGcGa59uXF+m2eeCJq gltrBEBxrG45Emf6EvgxtKNJWQnwKQk1bFYqMeiWgWFX3yi3Mf3F0IcdJXIHrLgE/kc8 gCIw== X-Gm-Message-State: AOAM533prmv6m/IL6jmyGyUVHCgpLJHy1HjMgQehrOb5gxuTWQVheJep eCvbKU3sFMQcYNGNS7vi2gn3iFtUQfpCcQ== X-Google-Smtp-Source: ABdhPJwPJPzCHK+SwvzI3Jf3GedxU1TlkeJ5AlVKXIHYUxbFLTfxYBDyxIn1Mlx/O6UYe8/xYhHk0g== X-Received: by 2002:a17:90a:5d17:: with SMTP id s23mr15962329pji.170.1602471116720; Sun, 11 Oct 2020 19:51:56 -0700 (PDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by smtp.gmail.com with ESMTPSA id t13sm18265543pfc.1.2020.10.11.19.51.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 19:51:56 -0700 (PDT) From: Rosen Penev To: flashrom@flashrom.org Date: Sun, 11 Oct 2020 19:51:54 -0700 Message-Id: <20201012025155.20508-1-rosenp@gmail.com> MIME-Version: 1.0 X-Spam-Level: *** X-MailFrom: rosenp@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address Message-ID-Hash: 34QVY56ONHQAKGGHSKKUTHMUGSFI67QZ X-Message-ID-Hash: 34QVY56ONHQAKGGHSKKUTHMUGSFI67QZ X-Mailman-Approved-At: Mon, 12 Oct 2020 06:27:03 +0000 X-Mailman-Version: 3.3.2b1 Precedence: list Subject: [flashrom] [PATCH 1/2] meson: add missing need_raw_access List-Id: flashrom discussion and development mailing list Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=flashrom-bounces@flashrom.org X-Spamd-Bar: -- Currently, when passing meson -Dconfig_rayer_spi=false , compilation fails as the proper headers and defines are not available. Added need_raw_access based on whichever files include hwaccess.h Signed-off-by: Rosen Penev --- meson.build | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meson.build b/meson.build index 5374e87..a756c8e 100644 --- a/meson.build +++ b/meson.build @@ -127,14 +127,17 @@ endif if config_atahpt srcs += 'atahpt.c' cargs += '-DCONFIG_ATAHPT=1' + need_raw_access = true endif if config_atapromise srcs += 'atapromise.c' cargs += '-DCONFIG_ATAPROMISE=1' + need_raw_access = true endif if config_atavia srcs += 'atavia.c' cargs += '-DCONFIG_ATAVIA=1' + need_raw_access = true endif if config_buspirate_spi srcs += 'buspirate_spi.c' @@ -160,6 +163,7 @@ endif if config_drkaiser srcs += 'drkaiser.c' cargs += '-DCONFIG_DRKAISER=1' + need_raw_access = true endif if config_dummy srcs += 'dummyflasher.c' @@ -174,6 +178,7 @@ endif if config_gfxnvidia srcs += 'gfxnvidia.c' cargs += '-DCONFIG_GFXNVIDIA=1' + need_raw_access = true endif if config_raiden srcs += 'raiden_debug_spi.c' @@ -196,6 +201,7 @@ if config_internal srcs += 'wbsio_spi.c' endif config_bitbang_spi = true + need_raw_access = true cargs += '-DCONFIG_INTERNAL=1' if get_option('config_internal_dmi') # Use internal DMI/SMBIOS decoder by default instead of relying on dmidecode. @@ -205,6 +211,7 @@ endif if config_it8212 srcs += 'it8212.c' cargs += '-DCONFIG_IT8212=1' + need_raw_access = true endif if config_linux_mtd srcs += 'linux_mtd.c' @@ -221,32 +228,39 @@ endif if config_nic3com srcs += 'nic3com.c' cargs += '-DCONFIG_NIC3COM=1' + need_raw_access = true endif if config_nicintel srcs += 'nicintel.c' cargs += '-DCONFIG_NICINTEL=1' + need_raw_access = true endif if config_nicintel_eeprom srcs += 'nicintel_eeprom.c' cargs += '-DCONFIG_NICINTEL_EEPROM=1' + need_raw_access = true endif if config_nicintel_spi srcs += 'nicintel_spi.c' config_bitbang_spi = true cargs += '-DCONFIG_NICINTEL_SPI=1' + need_raw_access = true endif if config_nicnatsemi srcs += 'nicnatsemi.c' cargs += '-DCONFIG_NICNATSEMI=1' + need_raw_access = true endif if config_nicrealtek srcs += 'nicrealtek.c' cargs += '-DCONFIG_NICREALTEK=1' + need_raw_access = true endif if config_ogp_spi config_bitbang_spi = true srcs += 'ogp_spi.c' cargs += '-DCONFIG_OGP_SPI=1' + need_raw_access = true endif if config_pickit2_spi srcs += 'pickit2_spi.c' @@ -267,6 +281,7 @@ endif if config_satamv srcs += 'satamv.c' cargs += '-DCONFIG_SATAMV=1' + need_raw_access = true endif if config_satasii srcs += 'satasii.c' @@ -276,6 +291,7 @@ if config_serprog srcs += 'serprog.c' cargs += '-DCONFIG_SERPROG=1' need_serial = true + need_raw_access = true endif if config_usbblaster_spi srcs += 'usbblaster_spi.c' From patchwork Mon Oct 12 02:51:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1380643 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.helo=coreboot.org (client-ip=78.46.105.101; helo=coreboot.org; envelope-from=flashrom-bounces@flashrom.org; 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.a=rsa-sha256 header.s=20161025 header.b=XWJ7/zdm; dkim-atps=neutral Received: from coreboot.org (coreboot.org [78.46.105.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C8pdG41GLz9sSs for ; Mon, 12 Oct 2020 17:27:46 +1100 (AEDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id 1316610C0083; Mon, 12 Oct 2020 06:27:40 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id 6325110C0039 for ; Mon, 12 Oct 2020 02:51:59 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) for ; Sun, 11 Oct 2020 19:51:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WutWlBPyOu3jjmTHE0ZoCeIuvZC9B0tT9kdmmipLmps=; b=XWJ7/zdm84Dx8Q6jg6AwW1GKIisB7yG3vQpVxDLK4hXoiO9+bllEdHwr05HETYjr7P QNPPucigNZvkb5BzMn2cMP2kb54I/HRUaR6gDfPuJZ0ZS7SVAEGjPCZvZ9TjWs1BE17V rkkeYaWWkUDzmXTHcgCFvnFQxo4AQHs4VIC8ZD6CUJWD+aTHd70vndpzt3G/gN0hzfQC xsTz2sf627nCZdiwNV0ZMHZJ0LlfWPzuZeSQ8Pw5lMl+cg4933RYuBodXVZciQQIKatD W4iaddYPK2Fd2SqW1KcH1d+GzIgpFy8P3IW86X+lmVqIpIlpaEqyYh7aTgbpl9/TzuJW V5UA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=WutWlBPyOu3jjmTHE0ZoCeIuvZC9B0tT9kdmmipLmps=; b=B03aLVXE9uZBgaFSi/YbHe/1mParstsRDIlqsLgu+MGLtYTY3r0mo7CYtXajOls9NZ JwPwqkY91j5Cs/N6U6+qHmi3vt9J9vkkViqNslHSd2103RSmUJDr986zjm35zGhpQbxb 6zSLdIuRh22jUe9oDMvG2DfLWDt+KG1+7S6NVSj+gp7IK7G7Ar6ee+3SBjGjtTP/DDha xYK+4B2cgeS+kv6djYCcfDXTbZQ47rulveMuvI2YUSjnEX5aaOmhlbiO8wyvUZJCW9bu qe8AlXpSNwK7EPxjuDNCMhiRwxcSLqe4fQ+lFQ+9W76Zj0kRJbcxn2On9Hlrz7SfSZJL CRrw== X-Gm-Message-State: AOAM530ur24qHN919qoUhobimwJiwu33cM/RSEV0fKwzcn4sK1i3Ps9e N3vCAftIc8MGGJthcDZNz7c6a/0pE1j5Eg== X-Google-Smtp-Source: ABdhPJysnj2fbUoj+elPlMHc+NoMz95zxzg1xTwwAcF7BUM9L6H38kkA6M3oz2ttopfMe6Tt3f7zUg== X-Received: by 2002:a17:90b:4a10:: with SMTP id kk16mr18131074pjb.77.1602471117695; Sun, 11 Oct 2020 19:51:57 -0700 (PDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by smtp.gmail.com with ESMTPSA id t13sm18265543pfc.1.2020.10.11.19.51.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 19:51:57 -0700 (PDT) From: Rosen Penev To: flashrom@flashrom.org Date: Sun, 11 Oct 2020 19:51:55 -0700 Message-Id: <20201012025155.20508-2-rosenp@gmail.com> In-Reply-To: <20201012025155.20508-1-rosenp@gmail.com> References: <20201012025155.20508-1-rosenp@gmail.com> MIME-Version: 1.0 X-Spam-Level: *** X-MailFrom: rosenp@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address Message-ID-Hash: XBTWBZBPNPE6IYOGNZEIMFWEU254ZAPJ X-Message-ID-Hash: XBTWBZBPNPE6IYOGNZEIMFWEU254ZAPJ X-Mailman-Approved-At: Mon, 12 Oct 2020 06:27:14 +0000 X-Mailman-Version: 3.3.2b1 Precedence: list Subject: [flashrom] [PATCH 2/2] meson: add missing config_bitbang_spi variable List-Id: flashrom discussion and development mailing list Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=flashrom-bounces@flashrom.org X-Spamd-Bar: ------ Fixes meson error: meson.build:304:3: ERROR: Unknown variable "config_bitbang_spi". Signed-off-by: Rosen Penev --- meson.build | 1 + meson_options.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/meson.build b/meson.build index a756c8e..24dd3ce 100644 --- a/meson.build +++ b/meson.build @@ -33,6 +33,7 @@ add_project_arguments('-DFLASHROM_VERSION="' + meson.project_version() + '"', la config_atahpt = get_option('config_atahpt') config_atapromise = get_option('config_atapromise') config_atavia = get_option('config_atavia') +config_bitbang_spi = get_option('config_bitbang_spi') config_buspirate_spi = get_option('config_buspirate_spi') config_ch341a_spi = get_option('config_ch341a_spi') config_dediprog = get_option('config_dediprog') diff --git a/meson_options.txt b/meson_options.txt index ac48e4e..4571b10 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,6 +4,7 @@ option('usb', type : 'boolean', value : true, description : 'use libusb1') option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers') option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller') option('config_atavia', type : 'boolean', value : true, description : 'VIA VT6421A LPC memory') +option('config_bitbang_spi', type : 'boolean', value : true, description : 'Bitbang') option('config_buspirate_spi', type : 'boolean', value : true, description : 'Bus Pirate SPI') option('config_ch341a_spi', type : 'boolean', value : true, description : 'Winchiphead CH341A') option('config_dediprog', type : 'boolean', value : true, description : 'Dediprog SF100')