From patchwork Sun Aug 30 22:55:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 52876 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id 2464F22EBF for ; Sun, 30 Aug 2015 22:58:50 +0000 (UTC) Received: by labth1 with SMTP id th1sf34403344lab.2 for ; Sun, 30 Aug 2015 15:58:49 -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=WP6yxryfSQUrQjNbOB1KmtLSM1zmZ3UQ/M90sW5vd4Q=; b=Tzh1LBrpHemIXyGcSfOdcJyFEcUQFt1yFCy6tgrdTxCWR8S0YY1FNZjYSCFo492Cl/ TR+y0EXurXRayOPeEKpkZNcwW3vSu+bfTUape1UyzyLYNvMVJHF0BFSnhix1aBLirP6W XDQt9Gp2FNbtcmQk4atIy732DTQJ8SL7oM+iPXw3jsdp7QmdA8W0rpwe8g/CFasQhSTV K2FS9hK5TIJ5OvWP5uhwCbgzfgb8pjPvmBQeGec5ubXrX4SxZwyiG6LDvqeBJ9KAtfXC 5OPuC/8ol20cDf+RUUqTfNePMNnZvKYYn2AAABkb9KUczSos+cfo85RiJ4XK7Y/l5n1g /ZeQ== X-Gm-Message-State: ALoCoQmvACHAmIe7rCq4qQSbaEsq7WraEYCWjIg5MBWUBBGFTwJ7bZBHJYXXEXJDS9xjWQfKmS/c X-Received: by 10.112.17.106 with SMTP id n10mr5465987lbd.18.1440975529131; Sun, 30 Aug 2015 15:58:49 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.133 with SMTP id b5ls169774laa.99.gmail; Sun, 30 Aug 2015 15:58:49 -0700 (PDT) X-Received: by 10.112.16.73 with SMTP id e9mr9155807lbd.65.1440975528992; Sun, 30 Aug 2015 15:58:48 -0700 (PDT) Received: from mail-la0-x229.google.com (mail-la0-x229.google.com. [2a00:1450:4010:c03::229]) by mx.google.com with ESMTPS id bw10si11764353lbc.114.2015.08.30.15.58.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Aug 2015 15:58:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::229 as permitted sender) client-ip=2a00:1450:4010:c03::229; Received: by labnh1 with SMTP id nh1so35850362lab.3 for ; Sun, 30 Aug 2015 15:58:48 -0700 (PDT) X-Received: by 10.112.125.34 with SMTP id mn2mr7248790lbb.76.1440975528891; Sun, 30 Aug 2015 15:58:48 -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 us2csp1270847lbb; Sun, 30 Aug 2015 15:58:48 -0700 (PDT) X-Received: by 10.180.75.243 with SMTP id f19mr16228668wiw.52.1440975528028; Sun, 30 Aug 2015 15:58:48 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id hs8si17952420wib.89.2015.08.30.15.58.47; Sun, 30 Aug 2015 15:58:48 -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 400124B861; Mon, 31 Aug 2015 00:58:19 +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 dt1KABf2Ahs6; Mon, 31 Aug 2015 00:58:19 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8D5254B7E0; Mon, 31 Aug 2015 00:57:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EB13D4B68A for ; Mon, 31 Aug 2015 00:56:23 +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 IGnZVKAd_-BP for ; Mon, 31 Aug 2015 00:56: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 mail-ig0-f173.google.com (mail-ig0-f173.google.com [209.85.213.173]) by theia.denx.de (Postfix) with ESMTPS id 470D84B70C for ; Mon, 31 Aug 2015 00:56:16 +0200 (CEST) Received: by igui7 with SMTP id i7so45847131igu.1 for ; Sun, 30 Aug 2015 15:56:16 -0700 (PDT) X-Received: by 10.50.17.9 with SMTP id k9mr12277616igd.93.1440975375821; Sun, 30 Aug 2015 15:56:15 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id rq3sm9267333igb.1.2015.08.30.15.56.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Aug 2015 15:56:15 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id CFA1F221E29; Sun, 30 Aug 2015 16:56:11 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 30 Aug 2015 16:55:48 -0600 Message-Id: <1440975352-28528-38-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.5.0.457.gab17608 In-Reply-To: <1440975352-28528-1-git-send-email-sjg@chromium.org> References: <1440975352-28528-1-git-send-email-sjg@chromium.org> Cc: huangtao , Andre Przywara , cwx Subject: [U-Boot] [PATCH v5 37/41] 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-Original-Sender: sjg@chromium.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::229 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@google.com; dmarc=fail (p=NONE dis=NONE) header.from=chromium.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Sjoerd Simons 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 Signed-off-by: Simon Glass --- Changes in v5: None Changes in v4: None Changes in v3: None 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 ce7fa75..e8aec28 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -92,6 +92,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