get:
Show a patch.

patch:
Update a patch.

put:
Update a patch.

GET /api/patches/2147593/?format=api
HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 2147593,
    "url": "http://patchwork.ozlabs.org/api/patches/2147593/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20251009115846.897186-2-anshuld@ti.com/",
    "project": {
        "id": 18,
        "url": "http://patchwork.ozlabs.org/api/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,
        "list_archive_url": "",
        "list_archive_url_format": "",
        "commit_url_format": ""
    },
    "msgid": "<20251009115846.897186-2-anshuld@ti.com>",
    "list_archive_url": null,
    "date": "2025-10-09T11:58:43",
    "name": "[v2,1/3] spl: make args file optional in falcon mode",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "8a2a61c37edee0cbdaac54c3101f115460319d23",
    "submitter": {
        "id": 90324,
        "url": "http://patchwork.ozlabs.org/api/people/90324/?format=api",
        "name": "Anshul Dalal",
        "email": "anshuld@ti.com"
    },
    "delegate": {
        "id": 3651,
        "url": "http://patchwork.ozlabs.org/api/users/3651/?format=api",
        "username": "trini",
        "first_name": "Tom",
        "last_name": "Rini",
        "email": "trini@ti.com"
    },
    "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20251009115846.897186-2-anshuld@ti.com/mbox/",
    "series": [
        {
            "id": 476899,
            "url": "http://patchwork.ozlabs.org/api/series/476899/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=476899",
            "date": "2025-10-09T11:58:42",
            "name": "Add support for secure falcon mode: disable args file",
            "version": 2,
            "mbox": "http://patchwork.ozlabs.org/series/476899/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/2147593/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/2147593/checks/",
    "tags": {},
    "related": [],
    "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 (1024-bit key;\n unprotected) header.d=ti.com header.i=@ti.com header.a=rsa-sha256\n header.s=ti-com-17Q1 header.b=WwUWQsFa;\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=pass (p=quarantine dis=none) header.from=ti.com",
            "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de",
            "phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=ti.com header.i=@ti.com header.b=\"WwUWQsFa\";\n\tdkim-atps=neutral",
            "phobos.denx.de;\n dmarc=pass (p=quarantine dis=none) header.from=ti.com",
            "phobos.denx.de; spf=pass smtp.mailfrom=anshuld@ti.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 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4cj7hJ3zJZz1yGS\n\tfor <incoming@patchwork.ozlabs.org>; Thu,  9 Oct 2025 22:59:12 +1100 (AEDT)",
            "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 61F8B844F0;\n\tThu,  9 Oct 2025 13:58:59 +0200 (CEST)",
            "by phobos.denx.de (Postfix, from userid 109)\n id DFFD8844D2; Thu,  9 Oct 2025 13:58:58 +0200 (CEST)",
            "from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n bits)) (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 93AF284480\n for <u-boot@lists.denx.de>; Thu,  9 Oct 2025 13:58:56 +0200 (CEST)",
            "from lelvem-sh01.itg.ti.com ([10.180.77.71])\n by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTP id 599Bwq01453786;\n Thu, 9 Oct 2025 06:58:52 -0500",
            "from DFLE204.ent.ti.com (dfle204.ent.ti.com [10.64.6.62])\n by lelvem-sh01.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 599BwqM4281690\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL);\n Thu, 9 Oct 2025 06:58:52 -0500",
            "from DFLE212.ent.ti.com (10.64.6.70) by DFLE204.ent.ti.com\n (10.64.6.62) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 9 Oct\n 2025 06:58:52 -0500",
            "from lelvem-mr05.itg.ti.com (10.180.75.9) by DFLE212.ent.ti.com\n (10.64.6.70) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend\n Transport; Thu, 9 Oct 2025 06:58:51 -0500",
            "from localhost (dhcp-172-24-233-105.dhcp.ti.com [172.24.233.105])\n by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 599BwoOh210010;\n Thu, 9 Oct 2025 06:58:51 -0500"
        ],
        "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de",
        "X-Spam-Level": "",
        "X-Spam-Status": "No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,\n RCVD_IN_VALIDITY_RPBL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham\n autolearn_force=no version=3.4.2",
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com;\n s=ti-com-17Q1; t=1760011132;\n bh=Y1YaG8bV7maXR2Td5R/QAq6aKdDlrZunTF+AsIOrWCY=;\n h=From:To:CC:Subject:Date:In-Reply-To:References;\n b=WwUWQsFapK9RQxQ0h8CNA7Al9a+LmFuwv/sc9rHwkl1047ExjUwWkr8cOxYU7mvvj\n OXfsVtC/CnxFTH8CLbHDGP+qoBM4OR+TLYTcdbb3HYIIS2BNyEvsQT6TivCj5gDyP5\n LrQDjAL9eCCY+50qBsHPLyTxpELJTL5BiVRx6K44=",
        "From": "Anshul Dalal <anshuld@ti.com>",
        "To": "<u-boot@lists.denx.de>",
        "CC": "Anshul Dalal <anshuld@ti.com>, <vigneshr@ti.com>, <trini@konsulko.com>,\n <afd@ti.com>, <m-chawdhry@ti.com>, <n-francis@ti.com>, <b-liu@ti.com>,\n <nm@ti.com>, <bb@ti.com>, <kever.yang@rock-chips.com>,\n <hl@rock-chips.com>, <tim@feathertop.org>,\n <marek.vasut+renesas@mailbox.org>",
        "Subject": "[PATCH v2 1/3] spl: make args file optional in falcon mode",
        "Date": "Thu, 9 Oct 2025 17:28:43 +0530",
        "Message-ID": "<20251009115846.897186-2-anshuld@ti.com>",
        "X-Mailer": "git-send-email 2.51.0",
        "In-Reply-To": "<20251009115846.897186-1-anshuld@ti.com>",
        "References": "<20251009115846.897186-1-anshuld@ti.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Content-Type": "text/plain",
        "X-C2ProcessedOrg": "333ef613-75bf-4e12-a4b1-8e3623f5dcea",
        "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": "Falcon mode loads a kernel file and an args file which is the\ndevice-tree. However in the case of kernel file being a FIT that\ncontains the device-tree within it, loading the args file is not\nrequired.\n\nTherefore, this patch introduces a new SPL_OS_BOOT_ARGS config options\nthat allows us to enable or disable loading of the args file in falcon\nmode.\n\nSigned-off-by: Anshul Dalal <anshuld@ti.com>\n---\n common/spl/Kconfig         | 21 ++++++++++++++-------\n common/spl/spl.c           |  8 ++++++--\n common/spl/spl_ext.c       |  4 ++++\n common/spl/spl_fat.c       |  5 +++++\n common/spl/spl_nand.c      |  5 ++++-\n common/spl/spl_spi.c       |  5 +++++\n common/spl/spl_ubi.c       |  4 ++++\n include/system-constants.h |  2 +-\n 8 files changed, 43 insertions(+), 11 deletions(-)",
    "diff": "diff --git a/common/spl/Kconfig b/common/spl/Kconfig\nindex f20651c3769..22ef43c3a6e 100644\n--- a/common/spl/Kconfig\n+++ b/common/spl/Kconfig\n@@ -803,7 +803,7 @@ config SPL_FS_LOAD_KERNEL_NAME\n \n config SPL_FS_LOAD_ARGS_NAME\n \tstring \"File to load for the OS kernel argument parameters from the filesystem\"\n-\tdepends on (SPL_FS_EXT4 || SPL_FS_FAT || SPL_FS_SQUASHFS) && SPL_OS_BOOT\n+\tdepends on (SPL_FS_EXT4 || SPL_FS_FAT || SPL_FS_SQUASHFS) && SPL_OS_BOOT_ARGS\n \tdefault \"args\"\n \thelp\n \t  Filename to read to load for the OS kernel argument parameters from\n@@ -1121,7 +1121,7 @@ config SPL_UBI_LOAD_KERNEL_ID\n \n config SPL_UBI_LOAD_ARGS_ID\n \tint \"id of kernel args volume\"\n-\tdepends on SPL_OS_BOOT\n+\tdepends on SPL_OS_BOOT_ARGS\n \thelp\n \t  The UBI volume id from which to load the device tree\n \n@@ -1214,9 +1214,16 @@ config SPL_OS_BOOT_SECURE\n \t  to use falcon mode by disabling certain inherently non-securable options\n \t  in the SPL boot flow.\n \n+config SPL_OS_BOOT_ARGS\n+\tbool \"Allow SPL to load args for kernel in falcon mode\"\n+\tdepends on SPL_OS_BOOT || SPL_LOAD_FIT_OPENSBI_OS_BOOT\n+\thelp\n+\t  This option enables the SPL to load an args file (usually the FDT)\n+\t  alongside the kernel image in falcon boot mode.\n+\n config SPL_PAYLOAD_ARGS_ADDR\n \thex \"Address in memory to load 'args' file for Falcon Mode to\"\n-\tdepends on SPL_OS_BOOT || SPL_LOAD_FIT_OPENSBI_OS_BOOT\n+\tdepends on SPL_OS_BOOT_ARGS\n \tdefault 0x88000000 if ARCH_OMAP2PLUS\n \tdefault 0x99000000 if ARCH_SC5XX && SC59X_64\n \tdefault 0xA0000000 if ARCH_SC5XX && TARGET_SC594_SOM_EZKIT\n@@ -1256,7 +1263,7 @@ config SYS_MMCSD_RAW_MODE_KERNEL_SECTOR\n \n config SYS_MMCSD_RAW_MODE_ARGS_SECTOR\n \thex \"Falcon mode: Sector to load 'args' from MMC\"\n-\tdepends on SPL_FALCON_BOOT_MMCSD\n+\tdepends on SPL_FALCON_BOOT_MMCSD && SPL_OS_BOOT_ARGS\n \thelp\n \t  When Falcon mode is used with an MMC or SD media, SPL needs to know\n \t  where to look for the OS 'args', typically a device tree. The\n@@ -1266,7 +1273,7 @@ config SYS_MMCSD_RAW_MODE_ARGS_SECTOR\n \n config SYS_MMCSD_RAW_MODE_ARGS_SECTORS\n \thex \"Falcon mode: Number of sectors to load for 'args' from MMC\"\n-\tdepends on SPL_FALCON_BOOT_MMCSD && SYS_MMCSD_RAW_MODE_ARGS_SECTOR != 0x0\n+\tdepends on SPL_FALCON_BOOT_MMCSD && SPL_OS_BOOT_ARGS\n \n config SPL_PAYLOAD\n \tstring \"SPL payload\"\n@@ -1502,14 +1509,14 @@ config SYS_SPI_KERNEL_OFFS\n \n config SYS_SPI_ARGS_OFFS\n \thex \"Falcon mode: address of args payload in SPI flash\"\n-\tdepends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT\n+\tdepends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT_ARGS\n \thelp\n \t Address within SPI-Flash from where the args payload (usually the\n \t dtb) is fetched in falcon boot.\n \n config SYS_SPI_ARGS_SIZE\n \thex \"Falcon mode: size of args payload in SPI flash\"\n-\tdepends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT\n+\tdepends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT_ARGS\n \n config SPL_THERMAL\n \tbool \"Driver support for thermal devices\"\ndiff --git a/common/spl/spl.c b/common/spl/spl.c\nindex 55ad497c86d..f1a1785beef 100644\n--- a/common/spl/spl.c\n+++ b/common/spl/spl.c\n@@ -692,6 +692,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)\n \tspl_jump_to_image_t jumper = &jump_to_image;\n \tstruct spl_image_info spl_image;\n \tint ret, os;\n+\tvoid *fdt;\n \n \tdebug(\">>\" PHASE_PROMPT \"board_init_r()\\n\");\n \n@@ -793,8 +794,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)\n \t\tjumper = &spl_invoke_opensbi;\n \t} else if (CONFIG_IS_ENABLED(OS_BOOT) && os == IH_OS_LINUX) {\n \t\tdebug(\"Jumping to Linux\\n\");\n-\t\tif (IS_ENABLED(CONFIG_SPL_OS_BOOT))\n-\t\t\tspl_fixup_fdt((void *)SPL_PAYLOAD_ARGS_ADDR);\n+\t\tif (CONFIG_IS_ENABLED(OS_BOOT_ARGS))\n+\t\t\tfdt = (void *)SPL_PAYLOAD_ARGS_ADDR;\n+\t\telse\n+\t\t\tfdt = spl_image_fdt_addr(&spl_image);\n+\t\tspl_fixup_fdt(fdt);\n \t\tspl_board_prepare_for_linux();\n \t\tjumper = &jump_to_image_linux;\n \t} else {\ndiff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c\nindex a3925d38d52..834977f82f5 100644\n--- a/common/spl/spl_ext.c\n+++ b/common/spl/spl_ext.c\n@@ -105,6 +105,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image,\n \t\t\tgoto defaults;\n \t\t}\n \n+#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS)\n \t\text4fs_set_blk_dev(block_dev, &part_info);\n \t\text4fs_mount();\n \t\tfile = env_get(\"falcon_args_file\");\n@@ -125,6 +126,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image,\n \t\t} else {\n \t\t\tputs(\"spl: falcon_args_file not set in environment, falling back to default\\n\");\n \t\t}\n+#endif\n \t} else {\n \t\tputs(\"spl: falcon_image_file not set in environment, falling back to default\\n\");\n \t}\n@@ -137,6 +139,7 @@ defaults:\n \tif (err)\n \t\treturn err;\n \n+#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS)\n \text4fs_set_blk_dev(block_dev, &part_info);\n \text4fs_mount();\n \terr = ext4fs_open(CONFIG_SPL_FS_LOAD_ARGS_NAME, &filelen);\n@@ -153,6 +156,7 @@ defaults:\n #endif\n \t\treturn -1;\n \t}\n+#endif\n \n \treturn 0;\n }\ndiff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c\nindex 80e800b4755..d66b2f7d5e7 100644\n--- a/common/spl/spl_fat.c\n+++ b/common/spl/spl_fat.c\n@@ -131,6 +131,7 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image,\n \t\t\tgoto defaults;\n \t\t}\n \n+#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS)\n \t\tfile = env_get(\"falcon_args_file\");\n \t\tif (file) {\n \t\t\terr = file_fat_read(\n@@ -143,6 +144,8 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image,\n \t\t\treturn 0;\n \t\t} else\n \t\t\tputs(\"spl: falcon_args_file not set in environment, falling back to default\\n\");\n+#endif\n+\n \t} else\n \t\tputs(\"spl: falcon_image_file not set in environment, falling back to default\\n\");\n \n@@ -154,6 +157,7 @@ defaults:\n \tif (err)\n \t\treturn err;\n \n+#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS)\n \terr = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME,\n \t\t\t    (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0);\n \tif (err <= 0) {\n@@ -161,6 +165,7 @@ defaults:\n \t\t       CONFIG_SPL_FS_LOAD_ARGS_NAME, err);\n \t\treturn err;\n \t}\n+#endif\n \n \treturn 0;\n }\ndiff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c\nindex 93ef2d1c02c..1e5c0fd5be9 100644\n--- a/common/spl/spl_nand.c\n+++ b/common/spl/spl_nand.c\n@@ -79,7 +79,7 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,\n static int spl_nand_load_image_os(struct spl_image_info *spl_image,\n \t\t\t\t  struct spl_boot_device *bootdev)\n {\n-\tint *src, *dst, err;\n+\tint err;\n \tstruct legacy_img_hdr *header = spl_get_load_buffer(0, sizeof(*header));\n \n \t/* load linux */\n@@ -101,12 +101,14 @@ static int spl_nand_load_image_os(struct spl_image_info *spl_image,\n \tif (err)\n \t\treturn err;\n \n+#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS)\n \t/*\n \t * load parameter image load to temp position since nand_spl_load_image\n \t * reads a whole block which is typically larger than\n \t * CONFIG_CMD_SPL_WRITE_SIZE therefore may overwrite following sections\n \t * like BSS\n \t */\n+\tint *src, *dst;\n \tnand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS, CONFIG_CMD_SPL_WRITE_SIZE,\n \t\t\t    (void *)CONFIG_TEXT_BASE);\n \t/* copy to destintion */\n@@ -116,6 +118,7 @@ static int spl_nand_load_image_os(struct spl_image_info *spl_image,\n \t     src++, dst++) {\n \t\twritel(readl(src), dst);\n \t}\n+#endif\n \n \treturn 0;\n }\ndiff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c\nindex cbc864809fe..e3b2074b527 100644\n--- a/common/spl/spl_spi.c\n+++ b/common/spl/spl_spi.c\n@@ -61,10 +61,15 @@ static int spl_spi_load_image_os(struct spl_image_info *spl_image,\n \tif (err)\n \t\treturn err;\n \n+#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS)\n \t/* Read device tree. */\n \treturn spi_flash_read(flash, CONFIG_SYS_SPI_ARGS_OFFS,\n \t\t\t      CONFIG_SYS_SPI_ARGS_SIZE,\n \t\t\t      (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR);\n+#else\n+\treturn 0;\n+#endif\n+\n }\n #endif\n \ndiff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c\nindex 3c6f80de7d9..a66ada2166c 100644\n--- a/common/spl/spl_ubi.c\n+++ b/common/spl/spl_ubi.c\n@@ -22,10 +22,14 @@ int spl_ubi_load_image_os(struct spl_image_info *spl_image,\n \n \tvolumes[0].vol_id = CONFIG_SPL_UBI_LOAD_KERNEL_ID;\n \tvolumes[0].load_addr = (void *)CONFIG_SYS_LOAD_ADDR;\n+#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS)\n \tvolumes[1].vol_id = CONFIG_SPL_UBI_LOAD_ARGS_ID;\n \tvolumes[1].load_addr = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR;\n \n \terr = ubispl_load_volumes(info, volumes, 2);\n+#else\n+\terr = ubispl_load_volumes(info, volumes, 1);\n+#endif\n \tif (err)\n \t\treturn err;\n \ndiff --git a/include/system-constants.h b/include/system-constants.h\nindex e09fc418a47..908bf16d0b4 100644\n--- a/include/system-constants.h\n+++ b/include/system-constants.h\n@@ -37,7 +37,7 @@\n \tIF_ENABLED_INT(CONFIG_SPL_SYS_MALLOC, CONFIG_SPL_SYS_MALLOC_SIZE)\n \n /* deal with an optional value */\n-#ifdef CONFIG_SPL_OS_BOOT\n+#if IS_ENABLED(CONFIG_SPL_OS_BOOT_ARGS)\n #define SPL_PAYLOAD_ARGS_ADDR\tCONFIG_SPL_PAYLOAD_ARGS_ADDR\n #else\n #define SPL_PAYLOAD_ARGS_ADDR\t0\n",
    "prefixes": [
        "v2",
        "1/3"
    ]
}