From patchwork Mon Jun 8 18:17:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1342 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 664C13F1D2 for ; Mon, 8 Jun 2020 20:17:35 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id f14sf3455693pfd.2 for ; Mon, 08 Jun 2020 11:17:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1591640254; cv=pass; d=google.com; s=arc-20160816; b=hRZnL6TISCG58UQQTamMO3lG/0HThzQLlrmGDH94vE8vLsTfTH/A2VIIEVYKEeUYWQ HaymwT4Jlz9QskPLcZwzC6d1bOz6HiW3b+j6SuUCL6iPmXI+CrPO+0tx0DZdHMEVY7pd TBkY9q9dDTnrQ0nOr2ijixsuzPQvckzOGmOe6RoZGsMnahvuh5npS4NO0H5ScE7yHqdp AGf0Rht0SNyHYoKV1jkJZndHCeuefkdhC2jBnp7e2Kl3AXiwImmByOgZCGmrY0hk9OwI OjYeYXHYxewOiidf9F42YT/HvkMZCO9cBCpHIolGHdXg09O7CEnVdXVTFFNqnLx2nuAU YBjQ== 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=3z5jddru1un8S2tqxT5tOjgoXBq+8n+Zh0k+CXrSc/o=; b=g2e1GCrDx5pO13ZTITxj5dEJsh/EuqBk6YF3HXyYJfEsq1uxC+hnYgxcOqCwDGz/pz kvOulg74m6UIde5WOup3WohihazwDSyZB0e5HKHjy7KIQC/wWf+RhT9AYWJSggrH7Bbk 3eV9dFid5z51bheNbI1WRRZ0CKFTKBsPISSbvzXfXDgzL6wxhQnqeVvZJ3ukXXpvJ5ZP DzB7p2g8ZN9jHBWLYVGn3fM3Q/bTbcO4ksNQBQAKd6hUThW6uBOqXrCXrqYSs+1Yfn2L 4bZScqzrGCvz2Likd07nJ2PgzzkrXMG/7FCE22yLqU4PgoTOFMcWig/rp5eGkCxQVl3A ZAqw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BqSAR8s6; 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=3z5jddru1un8S2tqxT5tOjgoXBq+8n+Zh0k+CXrSc/o=; b=kx1XgfNKlSIzFnVfJatalHoYq2d+GvliW8ZuqFB1gBOpNQTNs5quAmf0IrRaiAYMuu YsP/LlmW6TRospwPt9thajL4bttnhEEsBZJwwvwJgPKZpeidoW3vUEUzW7P5LfP6ntds WoY/HDWjvMehgbDHe2rIUIa2gzU+kmPTYAJi8= 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=3z5jddru1un8S2tqxT5tOjgoXBq+8n+Zh0k+CXrSc/o=; b=TLSu/kg7VbS7jDfPUZiMazkhzio4nGAtHmLRVNGKSg3mHOiKOCIa1UI270MBf0In9G EK3I9P1Qym8FUvg4Pkjm/8WedO0Eg8RbIxXS0v0VlhN68XBYhrpg1ENVaRqQ38t400q3 CxQyq1cwAJfzzMkXheZTz7wyIBwcpv9hqkx1NgvCvV7gDlIdJ6IiCNYlRtwVJ8hKCgEa bP7qu7MsRETWrMegoxDmCjajgMA1GZHALHj3KKrz1Xi+uyARa9lsv93iOxZAZOACJKTl wVxyO4jPdjneICL8rT4ryf0wnLijyJbLtrRHevwS+RLEN9PxYhLKGqvnjVyxEFWo0Xqt +9dQ== X-Gm-Message-State: AOAM531bJS4Dy6xrHnyz5cp/emuFo4v093jPxzavU634qxmEoRCH7Krh Np6Zhr+h/VLmNDRQjHDudW1eR1k1 X-Google-Smtp-Source: ABdhPJxS68O9SDVbAsRgebZ0tJdOtht3mE9AB8IYyjP+UeM60Sd8lahgUcYbVQ/NBqqyoup0OUbcCA== X-Received: by 2002:a62:1654:: with SMTP id 81mr22853784pfw.137.1591640253822; Mon, 08 Jun 2020 11:17:33 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90a:e28d:: with SMTP id d13ls133392pjz.3.gmail; Mon, 08 Jun 2020 11:17:32 -0700 (PDT) X-Received: by 2002:a17:902:54f:: with SMTP id 73mr86907plf.76.1591640250066; Mon, 08 Jun 2020 11:17:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591640250; cv=none; d=google.com; s=arc-20160816; b=v5z8ahUdzIS2YIqnmQ0hFqlZoV38rVmwDXX2HuKszndoiYq4JROniRoqmoaRAszGBX JlZm5WNdm8n8NgAePAPZGMDJQFIBubpXu1SpSuuezqKHtVEF1H9B/ZSPKPRWUaTTPj6i SNxdgsPkkkE47ezvXzAcYymSEB+KHrccK3RGdsxv0WNJk/i6DcPbZ5KgZyDid2s5QQIw WoUz/5QHJSw4Lfdeo3eT6zc/BVKnGsaV/9xPt89dUT8QJqGdjxuZoPE7nDtzPv2VxHL1 HPhPa8RZmKy+Xm96UYcdxmX7pp0H9b8nMWb7YxcysoLndPUsqdcn3Lbd7/UztOEkoT9Q DfcA== 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=bQNlycZ9vokq5UGlruxRZJSdM1/o76P/8ylJFTjzz5Y=; b=GC//JoXaXWvVKLzcIMvtIfMFvWcmuAXcAcKX0ZgUtSXrN1fSRVTvnxLaM8VqMKhkhp mTU7Tmpy/rI928cmT3mfrNb8R50xwcOmdkZxNbjOzwSN5m8PhKeam8NSOgkp8WT+vk8H VaAOBK16FVQKMMI72hAISkVu8jF4X3SCLemGvqKdW5zNVJO1m42ywVXRRNpMpmuXbZ8r CY4VaFD/poQlHxX2yWTbUCGW+hV2yTSBq/iWRQNZHTLY//ruXnkfDZS0X+JL36NiK9y9 UM+qMOAtYGZIblEQ/uXTU9x/O7PKoH2MGOC0hhhCeAshodHAZ6ox26KvL4bpeMtNdDuC UA8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BqSAR8s6; 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 h17sor10731009pgn.37.2020.06.08.11.17.30 for (Google Transport Security); Mon, 08 Jun 2020 11:17:30 -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:4a1d:: with SMTP id x29mr20750552pga.53.1591640249774; Mon, 08 Jun 2020 11:17:29 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:9043:af95:b7b4:3ade]) by smtp.gmail.com with ESMTPSA id t7sm180213pju.42.2020.06.08.11.17.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 11:17:29 -0700 (PDT) From: Jagan Teki To: Kever Yang , Philipp Tomsich , Simon Glass Cc: Suniel Mahesh , U-Boot-Denx , linux-rockchip@lists.infradead.org, linux-amarula , Jagan Teki Subject: [PATCH v4 2/4] roc-rk3399-pc: Mark default env from SPI Date: Mon, 8 Jun 2020 14:17:06 -0400 Message-Id: <20200608181708.17842-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200608181708.17842-1-jagan@amarulasolutions.com> References: <20200608181708.17842-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=BqSAR8s6; 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 starting from 384K. Signed-off-by: Jagan Teki --- Changes for v4: - adjust env offset, size configs/roc-pc-mezzanine-rk3399_defconfig | 4 +++- configs/roc-pc-rk3399_defconfig | 4 +++- include/configs/roc-pc-rk3399.h | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig index 1c1539bcb9..9c6fd0c98c 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_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 +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..b225eb38fe 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_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 +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