Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2219232/?format=api
{ "id": 2219232, "url": "http://patchwork.ozlabs.org/api/patches/2219232/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/fd5c3fa01abc2601af1ac11a168ba685526b80b1.1775143241.git.jcethrid@gmail.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": "<fd5c3fa01abc2601af1ac11a168ba685526b80b1.1775143241.git.jcethrid@gmail.com>", "list_archive_url": null, "date": "2026-04-02T15:28:35", "name": "[RESEND,v2,12/13] arm: sc5xx: remove LOADADDR and use kernel_addr_r", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "e88055d1e941cd5c26958d97e5b3782419ece888", "submitter": { "id": 92590, "url": "http://patchwork.ozlabs.org/api/people/92590/?format=api", "name": "Caleb Ethridge", "email": "jcethrid@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/fd5c3fa01abc2601af1ac11a168ba685526b80b1.1775143241.git.jcethrid@gmail.com/mbox/", "series": [ { "id": 498505, "url": "http://patchwork.ozlabs.org/api/series/498505/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=498505", "date": "2026-04-02T15:28:23", "name": "sc5xx Environment Cleanup and Fixes", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/498505/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2219232/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2219232/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 (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=W0WAkuKt;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=85.214.62.61; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b=\"W0WAkuKt\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=gmail.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=jcethrid@gmail.com" ], "Received": [ "from phobos.denx.de (phobos.denx.de [85.214.62.61])\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 4fmmWn2gWDz1yGH\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 03 Apr 2026 02:49:57 +1100 (AEDT)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id AD86D8415D;\n\tThu, 2 Apr 2026 17:48:08 +0200 (CEST)", "by phobos.denx.de (Postfix, from userid 109)\n id 934AF839DF; Thu, 2 Apr 2026 17:29:10 +0200 (CEST)", "from mail-qk1-x744.google.com (mail-qk1-x744.google.com\n [IPv6:2607:f8b0:4864:20::744])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id E35BC83D8A\n for <u-boot@lists.denx.de>; Thu, 2 Apr 2026 17:29:07 +0200 (CEST)", "by mail-qk1-x744.google.com with SMTP id\n af79cd13be357-8cfc085395fso93560885a.2\n for <u-boot@lists.denx.de>; Thu, 02 Apr 2026 08:29:07 -0700 (PDT)", "from cethr-l01.localdomain ([136.56.120.109])\n by smtp.gmail.com with ESMTPSA id\n af79cd13be357-8d2a5393a07sm239037485a.4.2026.04.02.08.29.05\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 02 Apr 2026 08:29:06 -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=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_GMAIL_RCVD,FREEMAIL_FROM,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=no\n autolearn_force=no version=3.4.2", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1775143746; x=1775748546; darn=lists.denx.de;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=dGtz91Zbi+1ltihSubfFj4jXviHR5rGir4ozIvpb5Qg=;\n b=W0WAkuKtD5EAsqwh19wKEaKdiSJp4yPiAHK4qXLmyXWHTHUA/ahit7+xsMdbMBMxbv\n xA0rAeU/l999M4Drc5ZSKQtsO54rV0OjrcJdRZqskiH5PmCfYaWW2dD1jdyYU2/zW4et\n WAXJQVtP3gIWahbyTCUyVyHpVBvlhisgsl28G+krlveqpFB2l39kNn7XEfU414PMo71k\n jeD0kf1+lQH/v4ZuSKvuodloOe4Ywp7tkeyzHlvrjBowaNnjRtxJJy0HAIroRPWNdr1E\n GhDJcxAvNNGZDtAcFaR/2srWoVnK491BJq1lG6ylWcQB3A4BOZg+IUbIVeYoKryLgwiT\n RJuQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775143746; x=1775748546;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=dGtz91Zbi+1ltihSubfFj4jXviHR5rGir4ozIvpb5Qg=;\n b=AE/yqsdEwdgwuyPSEnm8sEKfqNu4pqNvVMCOOIQG9m+ieLHx6lwHVi011QiPYHeDC2\n q0qLlYC+zInHsBuJNwJR41/Ivnz704NG8WR7fGTVeyI8Q5EmXLZT+SnQV/5Qyhh9oJDc\n XKZ8eJfzvxd/yk5uXrJ/3huQgmNT/xrlNS2ZhTgn8nxz2sMmDr4vwEY6mqoDSsNWLuxL\n shk/aYdWKgf8SpZz0sJ5u5CKYCxmv5Us+2pm366yWKBcl22DpN87Bc7Iw2SN1rILmUNS\n MrUQ2eZ4G0ePCrWnaRoog/dMq6lR6n3pXJ39GGiAC5d+PiriJXjkFOlN3yrNdCmor2FH\n Gatw==", "X-Gm-Message-State": "AOJu0Yxanf/QE7OnXZc/HRlvshfnxDK8Mcims6zd4vHNHuyNmhYClD83\n U1SE+qDorE8eS8nRp9V2suow0aX3O1E7SFU4dsE6L9EAkU9bGrsjt169tLNWNGZK", "X-Gm-Gg": "ATEYQzzQyDL7jAUt6hICl6mawztYW7uUTYohCXZN8wspRAMCdHXs7iTjyZbMUn44LMZ\n Cxp9KPb2DxjLNfMjX5tKchORKwf/uYd5IaI8/SAk2t5o8WCh8/PihYJ5hshxqG/9IDieVgLWJlV\n hNIOsoDohYOEg4bUlWk+A1kQKMWUBv1kFzqYRiqyLM5bQalje9IQ/CmgjWpjRSOlYL2vS6iaPUa\n qmCpPHQshNyhfYfRF4ofxLmPMwdoO4sE5SXhdbySXLoXNMWQS5XAxhyYJWWzqedNgENHLFPupx2\n 7Ujz3woTEnqr4lG3irajrxUOXEq01Naprcm4kqCXU0fweaZPkTA9SiGSwhuZRayxvHs0h6eochX\n 988WDhI7pktmDuphVvxPixrGSZqkSWTwZMSD6Lh70FJftDOKI5qFESsI9GSkTkQXWL3zfCKEhcu\n 24+hr52W00wc+n1KzGglK8NlaN0TppnQES1YNrRsc5MpqV", "X-Received": "by 2002:a05:620a:1712:b0:8cd:bff9:67ed with SMTP id\n af79cd13be357-8d1b593a92bmr1165291585a.0.1775143746501;\n Thu, 02 Apr 2026 08:29:06 -0700 (PDT)", "From": "Caleb Ethridge <jcethrid@gmail.com>", "To": "u-boot@lists.denx.de", "Cc": "malysagreg@gmail.com, trini@konsulko.com, linux@analog.com,\n philip@philipmolloy.com, Caleb Ethridge <caleb.ethridge@analog.com>,\n Ozan Durgut <ozan.durgut@analog.com>", "Subject": "[RESEND v2 12/13] arm: sc5xx: remove LOADADDR and use kernel_addr_r", "Date": "Thu, 2 Apr 2026 11:28:35 -0400", "Message-Id": "\n <fd5c3fa01abc2601af1ac11a168ba685526b80b1.1775143241.git.jcethrid@gmail.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<cover.1775143241.git.jcethrid@gmail.com>", "References": "<cover.1775143241.git.jcethrid@gmail.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Approved-At": "Thu, 02 Apr 2026 17:48:00 +0200", "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": "From: Caleb Ethridge <caleb.ethridge@analog.com>\n\nRemove the SC5XX_LOADADDR Kconfig option, replace its users with\nCONFIG_SYS_LOAD_ADDR, and update the ADI boot environment to use\n`kernel_addr_r`.\n\nSC5XX_LOADADDR and the corresponding `loadaddr` usage were ADI-specific\nduplicates of standard U-Boot load address handling. U-Boot already uses\nCONFIG_SYS_LOAD_ADDR for the default load address and `kernel_addr_r`\nfor boot commands, so keeping separate SC5XX-specific names is\nredundant.\n\nSigned-off-by: Ozan Durgut <ozan.durgut@analog.com>\n---\n arch/arm/mach-sc5xx/Kconfig | 6 ----\n board/adi/sc573-ezlite/sc573-ezlite.env | 3 --\n board/adi/sc584-ezkit/sc584-ezkit.env | 3 --\n board/adi/sc589-ezkit/sc589-ezkit.env | 3 --\n board/adi/sc589-mini/sc589-mini.env | 3 --\n board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 3 --\n .../adi/sc594-som-ezlite/sc594-som-ezlite.env | 3 --\n board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 3 --\n .../adi/sc598-som-ezlite/sc598-som-ezlite.env | 3 --\n configs/sc584-ezkit_defconfig | 2 +-\n configs/sc589-ezkit_defconfig | 2 +-\n configs/sc589-mini_defconfig | 2 +-\n configs/sc594-som-ezkit-spl_defconfig | 2 +-\n configs/sc594-som-ezlite-spl_defconfig | 2 +-\n configs/sc598-som-ezkit-spl_defconfig | 2 +-\n configs/sc598-som-ezlite-spl_defconfig | 2 +-\n include/env/adi/adi_boot.env | 32 +++++++++++--------\n 17 files changed, 26 insertions(+), 50 deletions(-)", "diff": "diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig\nindex 776a8548117..3a76e528ee8 100644\n--- a/arch/arm/mach-sc5xx/Kconfig\n+++ b/arch/arm/mach-sc5xx/Kconfig\n@@ -138,12 +138,6 @@ config SC5XX_ROOTFS_OFFSET\n \thelp\n \t The default offset where the rootfs is located.\n \n-config SC5XX_LOADADDR\n-\thex \"Load address\"\n-\tdefault 0x90000000\n-\thelp\n-\t The default load address for u-boot.\n-\n config ADI_IMAGE\n \tstring \"ADI fitImage type\"\n \thelp\ndiff --git a/board/adi/sc573-ezlite/sc573-ezlite.env b/board/adi/sc573-ezlite/sc573-ezlite.env\nindex c909b3b476a..ab1acabef53 100644\n--- a/board/adi/sc573-ezlite/sc573-ezlite.env\n+++ b/board/adi/sc573-ezlite/sc573-ezlite.env\n@@ -3,9 +3,6 @@\n * (C) Copyright 2024 - Analog Devices, Inc.\n */\n \n-adi_image_offset=0xd0000\n-loadaddr=CONFIG_SC5XX_LOADADDR\n-\n #define USE_NFS\n #define USE_SPI\n #define USE_RAM\ndiff --git a/board/adi/sc584-ezkit/sc584-ezkit.env b/board/adi/sc584-ezkit/sc584-ezkit.env\nindex 1090d2731a5..740b7b554cb 100644\n--- a/board/adi/sc584-ezkit/sc584-ezkit.env\n+++ b/board/adi/sc584-ezkit/sc584-ezkit.env\n@@ -3,9 +3,6 @@\n * (C) Copyright 2024 - Analog Devices, Inc.\n */\n \n-adi_image_offset=0xd0000\n-loadaddr=CONFIG_SC5XX_LOADADDR\n-\n #define USE_NFS\n #define USE_SPI\n #define USE_RAM\ndiff --git a/board/adi/sc589-ezkit/sc589-ezkit.env b/board/adi/sc589-ezkit/sc589-ezkit.env\nindex 02567830c16..00f90c7942e 100644\n--- a/board/adi/sc589-ezkit/sc589-ezkit.env\n+++ b/board/adi/sc589-ezkit/sc589-ezkit.env\n@@ -3,9 +3,6 @@\n * (C) Copyright 2024 - Analog Devices, Inc.\n */\n \n-adi_image_offset=0xd0000\n-loadaddr=CONFIG_SC5XX_LOADADDR\n-\n #define USE_NFS\n #define USE_RAM\n #define USE_MMC\ndiff --git a/board/adi/sc589-mini/sc589-mini.env b/board/adi/sc589-mini/sc589-mini.env\nindex 661c130b835..13079ed7527 100644\n--- a/board/adi/sc589-mini/sc589-mini.env\n+++ b/board/adi/sc589-mini/sc589-mini.env\n@@ -3,9 +3,6 @@\n * (C) Copyright 2024 - Analog Devices, Inc.\n */\n \n-adi_image_offset=0xd0000\n-loadaddr=CONFIG_SC5XX_LOADADDR\n-\n #define USE_NFS\n #define USE_RAM\n #define USE_SPI\ndiff --git a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env\nindex f787d972339..324bfae4571 100644\n--- a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env\n+++ b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env\n@@ -3,9 +3,6 @@\n * (C) Copyright 2024 - Analog Devices, Inc.\n */\n \n-adi_image_offset=0x100000\n-loadaddr=CONFIG_SC5XX_LOADADDR\n-\n #define USE_NFS\n #define USE_SPI\n #define USE_OSPI\ndiff --git a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env\nindex 9db35ac8d59..bdbfaf0dabe 100644\n--- a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env\n+++ b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env\n@@ -3,9 +3,6 @@\n * (C) Copyright 2024 - Analog Devices, Inc.\n */\n \n-adi_image_offset=0x100000\n-loadaddr=CONFIG_SC5XX_LOADADDR\n-\n #define USE_NFS\n #define USE_SPI\n #define USE_OSPI\ndiff --git a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env\nindex f787d972339..324bfae4571 100644\n--- a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env\n+++ b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env\n@@ -3,9 +3,6 @@\n * (C) Copyright 2024 - Analog Devices, Inc.\n */\n \n-adi_image_offset=0x100000\n-loadaddr=CONFIG_SC5XX_LOADADDR\n-\n #define USE_NFS\n #define USE_SPI\n #define USE_OSPI\ndiff --git a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env\nindex d5364df1613..c7d7932064a 100644\n--- a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env\n+++ b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env\n@@ -3,7 +3,4 @@\n * (C) Copyright 2024 - Analog Devices, Inc.\n */\n \n-adi_image_offset=0x100000\n-loadaddr=CONFIG_SC5XX_LOADADDR\n-\n #include <env/adi/adi_boot.env>\ndiff --git a/configs/sc584-ezkit_defconfig b/configs/sc584-ezkit_defconfig\nindex 3a55a50544a..c3f6240d07a 100644\n--- a/configs/sc584-ezkit_defconfig\n+++ b/configs/sc584-ezkit_defconfig\n@@ -10,7 +10,7 @@ CONFIG_SPL_STACK=0x200C0000\n CONFIG_SPL_BSS_START_ADDR=0x200A0000\n CONFIG_SPL_BSS_MAX_SIZE=0x8000\n CONFIG_SC58X=y\n-CONFIG_SC5XX_LOADADDR=0x89300000\n+CONFIG_SYS_LOAD_ADDR=0x89300000\n CONFIG_WATCHDOG_TIMEOUT_MSECS=60000\n CONFIG_ADI_BUG_EZKHW21=y\n CONFIG_CGU0_CLKOUTSEL=7\ndiff --git a/configs/sc589-ezkit_defconfig b/configs/sc589-ezkit_defconfig\nindex fbf29ac32bb..82e03093dfb 100644\n--- a/configs/sc589-ezkit_defconfig\n+++ b/configs/sc589-ezkit_defconfig\n@@ -13,7 +13,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000\n CONFIG_SPL_BSS_MAX_SIZE=0x8000\n CONFIG_SC58X=y\n CONFIG_TARGET_SC589_EZKIT=y\n-CONFIG_SC5XX_LOADADDR=0xC3000000\n+CONFIG_SYS_LOAD_ADDR=0xC3000000\n CONFIG_WATCHDOG_TIMEOUT_MSECS=60000\n CONFIG_ADI_USE_DMC1=y\n CONFIG_CGU0_CLKOUTSEL=7\ndiff --git a/configs/sc589-mini_defconfig b/configs/sc589-mini_defconfig\nindex d812e6ec4fa..fc4383f172e 100644\n--- a/configs/sc589-mini_defconfig\n+++ b/configs/sc589-mini_defconfig\n@@ -12,7 +12,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000\n CONFIG_SPL_BSS_MAX_SIZE=0x8000\n CONFIG_SC58X=y\n CONFIG_TARGET_SC589_MINI=y\n-CONFIG_SC5XX_LOADADDR=0xC3000000\n+CONFIG_SYS_LOAD_ADDR=0xC3000000\n CONFIG_WATCHDOG_TIMEOUT_MSECS=60000\n CONFIG_ADI_USE_DMC1=y\n # CONFIG_EFI_LOADER is not set\ndiff --git a/configs/sc594-som-ezkit-spl_defconfig b/configs/sc594-som-ezkit-spl_defconfig\nindex cbed13bbf0d..8c9ab87d042 100644\n--- a/configs/sc594-som-ezkit-spl_defconfig\n+++ b/configs/sc594-som-ezkit-spl_defconfig\n@@ -10,6 +10,7 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000\n CONFIG_SPL_SERIAL=y\n CONFIG_SC59X=y\n CONFIG_TARGET_SC594_SOM_EZKIT=y\n+CONFIG_SYS_LOAD_ADDR=0xA2000000\n # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set\n CONFIG_FIT=y\n CONFIG_FIT_SIGNATURE=y\n@@ -71,4 +72,3 @@ CONFIG_SPL_TIMER=y\n CONFIG_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n-CONFIG_SC5XX_LOADADDR=0xA2000000\ndiff --git a/configs/sc594-som-ezlite-spl_defconfig b/configs/sc594-som-ezlite-spl_defconfig\nindex 9c3f400f8c5..d17c6dacff6 100644\n--- a/configs/sc594-som-ezlite-spl_defconfig\n+++ b/configs/sc594-som-ezlite-spl_defconfig\n@@ -9,6 +9,7 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000\n CONFIG_SPL_SERIAL=y\n CONFIG_SPL_STACK=0x200E4000\n CONFIG_SC59X=y\n+CONFIG_SYS_LOAD_ADDR=0xA2000000\n CONFIG_CGU1_DIV_S1SELEX=16\n CONFIG_CDU0_CLKO10=5\n CONFIG_SF_DEFAULT_BUS=0\n@@ -80,4 +81,3 @@ CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n # CONFIG_SPL_CRC8 is not set\n # CONFIG_TOOLS_MKEFICAPSULE is not set\n-CONFIG_SC5XX_LOADADDR=0xA2000000\ndiff --git a/configs/sc598-som-ezkit-spl_defconfig b/configs/sc598-som-ezkit-spl_defconfig\nindex ea1e0b6202c..3c22ee299b9 100644\n--- a/configs/sc598-som-ezkit-spl_defconfig\n+++ b/configs/sc598-som-ezkit-spl_defconfig\n@@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL=y\n CONFIG_SC59X_64=y\n CONFIG_TARGET_SC598_SOM_EZKIT=y\n CONFIG_SYS_BOOTM_LEN=0x4000000\n+CONFIG_SYS_LOAD_ADDR=0x90000000\n CONFIG_CGU1_PLL3_DDRCLK=y\n CONFIG_CGU1_PLL3_VCO_MSEL=64\n CONFIG_CGU1_PLL3_DCLK_DIV=2\n@@ -108,4 +109,3 @@ CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n # CONFIG_SPL_CRC8 is not set\n # CONFIG_TOOLS_MKEFICAPSULE is not set\n-CONFIG_SC5XX_LOADADDR=0x90000000\ndiff --git a/configs/sc598-som-ezlite-spl_defconfig b/configs/sc598-som-ezlite-spl_defconfig\nindex 585a35d2789..ba53dee1214 100644\n--- a/configs/sc598-som-ezlite-spl_defconfig\n+++ b/configs/sc598-som-ezlite-spl_defconfig\n@@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL=y\n CONFIG_SPL_STACK=0x200E4000\n CONFIG_SC59X_64=y\n CONFIG_SYS_BOOTM_LEN=0x4000000\n+CONFIG_SYS_LOAD_ADDR=0x90000000\n CONFIG_CGU1_PLL3_DDRCLK=y\n CONFIG_CGU1_PLL3_VCO_MSEL=64\n CONFIG_CGU1_PLL3_DCLK_DIV=2\n@@ -103,4 +104,3 @@ CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n # CONFIG_SPL_CRC8 is not set\n # CONFIG_TOOLS_MKEFICAPSULE is not set\n-CONFIG_SC5XX_LOADADDR=0x90000000\ndiff --git a/include/env/adi/adi_boot.env b/include/env/adi/adi_boot.env\nindex 046f4f8a410..76e4d30a242 100644\n--- a/include/env/adi/adi_boot.env\n+++ b/include/env/adi/adi_boot.env\n@@ -2,7 +2,7 @@\n * A target board needs to set these variables for the commands below to work:\n *\n * - adi_image_offset, location of the fitImage on the SPI flash\n- * - loadaddr, where you want to load things\n+ * - kernel_addr_r, where you want to load things\n */\n \n #ifdef CONFIG_SC59X_64\n@@ -12,6 +12,7 @@\n #endif\n \n /* Config options */\n+kernel_addr_r=CONFIG_SYS_LOAD_ADDR\n ethaddr=02:80:ad:20:31:e8\n eth1addr=02:80:ad:20:31:e9\n httpdstp=8000\n@@ -21,6 +22,11 @@ initrd_high=0xffffffffffffffff\n #else\n initrd_high=0xffffffff\n #endif\n+#if defined(CONFIG_SC59X) || defined(CONFIG_SC59X_64)\n+adi_image_offset=0x100000\n+#else\n+adi_image_offset=0xd0000\n+#endif\n \n /* Args for each boot mode */\n adi_bootargs=EARLY_PRINTK console=ttySC0,CONFIG_BAUDRATE vmalloc=512M\n@@ -34,43 +40,43 @@ rootpath=/romfs\n nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath},tcp,nfsvers=3 ${adi_bootargs}\n nfsboot= run nfsargs;\n \trun addip;\n-\twget ${loadaddr} ${serverip}:/fitImage;\n-\tbootm ${loadaddr}\n+\twget ${kernel_addr_r} ${serverip}:/fitImage;\n+\tbootm\n #endif\n \n #if defined(USE_MMC)\n mmcargs=setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ${adi_bootargs}\n mmcboot=mmc rescan;\n-\text4load mmc 0:1 ${loadaddr} /fitImage;\n+\text4load mmc 0:1 ${kernel_addr_r} /fitImage;\n \trun mmcargs;\n-\tbootm ${loadaddr}\n+\tbootm\n #endif\n \n #if defined(USE_SPI)\n spiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_SPI_BUS:CONFIG_SC_BOOT_SPI_SSEL\n spiboot=run spiargs;\n \tsf probe ${sfdev};\n-\tsf read ${loadaddr} ${adi_image_offset} 0xF00000;\n-\tbootm ${loadaddr}\n+\tsf read ${kernel_addr_r} ${adi_image_offset} 0xF00000;\n+\tbootm\n #endif\n \n #if defined(USE_OSPI)\n ospiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_OSPI_BUS:CONFIG_SC_BOOT_OSPI_SSEL\n ospiboot=run ospiargs;\n \tsf probe ${sfdev};\n-\tsf read ${loadaddr} ${adi_image_offset} 0xF00000;\n-\tbootm ${loadaddr}\n+\tsf read ${kernel_addr_r} ${adi_image_offset} 0xF00000;\n+\tbootm\n #endif\n \n #if defined(USE_RAM)\n-ramboot= wget ${loadaddr} ${serverip}:/fitImage;\n+ramboot= wget ${kernel_addr_r} ${serverip}:/fitImage;\n \trun ramargs;\n-\tbootm ${loadaddr}\n+\tbootm\n #endif\n \n #if defined(USE_USB)\n usbargs=setenv bootargs root=/dev/sda2 rw rootfstype=ext4 rootwait ${adi_bootargs}\n usbboot=usb start;\n-\text4load usb 0:1 ${loadaddr} /fitImage; run usbargs;\n-\tbootm ${loadaddr}\n+\text4load usb 0:1 ${kernel_addr_r} /fitImage; run usbargs;\n+\tbootm\n #endif\n", "prefixes": [ "RESEND", "v2", "12/13" ] }