From patchwork Sun Aug 30 17:31:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sjoerd Simons X-Patchwork-Id: 52874 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 7A8072127E for ; Sun, 30 Aug 2015 17:32:22 +0000 (UTC) Received: by lbbpd10 with SMTP id pd10sf31305894lbb.3 for ; Sun, 30 Aug 2015 10:32:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=m3VYtmf60Y8W+ZV6iqlHmOM1uzDs7w6SLU7f0z+0s3M=; b=N8qTjLZUyOqmrDbcoZxNlGyTElT5r/HDZLzqiFcnGJRAoUJ6tcObrzp6Rvf7O6O52A F8w44pBqWoMRN1eC8CNpcrAXIohTp9Ym43zvq/n9+xajGA2nB0zWOBTl1KgI5rs4z0Br kvtbVaiUMp0E0xGWrrV4mLVR/gzhCNHr8S4EUAike643rpdewxidyScb+AaPGeiZOfGo PoFJDrzm7AdCXuopNqfKlCa792hKPsLICgT8FAXMeKaOZZMbo3aJZiPBCx2tPPb6wxD2 6mp0CdyIwnAl5kTzFPO48B6PlPW/PpjbqmCKc9IbKJBr6z1ZLlwyJh8fFE9KXHMB5RME FCVw== X-Gm-Message-State: ALoCoQkRBmRxnHgQu+KTuVTCONaF4Sw+/rotB+NC8AmZjuQnE2pcZsWd543efappOPYWbFfT/pTY X-Received: by 10.112.173.230 with SMTP id bn6mr5179846lbc.15.1440955941452; Sun, 30 Aug 2015 10:32:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.45.100 with SMTP id l4ls406573lam.80.gmail; Sun, 30 Aug 2015 10:32:21 -0700 (PDT) X-Received: by 10.152.28.229 with SMTP id e5mr8709204lah.110.1440955941241; Sun, 30 Aug 2015 10:32:21 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id le2si11263310lbc.154.2015.08.30.10.32.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Aug 2015 10:32:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by laboe4 with SMTP id oe4so32520536lab.0 for ; Sun, 30 Aug 2015 10:32:21 -0700 (PDT) X-Received: by 10.112.168.100 with SMTP id zv4mr8355915lbb.117.1440955941123; Sun, 30 Aug 2015 10:32:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.151.194 with SMTP id us2csp1167942lbb; Sun, 30 Aug 2015 10:32:20 -0700 (PDT) X-Received: by 10.180.211.239 with SMTP id nf15mr16305972wic.13.1440955940326; Sun, 30 Aug 2015 10:32:20 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id gb2si16942790wib.19.2015.08.30.10.32.19; Sun, 30 Aug 2015 10:32:20 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F38F34B727; Sun, 30 Aug 2015 19:32:09 +0200 (CEST) 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 6Uwz1x5SbeNK; Sun, 30 Aug 2015 19:32:09 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 22E864B708; Sun, 30 Aug 2015 19:31:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0CEEE4B681 for ; Sun, 30 Aug 2015 19:31:24 +0200 (CEST) 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 8N-uYyUcxhXb for ; Sun, 30 Aug 2015 19:31:23 +0200 (CEST) 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 bhuna.collabora.co.uk (bhuna.collabora.co.uk [93.93.135.160]) by theia.denx.de (Postfix) with ESMTPS id 059974B67F for ; Sun, 30 Aug 2015 19:31:21 +0200 (CEST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: sjoerd) with ESMTPSA id 249485188059 Received: by dusk.luon.net (Postfix, from userid 1000) id D05B22808E; Sun, 30 Aug 2015 19:31:14 +0200 (CEST) From: Sjoerd Simons To: u-boot@lists.denx.de, Simon Glass Date: Sun, 30 Aug 2015 19:31:11 +0200 Message-Id: <1440955874-25809-6-git-send-email-sjoerd.simons@collabora.co.uk> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1440955874-25809-1-git-send-email-sjoerd.simons@collabora.co.uk> References: <1440955874-25809-1-git-send-email-sjoerd.simons@collabora.co.uk> Cc: Tom Rini Subject: [U-Boot] [PATCH v2 5/8] rockchip: Add config_distro_bootcmd support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: 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" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sjoerd.simons@collabora.co.uk X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Now that MMC works in U-Boot add config distro command support to start Linux in a standard fashion. One oddity here is that linux fails to load when the fdt is relocated to above 512MB, so set fdt_high to make sure it's loaded below that. Signed-off-by: Sjoerd Simons Acked-by: Simon Glass --- Changes in v2: None include/configs/rk3288_common.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index ac0957a..95243b4 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -93,6 +93,27 @@ #ifndef CONFIG_SPL_BUILD #include + +#define ENV_MEM_LAYOUT_SETTINGS \ + "scriptaddr=0x00000000\0" \ + "pxefile_addr_r=0x00100000\0" \ + "fdt_addr_r=0x01f00000\0" \ + "kernel_addr_r=0x02000000\0" \ + "ramdisk_addr_r=0x04000000\0" + +/* First try to boot from SD (index 0), then eMMC (index 1 */ +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) + +#include + +/* Linux fails to load the fdt if it's loaded above 512M on a Rock 2 board, so + * limit the fdt reallocation to that */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_high=0x1fffffff\0" \ + ENV_MEM_LAYOUT_SETTINGS \ + BOOTENV #endif #endif