From patchwork Wed Jul 17 03:09:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 259593 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 4B2F22C0169 for ; Wed, 17 Jul 2013 13:11:01 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 79E724A033; Wed, 17 Jul 2013 05:10:45 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 wRJB6BWvjDhn; Wed, 17 Jul 2013 05:10:45 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 72B264A021; Wed, 17 Jul 2013 05:10:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DAA784A021 for ; Wed, 17 Jul 2013 05:10:23 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 d78oi6e9rgU2 for ; Wed, 17 Jul 2013 05:10:18 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=SKIP(-1.5) (only DNSBL check requested) Received: from mail-vb0-f73.google.com (mail-vb0-f73.google.com [209.85.212.73]) by theia.denx.de (Postfix) with ESMTPS id 7195F4A01C for ; Wed, 17 Jul 2013 05:10:12 +0200 (CEST) Received: by mail-vb0-f73.google.com with SMTP id f12so144473vbg.0 for ; Tue, 16 Jul 2013 20:10:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=oKso7JmQLo9qofe1AOrS/yqySRL283ULLAMXLTZl67s=; b=AF4FNJ1TVoeBk66bAE/7rqu5PAIV/FGV1Kc4xSSJ35PuO3o9RM8lsvuZCk60Y/PtOo 32O8FW4IlS9ri5WkhnjBqxsdo0nNGyMWQD4V5c5Vd/jigJbDcZGtuKxvCiAzhObw7hJy x4MNZICtiPOSUx4k7ReiNOwpARrNuDSPxhLnnI318a++ymSlFADDnSPxGulOv0aJEWae toX41LVKa4ln01DJrgo/hC2w+W533iXcuUAFvFtwzPGFWrQOpvgRgiiFkn2/dzTS0YwQ lIf49widfBVoVPcFcHs+KrJ5EHpwcJAsOx9qMKkPyvlyR5SffPvcBqnsy/BQPwU1IteH hK/g== X-Received: by 10.236.170.41 with SMTP id o29mr2491054yhl.53.1374030611381; Tue, 16 Jul 2013 20:10:11 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id n70si1845660yhj.7.2013.07.16.20.10.11 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 16 Jul 2013 20:10:11 -0700 (PDT) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.72.187]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 3EC705A41F8; Tue, 16 Jul 2013 20:10:11 -0700 (PDT) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id CE2401606DA; Tue, 16 Jul 2013 20:10:10 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Tue, 16 Jul 2013 20:09:59 -0700 Message-Id: <1374030601-13568-1-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.8.3 X-Gm-Message-State: ALoCoQnN26Trvfyb+tMc+VpzrrzUi0gd0rfRlV9+qvzHhEEKK/A9+4tD7rgwySS015An6lQ5W3cibCZfWwvk1uX4NbOIC40zJHRlWik67HcclqwKpP93+lkvHKW/d4fvwsr4XpNpEusRc+fN5e/TGsRH3sWkLlzKrTKOxdQTVMo3M6l3AtcgmwttTu7J5jJqlW49FsukOHVq Cc: Tom Rini Subject: [U-Boot] [PATCH 1/3] bootm: Move fixup_silent_linux() earlier in the bootm stages X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 Before the bootm refactor, fixup_silent_linux() was done only in the monolithic bootm case, not in the subcommand case. With the refactor, it is done always, which is good. Unfortunately it is done too late, since it is the PREP or CMDLINE stages that set up the command line for Linux. Move fixup_silent_linux() into the LOADOS stage, which is where we find out the OS being used, and can thus decide whether to perform this step. Signed-off-by: Simon Glass --- common/cmd_bootm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index c18157c..c0eabd2 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -542,10 +542,6 @@ static int boot_selected_os(int argc, char * const argv[], int state, bootm_start_standalone(argc, argv); return 0; } -#ifdef CONFIG_SILENT_CONSOLE - if (images->os.os == IH_OS_LINUX) - fixup_silent_linux(); -#endif arch_preboot_os(); boot_fn(state, argc, argv, images); if (state == BOOTM_STATE_OS_FAKE_GO) /* We expect to return */ @@ -656,6 +652,10 @@ static int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, goto err; else if (ret == BOOTM_ERR_OVERLAP) ret = 0; +#ifdef CONFIG_SILENT_CONSOLE + if (images->os.os == IH_OS_LINUX) + fixup_silent_linux(); +#endif } /* Relocate the ramdisk */