From patchwork Wed Nov 27 09:33:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21804 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8CE6323FE8 for ; Wed, 27 Nov 2013 09:33:46 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id wo20sf22281389obc.1 for ; Wed, 27 Nov 2013 01:33:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=85f+YIkhEG1cVMMVob+pcqCyG6UWB02l3hnf9juQWNQ=; b=WGGFCiPI7e+qttWwXS21wWyG4K754N5GK1OX4d9VmA6c4vHn/dZOThidYsITJxjSji IUdh4iIYFO4h7XW81q2nKX49rBKDnO6GaFN2UfzpKr5ORU+E/gd9FxtjJMdnyLYr0XeO Bu7gyUk8Rtvfqd+tbjjm27XAlGWOcdnbtrL/OGfGjPxkQl+zthcITGZuyOg3J6vSIBsB HAACtC61WFM3TAqkc+u0LpHHN8mgV9LNb1ETtU+9v4Ebb4ee3y9SNI6F8PjIA6CTXWhB t3JB2XZbNI+dtWPgpXq7Zy6moNrBfgv0Xb8SKYm7UFLWTeyxwdfB8duFGZf4V89ev6wM BxcQ== X-Gm-Message-State: ALoCoQnTdeTqXj2yIyAGJVeZ8l+JsmKgDXpEPgZ5CIW4RbJqUYMNSEUQYtYC8gF64Thh22OyKw+c X-Received: by 10.42.98.81 with SMTP id r17mr10229664icn.8.1385544825342; Wed, 27 Nov 2013 01:33:45 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.41.42 with SMTP id c10ls2194258qel.10.gmail; Wed, 27 Nov 2013 01:33:45 -0800 (PST) X-Received: by 10.58.67.168 with SMTP id o8mr10202123vet.22.1385544825176; Wed, 27 Nov 2013 01:33:45 -0800 (PST) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id ov5si20812971vcb.22.2013.11.27.01.33.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 27 Nov 2013 01:33:45 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so4802088veb.6 for ; Wed, 27 Nov 2013 01:33:45 -0800 (PST) X-Received: by 10.220.70.147 with SMTP id d19mr50781vcj.48.1385544824819; Wed, 27 Nov 2013 01:33:44 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp271809vcz; Wed, 27 Nov 2013 01:33:44 -0800 (PST) X-Received: by 10.112.52.33 with SMTP id q1mr937757lbo.30.1385544823800; Wed, 27 Nov 2013 01:33:43 -0800 (PST) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com [209.85.217.174]) by mx.google.com with ESMTPS id yg9si18859652lbb.158.2013.11.27.01.33.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 27 Nov 2013 01:33:43 -0800 (PST) Received-SPF: neutral (google.com: 209.85.217.174 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.217.174; Received: by mail-lb0-f174.google.com with SMTP id c11so5285055lbj.33 for ; Wed, 27 Nov 2013 01:33:43 -0800 (PST) X-Received: by 10.152.234.37 with SMTP id ub5mr423394lac.51.1385544823035; Wed, 27 Nov 2013 01:33:43 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id o1sm63073366lah.8.2013.11.27.01.33.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Nov 2013 01:33:42 -0800 (PST) From: Linus Walleij To: u-boot@lists.denx.de Cc: Linus Walleij , Stefano Babic , Marek Vasut Subject: [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB Date: Wed, 27 Nov 2013 10:33:32 +0100 Message-Id: <1385544812-22558-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , When U-Boot is configured for Versatile AB, it will still pass the machine ID of Versatile PB to the kernel. After this simple fix the system boots correctly. Cc: Stefano Babic Cc: Marek Vasut Signed-off-by: Linus Walleij --- board/armltd/versatile/versatile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/armltd/versatile/versatile.c b/board/armltd/versatile/versatile.c index 30a3b904db4c..4e2d3421d8b1 100644 --- a/board/armltd/versatile/versatile.c +++ b/board/armltd/versatile/versatile.c @@ -52,7 +52,11 @@ int board_early_init_f (void) int board_init (void) { /* arch number of Versatile Board */ +#ifdef CONFIG_ARCH_VERSATILE_AB + gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_AB; +#else gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB; +#endif /* adress of boot parameters */ gd->bd->bi_boot_params = 0x00000100;