From patchwork Tue Jul 10 13:29:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristian Amlie X-Patchwork-Id: 941994 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=northern.tech Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=northern.tech header.i=@northern.tech header.b="JnkcK0s0"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41Q32w3pk1z9s00 for ; Tue, 10 Jul 2018 23:29:44 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2BCDBC21E3B; Tue, 10 Jul 2018 13:29:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 853CDC21E2C; Tue, 10 Jul 2018 13:29:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BE273C21C29; Tue, 10 Jul 2018 13:29:06 +0000 (UTC) Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by lists.denx.de (Postfix) with ESMTPS id 60F4BC21C29 for ; Tue, 10 Jul 2018 13:29:06 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id r13-v6so16714041ljg.10 for ; Tue, 10 Jul 2018 06:29:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=northern.tech; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=ew66Coj9vPaAQ5gQH30UMa5u7VxtcWd2ezIPFxdMUTc=; b=JnkcK0s0ss9pnMxPontbda0puaEL1K/oAzc+NDRKT2bAfROB8QfEUkyT3nc+UfmPrR sjF2moYe+MsczhiADzVWifj6KjOy/X9oB+O5HtPrEatHuDVguSR9R34P/Cnj7ND30mSa 9VxihgEvhNkDnwRSPg0zhMfGrzG+KmW1yyqPpNEa/1mgG66YrudyYAG/4w1bGQc7pCdF uVm1AvipfStdvrMX3SxloFkUag5Inp4q3Sn1oBdl8dxay7RO6X26wdpiGUWo4yvFlrNP YUiFGdZx0PZ8TgOkvzPqdUGJBFdP+KGTe2bV7/xtkpYoxMezFqeFa6eTxkdqbDcTY7m7 2Zzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ew66Coj9vPaAQ5gQH30UMa5u7VxtcWd2ezIPFxdMUTc=; b=Oj+tv0qkRBjUuYLPDDZoPeeojJTF/OLOIrv4mMjlXJWUtCSnRnH5G/ExRD+mVJV63S Q4NOtij4axKvilWV2GuNAaghofYeIoUeTshG7zag0fgvttSGKS98Ky2MUpJX2eMFKLaw 730pHm6chEJmgLebZNQfgnF0FCPox6YurG/EjVlO2F0mjCpoo5JIFVzxz4SPan8MquEQ MgPd1vXoKhJTeNed9GucU/pV7z5EEoXPWC8WKCIlvGnwKiouDFNYh9BaCxtCwI99uKXE OFnrC0HwW2aNLhylfNbbea5nRhhG7eLx+DdzDxw+ZPlP7eGvP7pFrt9ze3v7cGpWroq8 THNA== X-Gm-Message-State: APt69E20xdofUFIsQ4ZyvL2pIcJCodOvBgK8adVopM+u5l70fJpjcmGZ ctfHHRwGWssbZ66J/EQI8J7NaSLVheg= X-Google-Smtp-Source: AAOMgpeUyn5bg8QclWuJS/AhPi1PrA+BKcdixWgclfAdseGOjqi2zXT9rQpS0rziukswVQrGzwBgUQ== X-Received: by 2002:a2e:3a0e:: with SMTP id h14-v6mr16689840lja.20.1531229345678; Tue, 10 Jul 2018 06:29:05 -0700 (PDT) Received: from localhost.localdomain ([195.159.234.190]) by smtp.googlemail.com with ESMTPSA id g72-v6sm4891031lfg.93.2018.07.10.06.29.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Jul 2018 06:29:05 -0700 (PDT) From: Kristian Amlie To: u-boot@lists.denx.de Date: Tue, 10 Jul 2018 15:29:02 +0200 Message-Id: <1531229342-21401-2-git-send-email-kristian.amlie@northern.tech> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531229342-21401-1-git-send-email-kristian.amlie@northern.tech> References: <1531229342-21401-1-git-send-email-kristian.amlie@northern.tech> Subject: [U-Boot] [PATCH 1/1] distro_bootcmd: Switch bootefi to use loadaddr by default. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" loadaddr is configurable in Kconfig using CONFIG_LOADADDR, while kernel_addr_r is not. Hence, loadaddr is the future. Provide the existing kernel_addr_r as a fallback if loadaddr is not set. Signed-off-by: Kristian Amlie --- include/config_distro_bootcmd.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index d672e8e..839afcc 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -129,12 +129,15 @@ "else " \ "bootefi bootmgr ${fdtcontroladdr};" \ "fi;" \ + "if test -z \"${loadaddr}\"; then " \ + "setenv loadaddr ${kernel_addr_r};" \ + "fi;" \ "load ${devtype} ${devnum}:${distro_bootpart} " \ - "${kernel_addr_r} efi/boot/"BOOTEFI_NAME"; " \ + "${loadaddr} efi/boot/"BOOTEFI_NAME"; " \ "if fdt addr ${fdt_addr_r}; then " \ - "bootefi ${kernel_addr_r} ${fdt_addr_r};" \ + "bootefi ${loadaddr} ${fdt_addr_r};" \ "else " \ - "bootefi ${kernel_addr_r} ${fdtcontroladdr};" \ + "bootefi ${loadaddr} ${fdtcontroladdr};" \ "fi\0" \ \ "load_efi_dtb=" \ @@ -277,12 +280,15 @@ "setenv efi_old_arch ${bootp_arch};" \ "setenv bootp_vci " BOOTENV_EFI_PXE_VCI ";" \ "setenv bootp_arch " BOOTENV_EFI_PXE_ARCH ";" \ - "if dhcp ${kernel_addr_r}; then " \ + "if test -z \"${loadaddr}\"; then " \ + "setenv loadaddr ${kernel_addr_r};" \ + "fi;" \ + "if dhcp ${loadaddr}; then " \ "tftpboot ${fdt_addr_r} dtb/${efi_fdtfile};" \ "if fdt addr ${fdt_addr_r}; then " \ - "bootefi ${kernel_addr_r} ${fdt_addr_r}; " \ + "bootefi ${loadaddr} ${fdt_addr_r}; " \ "else " \ - "bootefi ${kernel_addr_r} ${fdtcontroladdr};" \ + "bootefi ${loadaddr} ${fdtcontroladdr};" \ "fi;" \ "fi;" \ "setenv bootp_vci ${efi_old_vci};" \