From patchwork Sat Dec 27 19:10:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matwey V. Kornilov" X-Patchwork-Id: 424247 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 5528E1400D2 for ; Sun, 28 Dec 2014 06:11:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4DF364B616; Sat, 27 Dec 2014 20:11:03 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w-4xFbxVBD8E; Sat, 27 Dec 2014 20:11:03 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A59364B610; Sat, 27 Dec 2014 20:11:02 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B57C94B610 for ; Sat, 27 Dec 2014 20:10:59 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gIhGeWu3pm+o for ; Sat, 27 Dec 2014 20:10:59 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by theia.denx.de (Postfix) with ESMTPS id 7DD304B60B for ; Sat, 27 Dec 2014 20:10:55 +0100 (CET) Received: by mail-lb0-f170.google.com with SMTP id 10so9665846lbg.1 for ; Sat, 27 Dec 2014 11:10:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=QEtlUZ2x8V7cFAI3IjSQuqru7wezVYF5uu8Vk0qb6Wo=; b=xGxyr3FmUllsKwkd3e+ftB+s6TRh4dKHWiSfFoDCLCcUNvwO9X1PTqa+rIAWfgGfQU 6Hqdiaqf7MNi4ieERsy4IAj1firvwS2tWA1gLoudH/pQICrQXwdxp/AHRsgGxQaSLPrz sgtQ1brvHN9JsrlCUehIDrlfzQ0PP16mUMaNc5eDK36TjUzJExnDT+TdzPLAxabnau5Y kazZ5RzPQ2T8gLXnw3usnH9tEXZQ2RHkD3fPKlqeA5fK++xlrOqTgklAJgGFzV8m6ye3 l9tp7LgD4KMITYSJEsGVtXm1tdXkG40O6/YPrDkrJ4zwqoIsT35dcZFqwvhYFPwvh86P +Qbw== X-Received: by 10.112.64.10 with SMTP id k10mr48506443lbs.72.1419707455370; Sat, 27 Dec 2014 11:10:55 -0800 (PST) Received: from oak.local ([92.243.181.209]) by mx.google.com with ESMTPSA id am8sm8291544lac.13.2014.12.27.11.10.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 Dec 2014 11:10:54 -0800 (PST) From: "Matwey V. Kornilov" To: trini@ti.com Date: Sat, 27 Dec 2014 22:10:44 +0300 Message-Id: <1419707444-10999-1-git-send-email-matwey.kornilov@gmail.com> X-Mailer: git-send-email 2.1.2 Cc: u-boot@lists.denx.de, "Matwey V. Kornilov" Subject: [U-Boot] [PATCH] pcm051: Add boot script support to pcm051 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch adds boot script support to pcm051 Signed-off-by: Matwey V. Kornilov --- include/configs/pcm051.h | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 7d102a4..c0bb227 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -45,6 +45,9 @@ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ "bootenv=uEnv.txt\0" \ + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ "importbootenv=echo Importing environment from mmc ...; " \ "env import -t $loadaddr $filesize\0" \ @@ -65,17 +68,21 @@ #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ - "if run loadbootenv; then " \ - "echo Loaded environment from ${bootenv};" \ - "run importbootenv;" \ - "fi;" \ - "if test -n $uenvcmd; then " \ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ - "if run loaduimage; then " \ - "run mmcboot;" \ - "fi;" \ + "if run loadbootscript; then " \ + "run bootscript;" \ + "else " \ + "if run loadbootenv; then " \ + "echo Loaded environment from ${bootenv};" \ + "run importbootenv;" \ + "fi;" \ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ + "if run loaduimage; then " \ + "run mmcboot;" \ + "fi;" \ + "fi ;" \ "fi;" \ /* Clock Defines */