From patchwork Wed Aug 20 14:05:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 75 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698745; bh=1idFzD8CifQZMS59/UL6odUO/mPcNX/0p8D/O3veVrE=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Sy+khEcbyPQf2FZu3jH2OGmRccVfaAAgBDtfV7ZYTuKluvRL+gwLPLlJ0E+K9gne0 ZSnoQZKx8bm0nRAwU9GVRazoXVLRd7xQlgeWamYBKvJiWIda8JvgiA9Kz619EdeJIc 9SmgIUPBLXYhjEZJlXU/m6rt4kf6PEfoDwkGeUwWl9jH+leh3nM/HskCmlwA47U5J5 YY6xUJB0Hx2C1689eDacor75BBLWx8cK8Yh4Sijkdm23QRz/HIklCh9swVXBJnUzRU A8Wb6kxZ8D39QVAEuT9c91fItk1honW6uut5iN4C25UYCtgh2sLMlOGSeMhUnAN9Ic pLm0TGR6pGCoQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 4FBB66767F for ; Wed, 20 Aug 2025 08:05:45 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id cZIn1EH65lWc for ; Wed, 20 Aug 2025 08:05:45 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698745; bh=1idFzD8CifQZMS59/UL6odUO/mPcNX/0p8D/O3veVrE=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Sy+khEcbyPQf2FZu3jH2OGmRccVfaAAgBDtfV7ZYTuKluvRL+gwLPLlJ0E+K9gne0 ZSnoQZKx8bm0nRAwU9GVRazoXVLRd7xQlgeWamYBKvJiWIda8JvgiA9Kz619EdeJIc 9SmgIUPBLXYhjEZJlXU/m6rt4kf6PEfoDwkGeUwWl9jH+leh3nM/HskCmlwA47U5J5 YY6xUJB0Hx2C1689eDacor75BBLWx8cK8Yh4Sijkdm23QRz/HIklCh9swVXBJnUzRU A8Wb6kxZ8D39QVAEuT9c91fItk1honW6uut5iN4C25UYCtgh2sLMlOGSeMhUnAN9Ic pLm0TGR6pGCoQ== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 3F9F5674FA for ; Wed, 20 Aug 2025 08:05:45 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698743; bh=bZ8XEoT/bUeVv2/TXgcHTfMuPCvOM7Yj+eQfO9CoUOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N+mf2Ve4yqpbAjIbw3vFw+IRofOd31mV/VYdSa0Da7xqR4rGXjwQ+7nB2rSn+vp5Y 28dsz7gifq3y9ULCF+7JTzYlIoNU8rGaAAwGXwnuPrkdsOGN4MQvmg1lizDyFlnMrj DL6biOCDj0WZ5U/LO8eoCZHWL+DLWeQtMTlKbgf4dSyIRvrd0dHLiBa/j9abpQnzXg OAoUKmINwwKjUnXtmFuD0AaERzYzw8T8iDON4JjqRwjwgPjeYbspED/H3UxESYs9pP 6RoJtbGLCgj2bWbWk+qXdonEnQY6IgmenflYPowQE+juVgKlDrmGei1aq/Z+q0vl7z E60RUllBWTt6g== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 5BCC3674C4; Wed, 20 Aug 2025 08:05:43 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id d8VeHgJVFfIX; Wed, 20 Aug 2025 08:05:43 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698742; bh=nBz9rZNPHK1SbmGPu+qxbyWgtIEePnsQiu46RATSNmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Iw8CgFLYKmQ8c9q8B9CqwSJXqHYKC/NfQHUbxW+23dKK8YhKuE4Hx9mE0dQnW4Fqm 8tMrLmqObNooqOwvpaHeiZ6paA1NbatPVY0pn/1Hwiu0s39upqTKEesWVE2FQ5MJHT 9C5oN6ZLdfjSMyTtH2Dv30G9jJYHc9mlnhjwbsaT11Y+op0ICT6hhA5AsempzIfqnL oCz4IUNl/ClonhNxx0kSwJ7XyTCN317JSYtbR22TZftaKvEs1A0zOiTIOyirvz4aNo LA9Nqy33H+OUk9EpEYx3W7uXL3jx3SRgjB88cmNaqHiuAemGv5oaL1hX7GxJuD8NWF 44gACEvFyYgvQ== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 9F41767419; Wed, 20 Aug 2025 08:05:42 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Wed, 20 Aug 2025 08:05:09 -0600 Message-ID: <20250820140516.344113-2-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250820140516.344113-1-sjg@u-boot.org> References: <20250820140516.344113-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: RHOWT7MCUZPDTTTRYOIPCOUFCB7QZ4LO X-Message-ID-Hash: RHOWT7MCUZPDTTTRYOIPCOUFCB7QZ4LO X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 1/4] tools: Add the logo with text under it List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass This is obtained from[1] and is the official logo of the project when text is needed. Add it into the source tree. [1] https://commons.wikimedia.org/wiki/File:U-Boot_Logo.svg Signed-off-by: Simon Glass --- tools/logos/u_boot_logo_text.svg | Bin 0 -> 10733 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tools/logos/u_boot_logo_text.svg diff --git a/tools/logos/u_boot_logo_text.svg b/tools/logos/u_boot_logo_text.svg new file mode 100644 index 0000000000000000000000000000000000000000..1527e79a3a9b1ae118ed41e417f368d5b454a9e9 GIT binary patch literal 10733 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 Cl(60a literal 0 HcmV?d00001 -- 2.43.0 _______________________________________________ Concept mailing list -- concept@u-boot.org To unsubscribe send an email to concept-leave@u-boot.org From patchwork Wed Aug 20 14:05:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 76 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698747; bh=+4tewC8O2CyLnNMT/zIRf7dJIfZDfyCspu80Ok9ESng=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=r9lZapDrcP3XAaxEUlAyK7D86zBc3IbpXOb9p4udq6AeNFnQ71GSyh63b++1S52Cp a52qLhhlvXkdZvuEdRMvNMtL7x9rbNtCHX2bZrGw2mKgMpJd+fLtjV6tNGExlvH7jN cniXUEiYp1Z1PAAO5X/wJxUbRywFqAkSXALPylvqsc+qNT/ZpBdk3yuwOQPjwP6Kaj gwVQCrSCMmsnA6CERZSb11G9jQDo4THD3STP9hE0LO6/0l++qOgniMYLBeIRI6VD5g Lbwu5ksRYScH21HzgPlV5sUWkZYTDvS5f4Yt+ZvHWLa76vuKPu4nHPvwStGbU9qmLa 3jPmk0EBp6baA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id CA37E6767F for ; Wed, 20 Aug 2025 08:05:47 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id eQb0xxa7HScq for ; Wed, 20 Aug 2025 08:05:47 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698747; bh=+4tewC8O2CyLnNMT/zIRf7dJIfZDfyCspu80Ok9ESng=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=r9lZapDrcP3XAaxEUlAyK7D86zBc3IbpXOb9p4udq6AeNFnQ71GSyh63b++1S52Cp a52qLhhlvXkdZvuEdRMvNMtL7x9rbNtCHX2bZrGw2mKgMpJd+fLtjV6tNGExlvH7jN cniXUEiYp1Z1PAAO5X/wJxUbRywFqAkSXALPylvqsc+qNT/ZpBdk3yuwOQPjwP6Kaj gwVQCrSCMmsnA6CERZSb11G9jQDo4THD3STP9hE0LO6/0l++qOgniMYLBeIRI6VD5g Lbwu5ksRYScH21HzgPlV5sUWkZYTDvS5f4Yt+ZvHWLa76vuKPu4nHPvwStGbU9qmLa 3jPmk0EBp6baA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id B038D674FA for ; Wed, 20 Aug 2025 08:05:47 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698745; bh=A9Wt5zrfSEci96szF1ghdlpVrZtGdyUXIHe7FTIfDyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MMsJvOHFuGICk5DjNFTZyfjFc9AIaFhrWQLM4hw9Yzbd88Ot/nU7DgGB68qz4RgIa uVXjTwPQliNg6prpNG5ePxppfV8/d2yH1SzCJLj2uZp7RBMQ3U/tGLorffjxAeIutD 3TS+F20mluUyycapXcCWGH8oY6oVOkyQCcWTtVvtAwJ1hXhUVpuCu5jFWZte2/YOrh 1EisL23NsEISDfKEJRVyR+C018x+AKZL54hPQtdNrA9n2QJEv6TUgqZqjVaSQJX2h4 BwJ0svrBiiXnd2ZgisGO2r4D8P/KKnNwEkN0b8uF4nw0zCJEix8yT7StDKPeYYP2pp 4SD1qicBWi4Hg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 10DA1674C4; Wed, 20 Aug 2025 08:05:45 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id EU2qiEnPvemS; Wed, 20 Aug 2025 08:05:44 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698743; bh=5RlOBUNVaaxQ/AHBnmQqjcLpyBAxhYMBvUXwwzF3sGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XqOTVMVlvmRmnMgfkcGreSXmNGN0lt6eJCf8qzH1XpwvcqeFqnuEg8BQw66ddv4kz wwoqAi7JoKIWC1LvMV1joVvXAOQbwlRX8R6AmFH1T3dJbrlw/cNICnP9jsZDCxsgLE O1qdLr5BnEvtPeyp3IOoq9k7RlEeTbZxz92pGlbaX4MxvzZXdU/1lyPx0Db/70+PwS i6s6pv1d4U0zFHEQgzEtIw/Ea3P/7qVeNBZlWYAuOIWUgxV9DfQMWqg4r5qVlufsb3 u9B0jqvfDYSBRkypB1sLjXtiKF/aGPmHuKEhOJi46hlRRD9+OwFpFDyCnmC771hJ5k 5+HvOhHmDA82w== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id A102167419; Wed, 20 Aug 2025 08:05:43 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Wed, 20 Aug 2025 08:05:10 -0600 Message-ID: <20250820140516.344113-3-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250820140516.344113-1-sjg@u-boot.org> References: <20250820140516.344113-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: WG6JAFVKHFZOO4WMFCSC27GN3424XPHC X-Message-ID-Hash: WG6JAFVKHFZOO4WMFCSC27GN3424XPHC X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 2/4] acpi: Use the logo with text underneath List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Rather than using the round logo used on stickers and coins, use the one with text underneath, to be consistent. Signed-off-by: Simon Glass --- lib/acpi/bgrt_image.bmp | Bin 43926 -> 56574 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lib/acpi/bgrt_image.bmp b/lib/acpi/bgrt_image.bmp index b4c95a641014552f19b7479c1ddfb5b83c0ac489..792b2bbee70542de966574d021dc475a80425616 100644 GIT binary patch literal 56574 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 literal 43926 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 U&jW8eIqiNC6=>WP()8o^e~AeE00000 -- 2.43.0 _______________________________________________ Concept mailing list -- concept@u-boot.org To unsubscribe send an email to concept-leave@u-boot.org From patchwork Wed Aug 20 14:05:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 77 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698750; bh=5hwtrKnqTaYSw49EufhnqwZg/uqg1Iij+riaKXftzqE=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=UDxVxf+uX8iBsR1U8bOHpnPanmgwBFSk2SWxzE5mS+zlUl2gg/xV3/K6EfgrGmrw8 0hhODPXD0JI2mUTld0gOpM9qwan/1AcqeLLZLjSHWkHPINyyxpPg5SwWxg/PS2TaN3 AFjBFZvs8rSvgxTrjxY2n4gOvmHmi3+DpJKFkTtA9Ph8F7hHLyPuWAUK3LPE0psclB /x7oY2GSbdaeUAnCONpoJtxNtuboO0tIvHYzmW4H+uw/AYQB9Uya1zNmRuDHaTe/cM BVh6whmu/BefrmQlbMIZjxYGY0jUvbOF4QjI41aK7MqpV7d5G0wawB7exk/0yvwM1f QULIOoiuZrM3w== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 3669367419 for ; Wed, 20 Aug 2025 08:05:50 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id km_akPRXRu3C for ; Wed, 20 Aug 2025 08:05:50 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698750; bh=5hwtrKnqTaYSw49EufhnqwZg/uqg1Iij+riaKXftzqE=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=UDxVxf+uX8iBsR1U8bOHpnPanmgwBFSk2SWxzE5mS+zlUl2gg/xV3/K6EfgrGmrw8 0hhODPXD0JI2mUTld0gOpM9qwan/1AcqeLLZLjSHWkHPINyyxpPg5SwWxg/PS2TaN3 AFjBFZvs8rSvgxTrjxY2n4gOvmHmi3+DpJKFkTtA9Ph8F7hHLyPuWAUK3LPE0psclB /x7oY2GSbdaeUAnCONpoJtxNtuboO0tIvHYzmW4H+uw/AYQB9Uya1zNmRuDHaTe/cM BVh6whmu/BefrmQlbMIZjxYGY0jUvbOF4QjI41aK7MqpV7d5G0wawB7exk/0yvwM1f QULIOoiuZrM3w== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 23D19674C4 for ; Wed, 20 Aug 2025 08:05:50 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698747; bh=FOtJwANLHHMiTTkCj01bDr6dMfQ5LKMy/10+iLeYTuo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vrSxa9TsQKA9EBUXqA/Z16jBKOL9NW1dFlRfMq9fuDg55oLF1WoJwcV0SBzXw0HVB J9nSEht6NV5PW/F9HQ7DxU7A1I6kfG6pEDrp5SgVallJp7yeQL+aDt5MVFwRj5ZBdA 2OIf+sPIItfnzI2Nl/0FT4i1ary6+Zw12Xx+RNV1hguGVSlOvvZQd1huq5ClGq9rLc bh6YR8bkYsqFS7umuEj1MbuomvuaKhbxovsdAowMh4FItEUGDp/xRdZJWXIMAo205H tnqBDq64eumiUe6jYe8s6gwvKEkzPH9k9Tore+MwCWnLRvIPLkyPruef98VkcxnN+I WGQoQTaQhJUzQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 9E25A67419; Wed, 20 Aug 2025 08:05:47 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id OP2GuNsYWNdJ; Wed, 20 Aug 2025 08:05:47 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698745; bh=Qk96kpuGak+evPtPWdEBnUX53Z2hgcGkBKAdIvNISOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mAQzLbpv3Dy44oqBkKEZN4U+s597YbKZEi+g9rxlxqnYObaTvWahQ8c3CyGtDNYe/ 1IV9//8R7fB6blYRrMGCzBk9hADnwqWzLH3vmJTuNGhcf6cT9hj+Ee6CCOTDq9of4P jdvR6Fk3T0Jdb1c7DzngYEhrBT7V2xRFLLjB09PlGnxPdKg9+gYF9fVHfvPZcXNFfc Ttw7x6WIn4UIF5QdHiKiz74KXwAtlJHjwKC5wKNzZgHpGlhIb3X4yy3DWshiHoKQ0D n9ZDlhjhL94erqrzNs07098lhhUoV5/k7FYObYKH6jfbk9L7T0utQMiZ6JWZPch/ZJ Bspa+fNEMxs+g== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 55B72674FA; Wed, 20 Aug 2025 08:05:45 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Wed, 20 Aug 2025 08:05:11 -0600 Message-ID: <20250820140516.344113-4-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250820140516.344113-1-sjg@u-boot.org> References: <20250820140516.344113-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: EY7G6QBY4PUDDRFQ2FE25S624HDAADI7 X-Message-ID-Hash: EY7G6QBY4PUDDRFQ2FE25S624HDAADI7 X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 3/4] acpi: Check ACPI revision before accessing XSDT List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass This field is only present in revisions after zero, so add the missing check. This avoids a buffer overrun with a revision 1.0 ACPI table. Signed-off-by: Simon Glass Reported-by: Heinrich Schuchardt --- lib/acpi/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/acpi/acpi.c b/lib/acpi/acpi.c index b13cba1a608..698d17a02e8 100644 --- a/lib/acpi/acpi.c +++ b/lib/acpi/acpi.c @@ -81,7 +81,7 @@ static int setup_search(struct acpi_rsdt **rsdtp, struct acpi_xsdt **xsdtp) return -ENOENT; if (!acpi_valid_rsdp(rsdp)) return -EINVAL; - if (rsdp->xsdt_address) { + if (rsdp->revision > 1 && rsdp->xsdt_address) { xsdt = nomap_sysmem(rsdp->xsdt_address, 0); len = xsdt->header.length - sizeof(xsdt->header); count = len / sizeof(u64); From patchwork Wed Aug 20 14:05:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 78 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698750; bh=SCWM7DLhQHtf2SDo7Dwtog5g9NCNWlcf5Ivllq1yAKg=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Gp8qjpr+EWm0GcCKLx91Rpl2/MSCETB4lMS3F2cJuHLU821wbr7UBuSfcNKr+zkcr li3Rj73jl1gkJ6LjT7OkUA80JYZ49FPDos2gmjPfg0Ft7G8ZrsTLdI9OYGfhRQcMv4 SJyIqkfj8YclksSPrCOl+l0tMObTJgWQQhelt5R1s6HZZUjzWLmBjsMQHiGWISJhqK Hqz5gmtZZ/LGBG932vcVkrlquh2PyRwcPA4KJvSCAV/EBDy0XPb8ezUeON7cxtlCk3 jNdZxdDjP0q8Twnkk/TWTQA4d0aaEXOLR+InKrkRbrTFxUfK0UYmmIKvKmgWuy2G3G /hEPxzXCrvjkQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 9B4BD6768D for ; Wed, 20 Aug 2025 08:05:50 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id jXaWQQkOuTfl for ; Wed, 20 Aug 2025 08:05:50 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698750; bh=SCWM7DLhQHtf2SDo7Dwtog5g9NCNWlcf5Ivllq1yAKg=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Gp8qjpr+EWm0GcCKLx91Rpl2/MSCETB4lMS3F2cJuHLU821wbr7UBuSfcNKr+zkcr li3Rj73jl1gkJ6LjT7OkUA80JYZ49FPDos2gmjPfg0Ft7G8ZrsTLdI9OYGfhRQcMv4 SJyIqkfj8YclksSPrCOl+l0tMObTJgWQQhelt5R1s6HZZUjzWLmBjsMQHiGWISJhqK Hqz5gmtZZ/LGBG932vcVkrlquh2PyRwcPA4KJvSCAV/EBDy0XPb8ezUeON7cxtlCk3 jNdZxdDjP0q8Twnkk/TWTQA4d0aaEXOLR+InKrkRbrTFxUfK0UYmmIKvKmgWuy2G3G /hEPxzXCrvjkQ== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 8AC4767688 for ; Wed, 20 Aug 2025 08:05:50 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698747; bh=6fOTw8P36UuhJYoyOXUomFK6Ajs8kKOcqglzz40cwl0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oSifY6i3trh+pNUYhC8Gk4nMy0z1Ts7C6h9QMQkEhvEz2qon5c2LPTDa8qrNoyC3h +FDYEYkzqDu5AoYBx0SHr+Zngei9Wl/mI+Fky4fhhY7VC2atT6gBh98bCDKk9UB4Qw PiGuROP+6+voFst4mYc9DEsLsVPX9oi7tuwwNTzbKA2WZ/rxisyK8Q98UEqL+R9zJ9 UTOVV/NET6e+a95rHbqMUqUay34fz2w/nZjLUDLpxztuXjdIq4gdHR576K3DccJbDO dMjD7ZHUoGJTCeD+JeyRzy3Pj1+U29mII6VnE6BBR4X8m+X8fTur/q1FoBOtrGjAA2 SkHenLKSf/ZNg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id D8D87674FA; Wed, 20 Aug 2025 08:05:47 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id WURi9nqh2r-j; Wed, 20 Aug 2025 08:05:47 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755698746; bh=5DAK3yrlGPxLDwDWU7pCijcqHjttkKROtUDvhEjh5ok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J4p0kRyKSmTig6EbIpr5Z/EYPK7L2f6imzVXxusg/SrQ015yDCXa8AymU4o+5myzB Jtk0OxPWD9/fEpFD2OOGjArjSB+gTUlmrbfDTuXnRBWzqYQEtSCGXYQmxmol76jR8c VaSw8jdKdApqYZfKDFV4mnCmJWwry5LV9QyRYZJ5epx0CZL6vW+Yz/hXyjsgGrCXEn eq3dwRLqGdjYSAA2SKqcMQu3MNd8dJlRp5+FcQX9eJ/MmlJt6VbhLZ59UJcvJqp3Br AU3QMWVc7R9IpFTX/UQ3AzRrXpBf0yWJhaQyIVfUf7CL5QLGoSKLaOIQks6cO6lHKB oqYvRMuMk3N+A== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 219C66765F; Wed, 20 Aug 2025 08:05:46 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Wed, 20 Aug 2025 08:05:12 -0600 Message-ID: <20250820140516.344113-5-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250820140516.344113-1-sjg@u-boot.org> References: <20250820140516.344113-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: OYEBG25TNNXPNJ3R2LKWPS2XSDHTAALB X-Message-ID-Hash: OYEBG25TNNXPNJ3R2LKWPS2XSDHTAALB X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 4/4] acpi: Use the U-Boot ACPI ID and version List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass The ACPI spec is a little confusing as to what should go in the 'creator_id' field: Vendor ID of utility that created the table. For tables containing Definition Blocks, this is the ID for the ASL Compiler. Even though some of the tables are compiled by the Intel ASL compiler (generally DSDT), U-Boot generates many of the tables itself. So it should be listed as the creator. Rename the constant and use "UBOO", as per the UEFI forum. For the version, use (year << 16) | (patchlevel << 8) which seems to be a common approach. This mostly fixes https://concept.u-boot.org/u-boot/u-boot/-/issues/16 but the question of the logo remains. Signed-off-by: Simon Glass Link: https://uefi.org/ACPI_ID_List?acpi_search=u-boot --- arch/x86/lib/acpi_nhlt.c | 2 +- arch/x86/lib/acpi_table.c | 2 +- include/acpi/acpi_table.h | 5 +--- lib/acpi/acpi.c | 6 ++-- lib/acpi/acpi_table.c | 2 +- test/dm/acpi.c | 58 ++++++++++++++++++++++++--------------- 6 files changed, 44 insertions(+), 31 deletions(-) diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c index 8aae5fa5af7..00b313b0703 100644 --- a/arch/x86/lib/acpi_nhlt.c +++ b/arch/x86/lib/acpi_nhlt.c @@ -408,7 +408,7 @@ int nhlt_serialise_oem_overrides(struct acpi_ctx *ctx, struct nhlt *nhlt, memcpy(header->oem_table_id, oem_table_id, oem_table_id_len); } header->oem_revision = oem_revision; - memcpy(header->creator_id, ASLC_ID, 4); + memcpy(header->creator_id, ACPI_CREATOR, 4); cur.buf = (void *)(header + 1); cur.start = (void *)header; diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index b13292c4150..8663f97457e 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -224,7 +224,7 @@ static int acpi_write_tpm2(struct acpi_ctx *ctx, /* Fill out header fields. */ acpi_fill_header(header, "TPM2"); - memcpy(header->creator_id, ASLC_ID, 4); + memcpy(header->creator_id, ACPI_CREATOR, 4); header->length = sizeof(struct acpi_tpm2); header->revision = acpi_get_table_revision(ACPITAB_TPM2); diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h index 850cb8db816..f2bd758599f 100644 --- a/include/acpi/acpi_table.h +++ b/include/acpi/acpi_table.h @@ -18,10 +18,7 @@ #define RSDP_SIG "RSD PTR " /* RSDP pointer signature */ #define OEM_ID "U-BOOT" /* U-Boot */ #define OEM_TABLE_ID "U-BOOTBL" /* U-Boot Table */ -#define ASLC_ID "INTL" /* Intel ASL Compiler */ - -/* TODO(sjg@chromium.org): Figure out how to get compiler revision */ -#define ASL_REVISION 0 +#define ACPI_CREATOR "UBOO" /* U-Boot */ #define ACPI_RSDP_REV_ACPI_1_0 0 #define ACPI_RSDP_REV_ACPI_2_0 2 diff --git a/lib/acpi/acpi.c b/lib/acpi/acpi.c index 698d17a02e8..3e0360ab9fe 100644 --- a/lib/acpi/acpi.c +++ b/lib/acpi/acpi.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -174,8 +175,9 @@ void acpi_fill_header(struct acpi_table_header *header, char *signature) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, OEM_TABLE_ID, 8); header->oem_revision = OEM_REVISION; - memcpy(header->creator_id, ASLC_ID, 4); - header->creator_revision = ASL_REVISION; + memcpy(header->creator_id, ACPI_CREATOR, 4); + header->creator_revision = (U_BOOT_VERSION_NUM << 16) | + (U_BOOT_VERSION_NUM_PATCH << 8); } void acpi_align(struct acpi_ctx *ctx) diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c index f2dadd792bd..2589efbb5f2 100644 --- a/lib/acpi/acpi_table.c +++ b/lib/acpi/acpi_table.c @@ -126,7 +126,7 @@ int acpi_write_fadt(struct acpi_ctx *ctx, const struct acpi_writer *entry) header->revision = acpi_get_table_revision(ACPITAB_FADT); memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, OEM_TABLE_ID, 8); - memcpy(header->creator_id, ASLC_ID, 4); + memcpy(header->creator_id, ACPI_CREATOR, 4); header->creator_revision = 1; fadt->minor_revision = 2; diff --git a/test/dm/acpi.c b/test/dm/acpi.c index a274671de02..d1be6707693 100644 --- a/test/dm/acpi.c +++ b/test/dm/acpi.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -25,6 +26,9 @@ #define BUF_SIZE 4096 +#define CREATOR_REVISION ((U_BOOT_VERSION_NUM << 16) | \ + (U_BOOT_VERSION_NUM_PATCH << 8)) + #define OEM_REVISION ((((version_num / 1000) % 10) << 28) | \ (((version_num / 100) % 10) << 24) | \ (((version_num / 10) % 10) << 20) | \ @@ -263,8 +267,8 @@ static int dm_test_acpi_fill_header(struct unit_test_state *uts) ut_asserteq_mem(OEM_TABLE_ID, hdr.oem_table_id, sizeof(hdr.oem_table_id)); ut_asserteq(OEM_REVISION, hdr.oem_revision); - ut_asserteq_mem(ASLC_ID, hdr.creator_id, sizeof(hdr.creator_id)); - ut_asserteq(ASL_REVISION, hdr.creator_revision); + ut_asserteq_mem(ACPI_CREATOR, hdr.creator_id, sizeof(hdr.creator_id)); + ut_asserteq(CREATOR_REVISION, hdr.creator_revision); return 0; } @@ -417,22 +421,27 @@ static int dm_test_acpi_cmd_list(struct unit_test_state *uts) ut_assert_nextline("RSDP %16lx %5zx v02 U-BOOT", addr, sizeof(struct acpi_rsdp)); addr = ALIGN(addr + sizeof(struct acpi_rsdp), 16); - ut_assert_nextline("RSDT %16lx %5zx v01 U-BOOT U-BOOTBL %x INTL 0", + ut_assert_nextline("RSDT %16lx %5zx v01 U-BOOT U-BOOTBL %x UBOO %x", addr, sizeof(struct acpi_table_header) + - 3 * sizeof(u32), OEM_REVISION); + 3 * sizeof(u32), OEM_REVISION, + CREATOR_REVISION); addr = ALIGN(addr + sizeof(struct acpi_rsdt), 16); - ut_assert_nextline("XSDT %16lx %5zx v01 U-BOOT U-BOOTBL %x INTL 0", + ut_assert_nextline("XSDT %16lx %5zx v01 U-BOOT U-BOOTBL %x UBOO %x", addr, sizeof(struct acpi_table_header) + - 3 * sizeof(u64), OEM_REVISION); + 3 * sizeof(u64), OEM_REVISION, + CREATOR_REVISION); addr = ALIGN(addr + sizeof(struct acpi_xsdt), 64); - ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x INTL 0", - addr, sizeof(struct acpi_dmar), OEM_REVISION); + ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x UBOO %x", + addr, sizeof(struct acpi_dmar), OEM_REVISION, + CREATOR_REVISION); addr = ALIGN(addr + sizeof(struct acpi_dmar), 16); - ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x INTL 0", - addr, sizeof(struct acpi_dmar), OEM_REVISION); + ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x UBOO %x", + addr, sizeof(struct acpi_dmar), OEM_REVISION, + CREATOR_REVISION); addr = ALIGN(addr + sizeof(struct acpi_dmar), 16); - ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x INTL 0", - addr, sizeof(struct acpi_dmar), OEM_REVISION); + ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x UBOO %x", + addr, sizeof(struct acpi_dmar), OEM_REVISION, + CREATOR_REVISION); ut_assert_console_end(); unmap_sysmem(buf); free(buf); @@ -461,22 +470,27 @@ static int dm_test_acpi_cmd_list_chksum(struct unit_test_state *uts) ut_assert_nextline("RSDP %16lx %5zx v02 U-BOOT OK OK", addr, sizeof(struct acpi_rsdp)); addr = ALIGN(addr + sizeof(struct acpi_rsdp), 16); - ut_assert_nextline("RSDT %16lx %5zx v01 U-BOOT U-BOOTBL %x INTL 0 OK", + ut_assert_nextline("RSDT %16lx %5zx v01 U-BOOT U-BOOTBL %x UBOO %x OK", addr, sizeof(struct acpi_table_header) + - 3 * sizeof(u32), OEM_REVISION); + 3 * sizeof(u32), OEM_REVISION, + CREATOR_REVISION); addr = ALIGN(addr + sizeof(struct acpi_rsdt), 16); - ut_assert_nextline("XSDT %16lx %5zx v01 U-BOOT U-BOOTBL %x INTL 0 OK", + ut_assert_nextline("XSDT %16lx %5zx v01 U-BOOT U-BOOTBL %x UBOO %x OK", addr, sizeof(struct acpi_table_header) + - 3 * sizeof(u64), OEM_REVISION); + 3 * sizeof(u64), OEM_REVISION, + CREATOR_REVISION); addr = ALIGN(addr + sizeof(struct acpi_xsdt), 64); - ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x INTL 0 OK", - addr, sizeof(struct acpi_dmar), OEM_REVISION); + ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x UBOO %x OK", + addr, sizeof(struct acpi_dmar), OEM_REVISION, + CREATOR_REVISION); addr = ALIGN(addr + sizeof(struct acpi_dmar), 16); - ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x INTL 0 OK", - addr, sizeof(struct acpi_dmar), OEM_REVISION); + ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x UBOO %x OK", + addr, sizeof(struct acpi_dmar), OEM_REVISION, + CREATOR_REVISION); addr = ALIGN(addr + sizeof(struct acpi_dmar), 16); - ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x INTL 0 OK", - addr, sizeof(struct acpi_dmar), OEM_REVISION); + ut_assert_nextline("DMAR %16lx %5zx v01 U-BOOT U-BOOTBL %x UBOO %x OK", + addr, sizeof(struct acpi_dmar), OEM_REVISION, + CREATOR_REVISION); ut_assert_console_end(); ut_assert_console_end(); unmap_sysmem(buf);