From patchwork Wed Dec 19 11:03:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154256 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4803607ljp; Wed, 19 Dec 2018 03:10:02 -0800 (PST) X-Google-Smtp-Source: AFSGD/U5/O84NV2rFd022E6ntF+WJrxGYiUX+CLIBhZw1QpX4n3F2tKLvXtPVyxhAtTE32gt/I/U X-Received: by 2002:a50:ed03:: with SMTP id j3mr19667643eds.134.1545217802893; Wed, 19 Dec 2018 03:10:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545217802; cv=none; d=google.com; s=arc-20160816; b=EyK2oOMSwLOrpnKeHWgzOu9QbyAsz2Am00WCD5ga5VwDcMrqXE3lluXenG7koKR53H cL0Lapag8Flh9bXzrEIRQThj5FvSpOjBk42PI9o/kmraeMlCxricEqhweYIXjudZ1sJR nMmgFKfw4LCCXNT/c1eowuabZ7GnfkhhyK1QWbyaeUydcKQn7q2w/2mMsLdevC5F3qv+ uzUjjagF5jGltq7C/G6VVfWglD879EMIOSJ9sdU34u2+8OlxfYjuRMvrcokVYm/v95Rd qzwVsUXpV/42C3SCArEmZeh6taerxqRq3wsTxq1nMxGgMyCeHDdTy294duVrMk5KlS6S 7MBw== 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=6keKCbZzOnES+lFgUxyN7+nkzPgavYM6bqy5bACkGns=; b=RzGEhMUKy7QHhSJLRcPT5+dkOgRw8yTW+HIVb6xYJ/p3cI6PqaNnmZvRXLeddkDCSp Y551bfIVylg/aNBGPtzgpGNcMMR0TJqzQsZJZGMG+zCEG/CgVKDfL7eJSTm7wcWckzqQ wg7eDwj3Sr6PE6hkQ2t7IKyPkFYxqV9U8VMEzXdKY/zCAYA/rSXoaqArE/5v5VQRrx7s CRNbdNnPc/COrm5qgSowa4v1epO52eIz7NA1T4J8JY5Ljb60DP5vqTzN665AJA7NYvj3 Tvw5rceTZ/pojFxBwxpo0ulJaexB9KnP4n9wolK0/1TU5mCHY9D2Vi/d61Gqknox1YIE kIkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=GmxIo3lc; 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 o4-v6si300268eju.61.2018.12.19.03.10.02; Wed, 19 Dec 2018 03:10:02 -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=GmxIo3lc; 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 737F5C22026; Wed, 19 Dec 2018 11:06:18 +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 94DD0C220B0; Wed, 19 Dec 2018 11:04:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AA542C22005; 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 D9CFBC220CD 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 wBJB3SML001192; Wed, 19 Dec 2018 20:03:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wBJB3SML001192 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1545217410; bh=CECbF3eqlVXk4SOuXcLcpx/t0SCKRtVEFWWw6K0BEJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GmxIo3lcV0GRhj86iuSjuVFEsD8UsLP0XP2aliciHUoOUkrRHId6xtqqNoSN63QM4 5WsXBKMtt+GGg5dUvhhZf2EXjkDEYUEakyPWBLySRGU+dnfqnUk2kB5T4XKnH6mQOW RMBpj2Y5JaDmUKxPvBnDoTVtC2VhQXk3fbXnLzcoI65immPNbYoTGuWVbiVyzsTVo3 BWb6wc1J7lTHlwxsU++gKzkm4Q7B+KNv4Brnh9CfVBHnCW7dUbNB7Cuqgo1b50OPlT msIKh86OqaOs1TDmCPFQS0AqprYaFKeJ17g+heU533xo6UfUWmTvEr7BLUno6now9h f2bLkPTH6qGTA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 19 Dec 2018 20:03:14 +0900 Message-Id: <1545217401-27018-3-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 2/9] ARM: uniphier: allow to source boot script before distro-boot 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 need additional setups before booting the kernel. If there is found a file 'boot.scr', run it before invoking the distro boot command. Signed-off-by: Masahiro Yamada --- configs/uniphier_ld4_sld8_defconfig | 2 +- configs/uniphier_v7_defconfig | 2 +- configs/uniphier_v8_defconfig | 2 +- include/configs/uniphier.h | 20 ++++++++++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index bede166..98a0017 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -9,7 +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_BOOTCOMMAND="run ${bootdev}script; 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 be4ab7c..bba8e18 100644 --- a/configs/uniphier_v7_defconfig +++ b/configs/uniphier_v7_defconfig @@ -8,7 +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_BOOTCOMMAND="run ${bootdev}script; 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 6f7c269..df6c511 100644 --- a/configs/uniphier_v8_defconfig +++ b/configs/uniphier_v8_defconfig @@ -7,7 +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_BOOTCOMMAND="run ${bootdev}script; 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 7d14c31..1e509ce 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -169,12 +169,32 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "initrd_high=0xffffffffffffffff\0" \ + "script=boot.scr\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" \ + "emmcscript=setenv devtype mmc && " \ + "mmcsetn && " \ + "setenv devnum ${mmc_first_dev} && " \ + "run loadscript_fat\0" \ + "nandscript=echo Running ${script} from ubi ... && " \ + "ubi part UBI && " \ + "ubifsmount ubi0:boot && " \ + "ubifsload ${loadaddr} ${script} && " \ + "source\0" \ + "norscript=echo Running ${script} from tftp ... && " \ + "tftpboot ${script} &&" \ + "source\0" \ + "usbscript=usb start && " \ + "setenv devtype usb && " \ + "setenv devnum 0 && " \ + "run loadscript_fat\0" \ + "loadscript_fat=echo Running ${script} from ${devtype}${devnum} ... && " \ + "load ${devtype} ${devnum}:1 ${loadaddr} ${script} && " \ + "source\0" \ "sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&" \ "tftpboot $tmp_addr $second_image && " \ "setexpr tmp_addr $nor_base + 0x70000 && " \