{"id":2222301,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2222301/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/758243098fff1c2fc1b486dbb590922a822a4167.1775829166.git.jcethrid@gmail.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/projects/18/?format=json","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":"<758243098fff1c2fc1b486dbb590922a822a4167.1775829166.git.jcethrid@gmail.com>","list_archive_url":null,"date":"2026-04-10T13:58:07","name":"[v4,12/14] arm: sc5xx: Remove SC5XX_LOADADDR","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"99f1b7f94ea8754039895501bbee00290e19b79e","submitter":{"id":92590,"url":"http://patchwork.ozlabs.org/api/1.2/people/92590/?format=json","name":"Caleb Ethridge","email":"jcethrid@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/758243098fff1c2fc1b486dbb590922a822a4167.1775829166.git.jcethrid@gmail.com/mbox/","series":[{"id":499534,"url":"http://patchwork.ozlabs.org/api/1.2/series/499534/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=499534","date":"2026-04-10T13:57:55","name":"sc5xx Environment Cleanup and Fixes","version":4,"mbox":"http://patchwork.ozlabs.org/series/499534/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222301/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222301/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=WTDkkGVx;\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=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=\"WTDkkGVx\";\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\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 4ft4Zg5bsdz1y2d\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 11 Apr 2026 17:10:51 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 8C86384246;\n\tSat, 11 Apr 2026 09:09:07 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 0BBBF84198; Fri, 10 Apr 2026 15:58:52 +0200 (CEST)","from mail-qt1-x843.google.com (mail-qt1-x843.google.com\n [IPv6:2607:f8b0:4864:20::843])\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 77ABD84105\n for <u-boot@lists.denx.de>; Fri, 10 Apr 2026 15:58:48 +0200 (CEST)","by mail-qt1-x843.google.com with SMTP id\n d75a77b69052e-50d63635d80so16673911cf.0\n for <u-boot@lists.denx.de>; Fri, 10 Apr 2026 06:58:48 -0700 (PDT)","from cethr-l01.localdomain ([136.56.120.109])\n by smtp.gmail.com with ESMTPSA id\n d75a77b69052e-50dd53f9c16sm21723141cf.11.2026.04.10.06.58.45\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 10 Apr 2026 06:58:46 -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.2 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,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS\n autolearn=no autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1775829527; x=1776434327; 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=5qSDi642U8Ol68OeASspzKXPINOZMQVDY9n0Ko0lYHc=;\n b=WTDkkGVxSzgw1lo6JdLUrwEvIfo6ZYBwejcmXWtjkrvaAziEuCyvq76D9Ga7hj8vpp\n fGWC/GscJvEOmwp0TfwGIj53tzAs0if0JzMxVxyQGF0qEvwRAKA/owNHirNhrER8Wdal\n yVeNRqzfWBpmaSpgyKWBhrC3JU/YTZ01LT5YJUDjMI8C9NnsxgajUE0HKgCR8CzmR4Gs\n nBML5/QOeemhI2Ti0gCaFTbuTrxW29l8mON8F3ZnXfdmtGVSxkrYmiJTYalcfl34727Z\n L4OAXpXgQADsK720hkB1/V8BI97s56k417oJQU4fCssZNbnsAIJR3FPWiK5vCN61XCZc\n fqFw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775829527; x=1776434327;\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=5qSDi642U8Ol68OeASspzKXPINOZMQVDY9n0Ko0lYHc=;\n b=IXFHVvIxyEdmbmTVigKPfv8ukHDyytVw6oGYfFEBqFdMrA/Zi/Vho/XiaaEOD+UwD4\n j2MrxRs06xxp1dsm9MrSJpnX/dicED/+FWe4iJRHvxX0cuPFMNvEAcAR1Emt/AB3oKyJ\n A13xE3Ry9Fs9B9gmNKBREBWR2w2xDtFm3q9+uZiFVY6pt3GDRQzQI4g0KC/XRHM3Vk1L\n JYf+Xi6EJ2NCEoybLOLauEyh3TH9dTjkP1S/vzZEeI7sMg84ouWgRqTk9tZRwQQBibX0\n +9b3sw8xoH7/S8TYZFwwszMO6t4Lpt9bWURaMF6nx+qf4m1O6Yj0gTgRAtCrVcBL2hbB\n f5UA==","X-Gm-Message-State":"AOJu0YzRRepTO04UeZlk0M2nKo1xde1lKZxHfUbyKXe837ZQ6itbauzU\n 2MR7Oi5w5ewtR8p4uODhogeCeWtOQHcY4oIVE5LZnxQ5r417rAGJabpRBs4I9BD+","X-Gm-Gg":"AeBDieuOYI6NvuweS/5c0b/lu3pzGJ8BZZhtPT6Ra3vWdUKhgQwu3b0dC7K7NYeASSl\n 9xmPhlMbzg+KFUsWj1+lLfO0pzu370ASSaqvqPjjFlLL+v6vJk+30gOiKfJIOvn6SaDbv62vkCc\n iddBgqm38HyLXmXAkx/d2z69Hf5vd+8ZnR4ZkP77gZP3+xim/EKCNcMTacVHesv9TEz+5GeXc22\n xmggPVEK9e1blcJb0pmqoMsjFcNm0SuQATuCSM4om2lff4z2A8Z92oFuUkHQaH6Jkqk965BT89p\n nWcRlHzYc0GhgmaiZFMX9EfzF3mCozbZEK+zGWjp9Y2zafu4/Gvk6NwBvBm4q4k4Yfao5QJmG36\n lvM+2nocfwd000yb0Vg7WR6SwG5fkwxo3On8pa61ggAX9M/HfrUQf2hyiBom5w2hJ140LlOhEzo\n VpMdEjh5mN5S6gdEriwiWt6YFKygLa5t/3r/C1KUIlMYv4","X-Received":"by 2002:ac8:7f01:0:b0:50d:835f:3407 with SMTP id\n d75a77b69052e-50dd5c76543mr47189791cf.45.1775829527030;\n Fri, 10 Apr 2026 06:58:47 -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":"[PATCH v4 12/14] arm: sc5xx: Remove SC5XX_LOADADDR","Date":"Fri, 10 Apr 2026 09:58:07 -0400","Message-Id":"\n <758243098fff1c2fc1b486dbb590922a822a4167.1775829166.git.jcethrid@gmail.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<cover.1775829166.git.jcethrid@gmail.com>","References":"<cover.1775829166.git.jcethrid@gmail.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Mailman-Approved-At":"Sat, 11 Apr 2026 09:08:55 +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\nSC5XX_LOADADDR was an ADI-specific duplicate of standard U-Boot\nload address handling. U-Boot already uses CONFIG_SYS_LOAD_ADDR\nfor the default load address and `loadaddr` for boot commands,\nso keeping separate SC5XX-specific names is redundant.\n\nSigned-off-by: Ozan Durgut <ozan.durgut@analog.com>\nSigned-off-by: Caleb Ethridge <caleb.ethridge@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/sc573-ezlite_defconfig                 |  2 +-\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                   | 18 +++++++++++-------\n 18 files changed, 19 insertions(+), 45 deletions(-)","diff":"diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig\nindex e311a8adf9a..44402b2568d 100644\n--- a/arch/arm/mach-sc5xx/Kconfig\n+++ b/arch/arm/mach-sc5xx/Kconfig\n@@ -140,12 +140,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/sc573-ezlite_defconfig b/configs/sc573-ezlite_defconfig\nindex d3f775b13e8..6fc863cda65 100644\n--- a/configs/sc573-ezlite_defconfig\n+++ b/configs/sc573-ezlite_defconfig\n@@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x100000\n CONFIG_SPL_GPIO=y\n CONFIG_DM_GPIO=y\n CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000\n-CONFIG_SC5XX_LOADADDR=0x83000000\n+CONFIG_SYS_LOAD_ADDR=0x83000000\n CONFIG_WATCHDOG_TIMEOUT_MSECS=60000\n CONFIG_CGU0_CLKOUTSEL=7\n # CONFIG_EFI_LOADER is not set\ndiff --git a/configs/sc584-ezkit_defconfig b/configs/sc584-ezkit_defconfig\nindex 52ab7c9337b..bb24b31b2c0 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 d8982f62d82..d3f0380bfed 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 78b39b6dd73..1bdede4b739 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 23951d0b5f1..4f8be110ee4 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@@ -74,4 +75,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 b4e71b5d2eb..c045c67569b 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@@ -83,4 +84,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 0b47f6febba..d93ed06f65e 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@@ -106,4 +107,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..abf7726ab94 100644\n--- a/include/env/adi/adi_boot.env\n+++ b/include/env/adi/adi_boot.env\n@@ -2,7 +2,6 @@\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  */\n \n #ifdef CONFIG_SC59X_64\n@@ -21,6 +20,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@@ -35,7 +39,7 @@ nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath},tcp,nfs\n nfsboot= run nfsargs;\n \trun addip;\n \twget ${loadaddr} ${serverip}:/fitImage;\n-\tbootm ${loadaddr}\n+\tbootm\n #endif\n \n #if defined(USE_MMC)\n@@ -43,7 +47,7 @@ mmcargs=setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ${adi_bo\n mmcboot=mmc rescan;\n \text4load mmc 0:1 ${loadaddr} /fitImage;\n \trun mmcargs;\n-\tbootm ${loadaddr}\n+\tbootm\n #endif\n \n #if defined(USE_SPI)\n@@ -51,7 +55,7 @@ spiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_boo\n spiboot=run spiargs;\n \tsf probe ${sfdev};\n \tsf read ${loadaddr} ${adi_image_offset} 0xF00000;\n-\tbootm ${loadaddr}\n+\tbootm\n #endif\n \n #if defined(USE_OSPI)\n@@ -59,18 +63,18 @@ ospiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_bo\n ospiboot=run ospiargs;\n \tsf probe ${sfdev};\n \tsf read ${loadaddr} ${adi_image_offset} 0xF00000;\n-\tbootm ${loadaddr}\n+\tbootm\n #endif\n \n #if defined(USE_RAM)\n ramboot= wget ${loadaddr} ${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+\tbootm\n #endif\n","prefixes":["v4","12/14"]}