Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2229339/?format=api
{ "id": 2229339, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2229339/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20260428-type-v4-6-b7051dc45a88@oss.qualcomm.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/1.1/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null }, "msgid": "<20260428-type-v4-6-b7051dc45a88@oss.qualcomm.com>", "date": "2026-04-28T07:31:48", "name": "[v4,6/8] env: scsi: Implement partition type GUID lookup", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "4bc003e3a96c3454d2a944d9a37ab715e16ea67d", "submitter": { "id": 90810, "url": "http://patchwork.ozlabs.org/api/1.1/people/90810/?format=api", "name": "Balaji Selvanathan", "email": "balaji.selvanathan@oss.qualcomm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20260428-type-v4-6-b7051dc45a88@oss.qualcomm.com/mbox/", "series": [ { "id": 501772, "url": "http://patchwork.ozlabs.org/api/1.1/series/501772/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=501772", "date": "2026-04-28T07:31:42", "name": "Add partition type GUID support for environment", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/501772/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2229339/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2229339/checks/", "tags": {}, "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256\n header.s=qcppdkim1 header.b=LQTrzsKo;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com\n header.a=rsa-sha256 header.s=google header.b=IOy2e8Du;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)", "phobos.denx.de;\n dmarc=none (p=none dis=none) header.from=oss.qualcomm.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=qualcomm.com header.i=@qualcomm.com\n header.b=\"LQTrzsKo\";\n\tdkim=pass (2048-bit key;\n unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com\n header.b=\"IOy2e8Du\";\n\tdkim-atps=neutral", "phobos.denx.de; dmarc=none (p=none dis=none)\n header.from=oss.qualcomm.com", "phobos.denx.de; spf=pass\n smtp.mailfrom=balaji.selvanathan@oss.qualcomm.com" ], "Received": [ "from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g4XGg1r4Wz1yHv\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 28 Apr 2026 17:33:15 +1000 (AEST)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 4DA4784662;\n\tTue, 28 Apr 2026 09:32:50 +0200 (CEST)", "by phobos.denx.de (Postfix, from userid 109)\n id 2D9F584656; Tue, 28 Apr 2026 09:32:49 +0200 (CEST)", "from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com\n [205.220.180.131])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id DCBD584605\n for <u-boot@lists.denx.de>; Tue, 28 Apr 2026 09:32:46 +0200 (CEST)", "from pps.filterd (m0279873.ppops.net [127.0.0.1])\n by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 63S42xL51329580\n for <u-boot@lists.denx.de>; Tue, 28 Apr 2026 07:32:45 GMT", "from mail-pl1-f198.google.com (mail-pl1-f198.google.com\n [209.85.214.198])\n by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dtnhagq9x-1\n (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT)\n for <u-boot@lists.denx.de>; Tue, 28 Apr 2026 07:32:45 +0000 (GMT)", "by mail-pl1-f198.google.com with SMTP id\n d9443c01a7336-2b2ed279eedso76643705ad.0\n for <u-boot@lists.denx.de>; Tue, 28 Apr 2026 00:32:45 -0700 (PDT)", "from hu-bselvana-blr.qualcomm.com\n (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com. [103.229.18.19])\n by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2b97aabaecfsm16054405ad.36.2026.04.28.00.32.36\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 28 Apr 2026 00:32:43 -0700 (PDT)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,\n SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2", "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h=\n cc:content-transfer-encoding:content-type:date:from:in-reply-to\n :message-id:mime-version:references:subject:to; s=qcppdkim1; bh=\n Gw2CCvz0qPRbZYu10q0wXudEGMpcTESOWCBnDmUFIfU=; b=LQTrzsKoFah6IAEo\n IJLZGJfh4jb2UQOl889Lod8ZOwNeiIsL7iiFVlxiQf0ynFN5ML03mCeaBK87J1Oj\n cNt1w90O/BfwxEUWgcbLiU2JfCBJdGG0eSJiHgBdiSmHbUmLpiJ6ETdjPVRXtfzp\n LWbEe90G97t/LGVUc+1HXarepq1M+NTn9KEaY4VpOp0KsmJf+nFYi5xW6DZStyrX\n /xW3Mz52QdStX7iqEX8zW8JJWarUEc/hqXq/I1LtB0LrRDT/YaQOQjtR9PJ3q9zk\n vFqFTQB6MFOHQuLnio5Hwnnbz/E/+ItJGGOBs7T8riwfv4tEzhG0hjdPsR09u/R0\n BUijiw==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=oss.qualcomm.com; s=google; t=1777361564; x=1777966364; darn=lists.denx.de;\n h=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n :mime-version:subject:date:from:from:to:cc:subject:date:message-id\n :reply-to; bh=Gw2CCvz0qPRbZYu10q0wXudEGMpcTESOWCBnDmUFIfU=;\n b=IOy2e8Duv239lTnKrdCE/9sksWfsil1BS4TgCUbjnXhMVi62YDqGBNJFbNaULCL82T\n L2t+NnZ9dX19GgFbMVZ5OETjo/IHAmO10cJ+5YJ2+oBkOvkcGTZHr7f2xJDEL5YnN9u5\n P7oBMZPtBLBTAPttplrLSnttNitUfhF/jw7NyPWRaYc4Frqp2hCR6HObRug68s6iwm13\n ydLUv1e/sfJMq8lYM/5ajSbaeOqAH9ade3m0TCeglHYT4IDFRD1otVX2aC8X5MU017rS\n qs4Qc95h57HQQ/UC60M+4KoEwDyxY5OobAIdYK0nyjq22uxYC/pkAyIO6cgYI9Xex33G\n C0VA==" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777361564; x=1777966364;\n h=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=Gw2CCvz0qPRbZYu10q0wXudEGMpcTESOWCBnDmUFIfU=;\n b=eb4JhbEc4niwXHPkko1KFjPJJl5b8q8/1gyCYEbD9aG8VifWJX0lhQSMjlORqtD20S\n XocyzQ7IxNPBcAd5jqUIb5vRkaGF3iYVSNgISiGKOafge5V3Qv2VC00ySh+nvMb/gufn\n C9RU7qOeSS7aWG70WymGTkBM5iWd4pnyhU7j/n2BvJA76TP8fHINuqpunOUDn7IYdT6e\n 6ONhSaoUgtZmGW901aRC0qfNFklhqG32tA5MH3v1xuIAMLG8fbYgSzaeVhXvnCYCLF/i\n l/nHLVtVSbwJ9DVFxiff7gdJTOP0NyRHdXsMcBRW9Qcu3cU/A9yDsaoD3vIUgTr2eism\n pPYA==", "X-Gm-Message-State": "AOJu0YxwAMQwBvvGql6RKkVoRmvUAMui+3X+NST0mGwzRISzpxarhUvU\n vZwsygyQQ48nkhFp2bjM/ueeE8VewHzxi1edNGLMdHJsWsLm4/p0ZJylhJFv2COvwTFUr/3ZdiB\n eraq8cNBXGn3Lcd1Bnm7vbtlaK0AlIj0Xx5vO7Sp0CA3wXfzlBETRWt3W", "X-Gm-Gg": "AeBDieu+wJT47cTjOTR995/Ga09FbSeiM+KWn99e7d9z+epnuHd6AckpyySuPhnwXFX\n lAa4RSGlIGlL2OujWLxdHEpJGDH6XgbwZkWSehH/OK7ZMyXjmW9sAKY5OLu1DtKeBHHsNy8tsgt\n B+y9go+dCjXZRjDJ8CJY7mdijy064SGcy4d8pO9wiJNx/EZJbJ2cOy99HSk+NJlTZ6jBYJblx1g\n vAJrWMlX+Y76oXjYKS4tiw+m1EVIQkbc3FLUkAyj2RLSHmN8FrMCzfb7vnOHBETHqRn/XaVHlbp\n BXTTLTr5RwsB/6Wj1VjQEzo8YW6jl1u0ZfsxJWUJKL5Cu99/5fiJsWYIMwkiiIbcssTmg4yundb\n iBEqo80JzXf6KTfdg9oIRQyooDYslTOZ2mPbfkmMw2aaRD5ooMTtKdZPIpj/qU1bIsPrGapTkIw\n v86oR6KCnLb4apymJrjBoqFJSrFyBNoemXyhcZDC/Qd/dAi7aZKIMGl3jqBhzF", "X-Received": [ "by 2002:a17:902:f70d:b0:2b4:5309:2c14 with SMTP id\n d9443c01a7336-2b97c482bc7mr21062905ad.31.1777361564385;\n Tue, 28 Apr 2026 00:32:44 -0700 (PDT)", "by 2002:a17:902:f70d:b0:2b4:5309:2c14 with SMTP id\n d9443c01a7336-2b97c482bc7mr21062645ad.31.1777361563868;\n Tue, 28 Apr 2026 00:32:43 -0700 (PDT)" ], "From": "Balaji Selvanathan <balaji.selvanathan@oss.qualcomm.com>", "Date": "Tue, 28 Apr 2026 13:01:48 +0530", "Subject": "[PATCH v4 6/8] env: scsi: Implement partition type GUID lookup", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20260428-type-v4-6-b7051dc45a88@oss.qualcomm.com>", "References": "<20260428-type-v4-0-b7051dc45a88@oss.qualcomm.com>", "In-Reply-To": "<20260428-type-v4-0-b7051dc45a88@oss.qualcomm.com>", "To": "u-boot@lists.denx.de, Sumit Garg <sumit.garg@kernel.org>,\n u-boot-qcom@groups.io", "Cc": "Tom Rini <trini@konsulko.com>, Quentin Schulz <quentin.schulz@cherry.de>,\n Ilias Apalodimas <ilias.apalodimas@linaro.org>,\n Rasmus Villemoes <ravi@prevas.dk>, Simon Glass <sjg@chromium.org>,\n Javier Tia <floss@jetm.me>,\n Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>,\n Varadarajan Narayanan <quic_varada@quicinc.com>,\n Javier Martinez Canillas <javierm@redhat.com>,\n Richard Genoud <richard.genoud@bootlin.com>,\n Jan Kiszka <jan.kiszka@siemens.com>, David Lechner <dlechner@baylibre.com>,\n Casey Connolly <casey.connolly@linaro.org>,\n Marek Vasut <marek.vasut+renesas@mailbox.org>,\n Christian Marangi <ansuelsmth@gmail.com>,\n Michael Walle <mwalle@kernel.org>,\n Sumit Garg <sumit.garg@oss.qualcomm.com>,\n Neil Armstrong <neil.armstrong@linaro.org>,\n Aswin Murugan <aswin.murugan@oss.qualcomm.com>,\n Jerome Forissier <jerome.forissier@arm.com>,\n Mattijs Korpershoek <mkorpershoek@kernel.org>,\n Balaji Selvanathan <balaji.selvanathan@oss.qualcomm.com>", "X-Mailer": "b4 0.14.3", "X-Developer-Signature": "v=1; a=ed25519-sha256; t=1777361510; l=3571;\n i=balaji.selvanathan@oss.qualcomm.com; s=20260213; h=from:subject:message-id;\n bh=gyxq1cM7icXJKBWHSmqo+dS93WscLISnfug6uY5QpIE=;\n b=S7WSEH1y1o2o//k63PNGrl7s/7niDTNhnpgclFtRZO9xtJMpiDcn5CKVKV5abfOHdSNqJKxuW\n 2irtBFBf2mYCQQ/IGg6BIvvLnnKzdqIPkrMgNhwphCfhGjYKj/W8uGy", "X-Developer-Key": "i=balaji.selvanathan@oss.qualcomm.com; a=ed25519;\n pk=CDpYiUU3SH7KGEtsBvY2tBGPiWfMxqWJF0p2LftOfnc=", "X-Proofpoint-Spam-Details-Enc": "AW1haW4tMjYwNDI4MDA2OSBTYWx0ZWRfX03QvLUeTd3ZE\n kTzSLsek50kakSQNOgDoPsiQ5b/k3fSYUtK8vPUAl66ostzS44jyEXWbcvC0RbgfEFKd9cn0ydK\n kXHWS6h8hGWkTa2wEWM7spBXVMmzP3t7niRZFd0Noq4R9mBw4dRPccjA7gy2nzxfw1Sdmrcs+vT\n aanF6YV2lOG3j3oIQ6nrqb5RZ+jPhDNoOJeKt1Mb48PUQnB/ygKIGcO8EWiUY8mSSk0LpPF7yko\n k0R4S7S+5CIUaWRRYOwDOg6gxt8SScsnxVK2osy6Ej8xpeGRI5jAQCynHd8+wGPAT38UG0+EhIn\n 45a29cgjBaKBSB8h1ELEGKDmVZE2KLaOYj5xMSvd3Z55GXBs9s/qsR2LkihQoBxkojUhIw5w9aq\n eoX3+Gv2gWu8r3SpMrxojbyt93fb4Van2mH9usa1Kk2zaJvwYgR+u0Q86qXZ1iszSuj3TfkYdOL\n ih5RcdGZe1uIWJlyPCQ==", "X-Authority-Analysis": "v=2.4 cv=JoDBas4C c=1 sm=1 tr=0 ts=69f0629d cx=c_pps\n a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17\n a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10\n a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22\n a=cm27Pg_UAAAA:8 a=EUspDBNiAAAA:8 a=9j1fX5knQuk3s5Zjpq8A:9 a=QEXdDO2ut3YA:10\n a=GvdueXVYPmCkWapjIL-Q:22", "X-Proofpoint-GUID": "PH52JT52HO130PX_NfqddmCcRGAG-Xz5", "X-Proofpoint-ORIG-GUID": "PH52JT52HO130PX_NfqddmCcRGAG-Xz5", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-28_01,2026-04-21_02,2025-10-01_01", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n impostorscore=0 lowpriorityscore=0 spamscore=0 bulkscore=0 clxscore=1015\n adultscore=0 phishscore=0 malwarescore=0 suspectscore=0 priorityscore=1501\n classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0\n reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604280069", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.39", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<https://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>", "X-Virus-Scanned": "clamav-milter 0.103.8 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "Update env/scsi.c to support the new partition selection methods\nintroduced in the Kconfig. Replace runtime string checks with\ncompile-time preprocessor conditionals.\n\nImplement support for all three partition selection methods:\n- TYPE_GUID: Uses scsi_get_blk_by_type_guid()\n- UUID: Uses scsi_get_blk_by_uuid()\n- HW: Uses blk_get_device_part_str()\n\nReviewed-by: Simon Glass <sjg@chromium.org>\nSigned-off-by: Balaji Selvanathan <balaji.selvanathan@oss.qualcomm.com>\n---\nChanges in v4:\n- Has only changes related to Refactor env_scsi_get_part and\n env_scsi_load functions based on the choice configs\n\nChanges in v3:\n- Introduce a new choice config: ENV_SCSI_PART_USE_HW for\n ENV_SCSI_HW_PARTITION\n- Refactor env_scsi_get_part and env_scsi_load functions based\n on the choice configs\n\nChanges in v2:\n- Introduce a Kconfig choice config to select between UUID-based\nand type GUID-based partition lookup methods.\n---\n env/scsi.c | 43 +++++++++++++++++++++++++------------------\n 1 file changed, 25 insertions(+), 18 deletions(-)", "diff": "diff --git a/env/scsi.c b/env/scsi.c\nindex 91a6c430302..b170f4ee0c7 100644\n--- a/env/scsi.c\n+++ b/env/scsi.c\n@@ -41,14 +41,17 @@ static inline struct env_scsi_info *env_scsi_get_part(void)\n \t\tis_scsi_scanned = true;\n \t}\n \n-\tif (CONFIG_ENV_SCSI_PART_UUID[0] == '\\0') {\n-\t\tif (blk_get_device_part_str(\"scsi\", CONFIG_ENV_SCSI_HW_PARTITION,\n-\t\t\t\t\t &ep->blk, &ep->part, true))\n-\t\t\treturn NULL;\n-\t} else {\n-\t\tif (scsi_get_blk_by_uuid(CONFIG_ENV_SCSI_PART_UUID, &ep->blk, &ep->part))\n-\t\t\treturn NULL;\n-\t}\n+#if defined(CONFIG_ENV_SCSI_PART_USE_TYPE_GUID)\n+\tif (scsi_get_blk_by_type_guid(CONFIG_ENV_SCSI_PART_TYPE_GUID, &ep->blk, &ep->part))\n+\t\treturn NULL;\n+#elif defined(CONFIG_ENV_SCSI_PART_USE_UUID)\n+\tif (scsi_get_blk_by_uuid(CONFIG_ENV_SCSI_PART_UUID, &ep->blk, &ep->part))\n+\t\treturn NULL;\n+#elif defined(CONFIG_ENV_SCSI_PART_USE_HW)\n+\tif (blk_get_device_part_str(\"scsi\", CONFIG_ENV_SCSI_HW_PARTITION,\n+\t\t\t\t &ep->blk, &ep->part, true))\n+\t\treturn NULL;\n+#endif\n \n \tep->count = CONFIG_ENV_SIZE / ep->part.blksz;\n \n@@ -95,20 +98,24 @@ static int env_scsi_load(void)\n \tint ret;\n \n \tif (!ep) {\n-\t\tif (CONFIG_ENV_SCSI_PART_UUID[0] == '\\0')\n-\t\t\tenv_set_default(\"SCSI partition \" CONFIG_ENV_SCSI_HW_PARTITION \" not found\", 0);\n-\t\telse\n-\t\t\tenv_set_default(CONFIG_ENV_SCSI_PART_UUID \" partition not found\", 0);\n-\n+#if defined(CONFIG_ENV_SCSI_PART_USE_TYPE_GUID)\n+\t\tenv_set_default(\"partition type \" CONFIG_ENV_SCSI_PART_TYPE_GUID \" not found\", 0);\n+#elif defined(CONFIG_ENV_SCSI_PART_USE_UUID)\n+\t\tenv_set_default(CONFIG_ENV_SCSI_PART_UUID \" partition not found\", 0);\n+#elif defined(CONFIG_ENV_SCSI_PART_USE_HW)\n+\t\tenv_set_default(\"SCSI partition \" CONFIG_ENV_SCSI_HW_PARTITION \" not found\", 0);\n+#endif\n \t\treturn -ENOENT;\n \t}\n \n \tif (blk_dread(ep->blk, ep->part.start, ep->count, &envbuf) != ep->count) {\n-\t\tif (CONFIG_ENV_SCSI_PART_UUID[0] == '\\0')\n-\t\t\tenv_set_default(\"SCSI partition \" CONFIG_ENV_SCSI_HW_PARTITION \" read failed\", 0);\n-\t\telse\n-\t\t\tenv_set_default(CONFIG_ENV_SCSI_PART_UUID \" partition read failed\", 0);\n-\n+#if defined(CONFIG_ENV_SCSI_PART_USE_TYPE_GUID)\n+\t\tenv_set_default(\"partition type \" CONFIG_ENV_SCSI_PART_TYPE_GUID \" read failed\", 0);\n+#elif defined(CONFIG_ENV_SCSI_PART_USE_UUID)\n+\t\tenv_set_default(CONFIG_ENV_SCSI_PART_UUID \" partition read failed\", 0);\n+#elif defined(CONFIG_ENV_SCSI_PART_USE_HW)\n+\t\tenv_set_default(\"SCSI partition \" CONFIG_ENV_SCSI_HW_PARTITION \" read failed\", 0);\n+#endif\n \t\treturn -EIO;\n \t}\n \n", "prefixes": [ "v4", "6/8" ] }