From patchwork Fri Nov 18 07:52:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Chen X-Patchwork-Id: 696479 X-Patchwork-Delegate: sjg@chromium.org 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 3tKqwb31Rwz9sCg for ; Fri, 18 Nov 2016 18:52:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D54F34BA16; Fri, 18 Nov 2016 08:52:40 +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 Ard4q9exLuLA; Fri, 18 Nov 2016 08:52:40 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5DC01A7559; Fri, 18 Nov 2016 08:52:35 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7BA724B98A for ; Fri, 18 Nov 2016 08:52:28 +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 DO--D_ilULVv for ; Fri, 18 Nov 2016 08:52:28 +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-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by theia.denx.de (Postfix) with ESMTPS id 05AF04B951 for ; Fri, 18 Nov 2016 08:52:24 +0100 (CET) Received: by mail-pg0-f66.google.com with SMTP id p66so19967669pga.2 for ; Thu, 17 Nov 2016 23:52:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2mR00shaafsuGGzea4uGjj7kIb7avtCpTWaPtT79j/U=; b=WRo1FFYSKX4f0s/tPVvvOwbzLWtvsG8jw9u9xwD1cM7aQEgozZIv2D35p5heo8SBeo w2qO/2BpEHBs7Qb9KOCuHSq6mAbRyCi+Alegyb+x0WXXFK1N2pOfvv6uL19abcghsTQA 1J8MYS7NZtmPJwcgnpxA2pIbFOqGEQ9J9gP3iRAVUFKj4VK4+jGavebuOQJDJAM1zmHV t4cPnZfGYUAIii281SvH4opWPlu9gVWcyGyk5WCMbG4Qmo0KO8h1fWLR1NFetYFGo6cB kj98Agq6OSOEWAR30WXlxgAO+cOkhNnVRl0VVSgdfyxnD44jnPtbNZJzyEPe0tTqeSSn Ba4A== X-Gm-Message-State: ABUngvd2H6OG6kY6C8Sfvy/eR+3oBZ4cZ32QrkLLBEI30Lsnv4rqVwUeBzeQN8y6Z4lRYQ== X-Received: by 10.99.143.90 with SMTP id r26mr16390455pgn.164.1479455542952; Thu, 17 Nov 2016 23:52:22 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id o26sm14527576pfk.91.2016.11.17.23.52.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Nov 2016 23:52:22 -0800 (PST) From: Jacob Chen To: u-boot@lists.denx.de Date: Fri, 18 Nov 2016 15:52:21 +0800 Message-Id: <1479455542-21075-2-git-send-email-jacob2.chen@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1479455542-21075-1-git-send-email-jacob2.chen@rock-chips.com> References: <1479455542-21075-1-git-send-email-jacob2.chen@rock-chips.com> Cc: Jacob Chen , Lin huang Subject: [U-Boot] [PATCH v2 2/3] rockchip: configs: make rk3036 env config same as rk3288 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion 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" To make rockchip soc keep the same partition map Signed-off-by: Jacob Chen --- Changes in v2: - add a commit message include/configs/kylin_rk3036.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h index 4f0bd84..bc28525 100644 --- a/include/configs/kylin_rk3036.h +++ b/include/configs/kylin_rk3036.h @@ -19,9 +19,20 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* emmc */ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ -#define CONFIG_ENV_OFFSET (SZ_4M - SZ_64K) /* reserved area */ -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#define CONFIG_SYS_REDUNDAND_ENVIRONMENT + +#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM +/* SPL @ 32k for 34k + * u-boot directly after @ 68k for 400k or so + * ENV @ 992k + */ +#define CONFIG_ENV_OFFSET ((1024-32) * 1024) +#else +/* SPL @ 32k for ~36k + * ENV @ 96k + * u-boot @ 128K + */ +#define CONFIG_ENV_OFFSET (96 * 1024) +#endif #endif