From patchwork Wed Dec 19 11:03:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154251 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4800574ljp; Wed, 19 Dec 2018 03:07:13 -0800 (PST) X-Google-Smtp-Source: AFSGD/XVOOLEpsT2lTXbFgQoJ5KfD2uwSamJy57UlQKq7PIWa8INSp0OPN9lbqjARGgXkam0rDWw X-Received: by 2002:a50:b0e5:: with SMTP id j92mr18378862edd.188.1545217633752; Wed, 19 Dec 2018 03:07:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545217633; cv=none; d=google.com; s=arc-20160816; b=kjfN7lQp/diECOSYXp0foSOcDl1M4nbn/FDkSXIl3771eatEjHrY61WtHPVNYReVae nnX9cGXwpzouK2wOwpoV1zsj9qRDFBG579bcbK66faPF+IxM/o5R6f7AQXN/ccnI68/n ndyJTNPQd+zCiIypa97Llh6t9BVE5TEPxUqDY0lmFa80Kct9FPDYyMTKiuvAQFXD6hd0 KHqtA8tppSD3sMUm+88cqYB9uIhrIOi8u40Oco/V01kpqW7FS17uqkt2GEDYdqumBkAL RymC7Lhy1nbpyIpoC/Y4OkYUqDLsi4RmR6gpnpy7HftfeXQutEahNpBh1FA+rRyOC304 AtHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter; bh=sYeiX0g8Bf/cmMz1DQZmx82mDmrBnC2FwU/vNXjriRU=; b=bs/PEu8lCb9R/KWx9lQXG84JGbGX9oBHdB5t2v8FM9ag4RKdm1WVqDPWIIp7sqEOQ4 7bO24yUevgJ5mPVTy9ci5pUG3at4l+0nNeqFK77i9BZovYYCnyf1EEDKhSqWGVGHy4ce +pP8mz+UPS2loJjFRN5eQNYS71/zxDTiIunoo4Izwt3bftA0gA0eaNyEgEY67y/gSojj BQFPdZI9ou/o+toMgFZWPNdOQWsB3nTnC3+f2FmI+B0+J/KwpfVroFMqcUehIm45rL2F MMU20OIGhWGIt+geue/4Cgj7rwN+sPGP4ALkSMGeV2/BzBScjwXmpguvSbzGgVoFvV40 4Ajw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b="JI/Oid02"; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id k11-v6si2602200ejb.269.2018.12.19.03.07.13; Wed, 19 Dec 2018 03:07:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b="JI/Oid02"; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 60F3CC220AF; Wed, 19 Dec 2018 11:05:24 +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=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 67F5CC220BA; Wed, 19 Dec 2018 11:04:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 76C88C21F49; Wed, 19 Dec 2018 11:04:01 +0000 (UTC) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lists.denx.de (Postfix) with ESMTPS id A0923C22086 for ; Wed, 19 Dec 2018 11:03:57 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id wBJB3SMK001192; Wed, 19 Dec 2018 20:03:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wBJB3SMK001192 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1545217409; bh=z6cP0LHcC788toJ9DNSTXjYYFqdBCWNtOOnbXufiDrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JI/Oid024XH4yAjuMUxLegHj+sM2bSAONWxveniKZ1r9Yw1qvpZ1gCSi/nAEPCVNO X5auRt7p5WvOtOUagKOUa20JlsOPAWcSKaMk7UmRhv/SxwjgGfYmGRUV6QTrzB+d4L xW8wX/pf0J3st08pS5xhm/88XHpDVWWwJBQ0cvP7ugwxpR5Sk4LAdYJDZyzZ+qMU99 SSI4yz5UpWAFd+oiBeCRoNsU1SYzzINDTbBkyYoan8lJWMAVhNVrtKElTuAgJW5vDz PNY9mzgcDmgQiOhKOPIo7tK3vKzfifoNv3+EGmyGVmQAEhqqgjXJnZ6jgs7LRDM2S9 Hyql24MwfOMnw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 19 Dec 2018 20:03:13 +0900 Message-Id: <1545217401-27018-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545217401-27018-1-git-send-email-yamada.masahiro@socionext.com> References: <1545217401-27018-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 1/9] ARM: uniphier: do not modify bootcmd environment variable at run-time 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" Some users might want to modify 'bootcmd' at compile-time by editing include/configs/uniphier.h, but overwriting it at run-time makes it impossible. Instead, set 'bootdev' at run-time, which contains the boot device the system is booting from, then indirectly reference it from 'bootcmd'. It is up to users whether to override 'bootcmd'. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/board_late_init.c | 8 ++++---- configs/uniphier_ld4_sld8_defconfig | 1 + configs/uniphier_v7_defconfig | 1 + configs/uniphier_v8_defconfig | 1 + include/configs/uniphier.h | 4 ++++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 1b871c6..972dbe8 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -66,20 +66,20 @@ int board_late_init(void) switch (uniphier_boot_device_raw()) { case BOOT_DEVICE_MMC1: printf("eMMC Boot"); - env_set("bootcmd", "run bootcmd_mmc0; run distro_bootcmd"); + env_set("bootdev", "emmc"); break; case BOOT_DEVICE_NAND: printf("NAND Boot"); - env_set("bootcmd", "run bootcmd_ubifs0; run distro_bootcmd"); + env_set("bootdev", "nand"); nand_denali_wp_disable(); break; case BOOT_DEVICE_NOR: printf("NOR Boot"); - env_set("bootcmd", "run tftpboot; run distro_bootcmd"); + env_set("bootdev", "nor"); break; case BOOT_DEVICE_USB: printf("USB Boot"); - env_set("bootcmd", "run bootcmd_usb0; run distro_bootcmd"); + env_set("bootdev", "usb"); break; default: printf("Unknown"); diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index 6b9e22a..bede166 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH_UNIPHIER_LD4_SLD8=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_NR_DRAM_BANKS=3 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +CONFIG_BOOTCOMMAND="run ${bootdev}boot" CONFIG_LOGLEVEL=6 CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig index 4c06f27..be4ab7c 100644 --- a/configs/uniphier_v7_defconfig +++ b/configs/uniphier_v7_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_NR_DRAM_BANKS=3 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +CONFIG_BOOTCOMMAND="run ${bootdev}boot" CONFIG_LOGLEVEL=6 CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig index f8f9bdf..6f7c269 100644 --- a/configs/uniphier_v8_defconfig +++ b/configs/uniphier_v8_defconfig @@ -7,6 +7,7 @@ CONFIG_ARCH_UNIPHIER_V8_MULTI=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_NR_DRAM_BANKS=3 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +CONFIG_BOOTCOMMAND="run ${bootdev}boot" CONFIG_LOGLEVEL=6 CONFIG_CMD_CONFIG=y CONFIG_CMD_IMLS=y diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 70f8712..7d14c31 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -171,6 +171,10 @@ "initrd_high=0xffffffffffffffff\0" \ "scriptaddr=0x85000000\0" \ "nor_base=0x42000000\0" \ + "emmcboot=mmcsetn && run bootcmd_mmc${mmc_first_dev}\0" \ + "nandboot=run bootcmd_ubifs0\0" \ + "norboot=run tftpboot\0" \ + "usbboot=run bootcmd_usb0\0" \ "sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&" \ "tftpboot $tmp_addr $second_image && " \ "setexpr tmp_addr $nor_base + 0x70000 && " \