Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7266C4338F for ; Mon, 23 Aug 2021 14:25:45 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BDA9061372 for ; Mon, 23 Aug 2021 14:25:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BDA9061372 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9048C81BC0; Mon, 23 Aug 2021 16:25:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 950CD81BC0; Mon, 23 Aug 2021 16:25:40 +0200 (CEST) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 69453800C1 for ; Mon, 23 Aug 2021 16:25:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f178.google.com with SMTP id m21so19285079qkm.13 for ; Mon, 23 Aug 2021 07:25:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=PO1w5adHy9Nejzz3c/EYHH07WC7cEUALnAujgonF5uA=; b=VlbAcscJF0MmErmu+mNvR+W7LG1dcSEaLIIQpgAamAisTEnbeA+LPK7cpdDKNY7z54 JMVc7ZmgKFJmqNts0OEfTn9bQB5Ii4mUzydU4twQXRGmrA0XTBRcNdleOCyix++949Cn 2kSl+hAdO4I4yP6hf9XVMYiHUgTWIA+64/WF5Npg/JJjBL+DEqf36E31eAJOjBue5Tok sRa2x5uqbFeg7n4F96GnzKRGdKXQxZL2PR3TsMiGxfEPydy41hX0tYdK9iyMTKHqhZRp +25C7H2ePODkKj+MLo79E63DCUhv+9gHvIuDvTKwgcHSY6YzVpKGfN4vQEGqEQp8AQjq Cy7A== X-Gm-Message-State: AOAM5323yo8ShZZ+OQ1dDwXAINBTqub7FxJzHR8EKF8MKT31t63/kloP F6/fuPkho5GeYYm60LnpVcGIoKmLtN3h X-Google-Smtp-Source: ABdhPJxdTXrGLIMRr7q0yXLthlL7vE7fmmW/OIh+5tSYVw0i1rk9fmIrEV/YhtV5y+ngaWxONHCGLA== X-Received: by 2002:a37:6c43:: with SMTP id h64mr21770471qkc.362.1629728734697; Mon, 23 Aug 2021 07:25:34 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-180d-b350-bd40-4e05.res6.spectrum.com. [2603:6081:7b01:cbda:180d:b350:bd40:4e05]) by smtp.gmail.com with ESMTPSA id m16sm8386610qka.84.2021.08.23.07.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 07:25:33 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Bin Meng Subject: [PATCH 1/3] qfw: Switch to CONFIG_SYS_LOAD_ADDR from CONFIG_LOADADDR Date: Mon, 23 Aug 2021 10:25:29 -0400 Message-Id: <20210823142531.5449-1-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean All platforms define CONFIG_SYS_LOAD_ADDR, but only some define CONFIG_LOADADDR. Very very rarely are these not the same address, and qemu-ppce500 is one such case. However, based on reading the history of the code, this mismatched value was simply a copy-paste from other PowerPC platforms where it is this unused currently. Switch the code to use CONFIG_SYS_LOAD_ADDR and update the documentation. Cc: Bin Meng Signed-off-by: Tom Rini --- cmd/qfw.c | 6 +----- doc/usage/qfw.rst | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmd/qfw.c b/cmd/qfw.c index eb6a552f6fad..d58615040c64 100644 --- a/cmd/qfw.c +++ b/cmd/qfw.c @@ -121,11 +121,7 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag, env = env_get("loadaddr"); load_addr = env ? (void *)hextoul(env, NULL) : -#ifdef CONFIG_LOADADDR - (void *)CONFIG_LOADADDR; -#else - NULL; -#endif + (void *)CONFIG_SYS_LOAD_ADDR; env = env_get("ramdiskaddr"); initrd_addr = env ? diff --git a/doc/usage/qfw.rst b/doc/usage/qfw.rst index 87463e1e5bb8..b3704b92d6d9 100644 --- a/doc/usage/qfw.rst +++ b/doc/usage/qfw.rst @@ -26,7 +26,7 @@ The *qfw load* command is used to load a kernel and an initial RAM disk. kernel_addr address to which the file specified by the -kernel parameter of QEMU shall be loaded. Defaults to environment variable *loadaddr* and further to - the value of *CONFIG_LOADADDR*. + the value of *CONFIG_SYS_LOAD_ADDR*. initrd_addr address to which the file specified by the -initrd parameter of QEMU shall -- 2.17.1