From patchwork Thu Jun 4 14:51:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1329 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-il1-f199.google.com (mail-il1-f199.google.com [209.85.166.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id AAFC33F0D3 for ; Thu, 4 Jun 2020 16:52:05 +0200 (CEST) Received: by mail-il1-f199.google.com with SMTP id n2sf4131361ilq.4 for ; Thu, 04 Jun 2020 07:52:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1591282324; cv=pass; d=google.com; s=arc-20160816; b=Xn1B736PUUfOoLJPq68cFwdIH+I6IVe/9qP8XEnTOzmjw91uj2vF4JazdqQRyBBoMw ZI22LkKY82O4x/Cv2rHP3watBhNwGnBYzsSGhjihXdAIp5NmeB6swZ9gYSDyGiRLMbqr 3NQfwqQl2uGBnWwfVPdXcuvC1AVQv8Gj9Uq2q7uWx6s16VY7xDUVGa9PTyKKr38GqQCf on/PxeJGOwktuQljHEa5S9aZlFwCutTRI53+7ONtemVOCS8GXpIa2jsphyp+BSih/+fW T7J/EzjzN1J2niYeTxUcWukmQbLpSidaq0qRBR0QYS01C2Ul2fMBiy6NJJnH6MoYcXzP oGOA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Kd4aCMIMItJS7AeuOYVKB0JZuNxu9L5Uzb8ZOkXWzwk=; b=zZwIfYrOu78YGyBxYFpIJzqVpHJb4QbnZBBRA5q4vJu+7zhFhHEC/O41V9Xj3/SQDK IZKmWnuqm12VXI+mL/MnNu3mjJNTY0w1U79jj86eabmBpQCIlqvn4TMaIgnPx49qGPPP yL/NMvRLv27ZBFYLC5gW1HSiLziPUeDa3zQV3YGOyCSNXDHXAfWMJxvIC+mygijdHHhM W8mww2paauR88fLZiK7X9qSyu+oipx+MWKNc1Jp98EOQSALdSHdI1N/Fx3g4dHEQj2Z6 kvGVjqm+SOqC0CrlMoRc3PDu6buuG3VpiWKXfCC4XIZsOne3Wogs5aEhYu1kHS0wqEka cCGQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MBtxAHlP; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=Kd4aCMIMItJS7AeuOYVKB0JZuNxu9L5Uzb8ZOkXWzwk=; b=Ah3gmNHcdvX/ZHdTBbw01m+j/8eUtbCriYVhmNv5THFfBGzinEJ38GVe91LvV1C2/a 9TzQ3fKXksjc9dbilFvnXvvx3zz87jwBmF/0Spj32EIJXe6UZJFLg3DhC2L98Ifn9sJp ODKvKNz7uUN3z0x/FtUY6Ln9BG4VSwxcyIT34= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=Kd4aCMIMItJS7AeuOYVKB0JZuNxu9L5Uzb8ZOkXWzwk=; b=fzTNRTBwPllx/VyaiayORUsXrksFAqAh8aMzT5LFePD3QOQ7H0cW+9l8gJCJS+H44n +4OO/tzSgZs+woj63pAViKwyTqYGDXHrHS+OYD2/HlBtRooLiyZ/wgv62RcFQRbp6NLA fiyBhcEpVbuKZtnCDP6Kn3kAtrS8Dl3wMDo7SkxgTGg/hc+rB2gQnSYPUjMBOwoFGrBS eHZGtLyBdPfpOIr/t633zo2K90VVGoYTnGsA7EDmFOc+F+bQaSyDZEwE10Eyv1E389It keSIoZ5yh4SeIs1BpheekecPL8Ey9NItgN7tjCvQOmQ1/SKR9JO26n5H3c9xucQyLpn4 XoDA== X-Gm-Message-State: AOAM533MA4kEmlm7jq+cfmCei7olBhywzCXEg6qmFRYA1Q85YJS9ddYw 5v6Hbc22DLiNTHG1VuMa50+w+6In X-Google-Smtp-Source: ABdhPJxB+UoI/R7jqw/3YgKaMm58AryXEQzQoVoQtN6qHXH8y4PL9X2RaKgpeFe2jm7OLaa2yflxlA== X-Received: by 2002:a92:ab04:: with SMTP id v4mr4278304ilh.186.1591282323995; Thu, 04 Jun 2020 07:52:03 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a92:9108:: with SMTP id t8ls1619825ild.3.gmail; Thu, 04 Jun 2020 07:52:03 -0700 (PDT) X-Received: by 2002:a92:cb91:: with SMTP id z17mr4202818ilo.305.1591282323377; Thu, 04 Jun 2020 07:52:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591282323; cv=none; d=google.com; s=arc-20160816; b=WFvJjwYBoHSkz3fX32kAG+L735lsAVDe+yTAcwJQTYUWZRa3fd6KQQL9y3c5tm2d/S P9lXwewhB/jFmi6mtC5WqvSDr4tS8iAFWYGM9Eid2Q68fOSIPDcMuOIzs9CMD4gPoCd9 0eYC8OSEWptz1zqfoeN98cGM06R9aDYytMkFuFb8i2UZ45Ai3s8VAdj7i0VNc2jY2k1A kFxU+Z+HxmvPzSUwT06wRj8iCKTsMz13qGtNCZ9+odJKqz+zduk2cU2GSzDIy5uZsRu6 vWuvCIp/CIzp0QuqIRh2p6h1hpcpVBGbkKT8iuU3C9JEeYq4+3+GoE4d+vdPL1GVobQY dn8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=xOZD5a5BKPNBvSCMbNYcHacgo1bsu/9VtngWLQjb1VE=; b=MnuoHehXAkCWdhZV1v/HKQhR21on/Wc0WAzEomJaav9LfozQB8AWHu201ajUJHJdVB aEvz/dTCKTEm1utICClnoXMiw4qxdAMDGyiJfFHJFNTmbtZQ9jFdv/rUN60hev+W4XsN xwKOHBggCFHMoQs2JsX4Ar61fA9T9L7pW5KZ11uuxVJGZWlklKkA7ryQxz1fVH87Udvp Y605LCe6PQftHqEtTYTv5aggVWFhzBhtn8YZJbmZ6wo3O43nESf3Qs14uk/gYaHx2VAR EQlBz7sxzVQbiCTpdGIAYaBp4yEUUfMrIT2Cb6Lr4vi5u/z2HNxLPVpWARAO8DvUtIkv BwrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MBtxAHlP; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id k128sor5075432iof.97.2020.06.04.07.52.03 for (Google Transport Security); Thu, 04 Jun 2020 07:52:03 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a63:fb14:: with SMTP id o20mr4863896pgh.144.1591282323037; Thu, 04 Jun 2020 07:52:03 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:41f4:94a8:1af3:a574]) by smtp.gmail.com with ESMTPSA id 2sm4831283pfz.39.2020.06.04.07.51.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2020 07:52:02 -0700 (PDT) From: Jagan Teki To: Kever Yang , Philipp Tomsich , Simon Glass , Hugh Cole-Baker Cc: Suniel Mahesh , U-Boot-Denx , linux-rockchip@lists.infradead.org, linux-amarula , Jagan Teki Subject: [PATCH v3 2/4] roc-rk3399-pc: Mark default env from SPI Date: Thu, 4 Jun 2020 20:21:39 +0530 Message-Id: <20200604145141.356702-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200604145141.356702-1-jagan@amarulasolutions.com> References: <20200604145141.356702-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MBtxAHlP; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Mark the default U-Boot environment as SPI flash since this is an on board flash device. Updated env offset, size in contrast with default since the U-Boot proper has to start from 384K. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Changes for v3: - updated env settings configs/roc-pc-mezzanine-rk3399_defconfig | 6 ++++-- configs/roc-pc-rk3399_defconfig | 6 ++++-- include/configs/roc-pc-rk3399.h | 4 ---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig index 1c1539bcb9..3b91c25ff4 100644 --- a/configs/roc-pc-mezzanine-rk3399_defconfig +++ b/configs/roc-pc-mezzanine-rk3399_defconfig @@ -1,7 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 -CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_ENV_SIZE=0x6000 +CONFIG_ENV_OFFSET=0x460000 +CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROC_PC_RK3399=y CONFIG_NR_DRAM_BANKS=1 @@ -25,7 +27,7 @@ CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc-mezzanine" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig index 76e76c160e..6edd4a8822 100644 --- a/configs/roc-pc-rk3399_defconfig +++ b/configs/roc-pc-rk3399_defconfig @@ -1,7 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 -CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_ENV_SIZE=0x6000 +CONFIG_ENV_OFFSET=0x460000 +CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROC_PC_RK3399=y CONFIG_NR_DRAM_BANKS=1 @@ -24,7 +26,7 @@ CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/include/configs/roc-pc-rk3399.h b/include/configs/roc-pc-rk3399.h index d4cbc3532e..59fe22289c 100644 --- a/include/configs/roc-pc-rk3399.h +++ b/include/configs/roc-pc-rk3399.h @@ -13,10 +13,6 @@ #include -#if defined(CONFIG_ENV_IS_IN_MMC) -# define CONFIG_SYS_MMC_ENV_DEV 0 -#endif - #define SDRAM_BANK_SIZE (2UL << 30) #endif