From: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
To: Kever Yang <kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
Philipp Tomsich
<philipp.tomsich-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org>
Cc: Jagan Teki
<jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>,
u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org,
linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org,
Akash Gajjar <akash-oRp2ZoJdM/RWk0Htik3J/w@public.gmane.org>,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: [PATCH 14/15] rockchip: rk3399: Add bootcount support
Date: Mon, 29 Jul 2019 13:17:10 +0530 [thread overview]
Message-ID: <20190729074711.16988-15-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20190729074711.16988-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
Add bootcount support for Rockchip rk3399.
The bootcount value is preserved in PMU_SYS_REG0 register,
this would help to support redundent boot.
Once the redundant boot triggers, the altboot command
will look for extlinux-rollback.conf on particular
bootable partition which supposed to be a recovery
partition where redundant boot required.
Signed-off-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
---
arch/arm/mach-rockchip/Kconfig | 2 ++
arch/arm/mach-rockchip/rk3399/Kconfig | 10 ++++++++++
include/configs/rk3399_common.h | 5 ++++-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 17f31e89f3..dd5055ed69 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -184,6 +184,8 @@ config ROCKCHIP_RK3399
imply TPL_CLK
imply TPL_TINY_MEMSET
imply TPL_ROCKCHIP_COMMON_BOARD
+ imply SYS_BOOTCOUNT_SINGLEWORD if BOOTCOUNT_LIMIT
+ imply CMD_BOOTCOUNT if BOOTCOUNT_LIMIT
help
The Rockchip RK3399 is a ARM-based SoC with a dual-core Cortex-A72
and quad-core Cortex-A53.
diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig
index 6660d05349..68ac913bcb 100644
--- a/arch/arm/mach-rockchip/rk3399/Kconfig
+++ b/arch/arm/mach-rockchip/rk3399/Kconfig
@@ -91,6 +91,16 @@ config TPL_STACK
config TPL_TEXT_BASE
default 0xff8c2000
+if BOOTCOUNT_LIMIT
+
+config BOOTCOUNT_BOOTLIMIT
+ default 3
+
+config SYS_BOOTCOUNT_ADDR
+ default 0xff3100f0 # PMU_SYS_REG0
+
+endif # BOOTCOUNT_LIMIT
+
source "board/rockchip/evb_rk3399/Kconfig"
source "board/theobroma-systems/puma_rk3399/Kconfig"
source "board/vamrs/rock960_rk3399/Kconfig"
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 67b48e03ba..ace82928d1 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -70,7 +70,10 @@
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
"partitions=" PARTS_DEFAULT \
ROCKCHIP_DEVICE_SETTINGS \
- BOOTENV
+ BOOTENV \
+ "altbootcmd=" \
+ "setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \
+ "run distro_bootcmd\0"
#endif
--
2.18.0.321.gffc6fa0e3
WARNING: multiple messages have this Message-ID (diff)
From: Jagan Teki <jagan@amarulasolutions.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 14/15] rockchip: rk3399: Add bootcount support
Date: Mon, 29 Jul 2019 13:17:10 +0530 [thread overview]
Message-ID: <20190729074711.16988-15-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20190729074711.16988-1-jagan@amarulasolutions.com>
Add bootcount support for Rockchip rk3399.
The bootcount value is preserved in PMU_SYS_REG0 register,
this would help to support redundent boot.
Once the redundant boot triggers, the altboot command
will look for extlinux-rollback.conf on particular
bootable partition which supposed to be a recovery
partition where redundant boot required.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
arch/arm/mach-rockchip/Kconfig | 2 ++
arch/arm/mach-rockchip/rk3399/Kconfig | 10 ++++++++++
include/configs/rk3399_common.h | 5 ++++-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 17f31e89f3..dd5055ed69 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -184,6 +184,8 @@ config ROCKCHIP_RK3399
imply TPL_CLK
imply TPL_TINY_MEMSET
imply TPL_ROCKCHIP_COMMON_BOARD
+ imply SYS_BOOTCOUNT_SINGLEWORD if BOOTCOUNT_LIMIT
+ imply CMD_BOOTCOUNT if BOOTCOUNT_LIMIT
help
The Rockchip RK3399 is a ARM-based SoC with a dual-core Cortex-A72
and quad-core Cortex-A53.
diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig
index 6660d05349..68ac913bcb 100644
--- a/arch/arm/mach-rockchip/rk3399/Kconfig
+++ b/arch/arm/mach-rockchip/rk3399/Kconfig
@@ -91,6 +91,16 @@ config TPL_STACK
config TPL_TEXT_BASE
default 0xff8c2000
+if BOOTCOUNT_LIMIT
+
+config BOOTCOUNT_BOOTLIMIT
+ default 3
+
+config SYS_BOOTCOUNT_ADDR
+ default 0xff3100f0 # PMU_SYS_REG0
+
+endif # BOOTCOUNT_LIMIT
+
source "board/rockchip/evb_rk3399/Kconfig"
source "board/theobroma-systems/puma_rk3399/Kconfig"
source "board/vamrs/rock960_rk3399/Kconfig"
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 67b48e03ba..ace82928d1 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -70,7 +70,10 @@
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
"partitions=" PARTS_DEFAULT \
ROCKCHIP_DEVICE_SETTINGS \
- BOOTENV
+ BOOTENV \
+ "altbootcmd=" \
+ "setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \
+ "run distro_bootcmd\0"
#endif
--
2.18.0.321.gffc6fa0e3
next prev parent reply other threads:[~2019-07-29 7:47 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-29 7:46 [PATCH 00/15] rk3399: Add redundant boot support Jagan Teki
2019-07-29 7:46 ` [U-Boot] " Jagan Teki
[not found] ` <20190729074711.16988-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-07-29 7:46 ` [PATCH 01/15] arm: rockchip: Add common cru.h Jagan Teki
2019-07-29 7:46 ` [U-Boot] " Jagan Teki
[not found] ` <20190729074711.16988-2-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-08-05 12:25 ` Kever Yang
2019-08-05 12:25 ` [U-Boot] " Kever Yang
2019-08-25 17:25 ` Jagan Teki
2019-08-25 17:25 ` [U-Boot] " Jagan Teki
2019-07-29 7:46 ` [PATCH 02/15] rockchip: Add cpu-info Jagan Teki
2019-07-29 7:46 ` [U-Boot] " Jagan Teki
[not found] ` <20190729074711.16988-3-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-08-05 12:27 ` Kever Yang
2019-08-05 12:27 ` [U-Boot] " Kever Yang
2019-07-29 7:46 ` [PATCH 03/15] rockchip: rk3288: Print reset reason Jagan Teki
2019-07-29 7:46 ` [U-Boot] " Jagan Teki
[not found] ` <20190729074711.16988-4-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-07-29 7:57 ` Matthias Urlichs
2019-08-05 12:30 ` Kever Yang
2019-08-05 12:30 ` [U-Boot] " Kever Yang
[not found] ` <98408a3c-84bd-d54b-1b3a-49901c85ba3c-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2019-08-14 9:40 ` Jagan Teki
2019-08-14 9:40 ` [U-Boot] " Jagan Teki
2019-08-14 10:43 ` Wadim Egorov
2019-08-14 10:43 ` [U-Boot] " Wadim Egorov
2019-08-14 10:46 ` Michael Nazzareno Trimarchi
2019-08-14 10:46 ` [U-Boot] " Michael Nazzareno Trimarchi
2019-07-29 7:47 ` [PATCH 04/15] rockchip: Add common " Jagan Teki
2019-07-29 7:47 ` [U-Boot] " Jagan Teki
2019-07-29 7:47 ` [PATCH 05/15] rockchip: rk3288/rk3399: Enable DISPLAY_CPUINFO Jagan Teki
2019-07-29 7:47 ` [U-Boot] " Jagan Teki
2019-08-05 12:35 ` Kever Yang
2019-08-05 12:35 ` [U-Boot] " Kever Yang
2019-07-29 7:47 ` [PATCH 06/15] wdt: designware: Simplify is_enabled function Jagan Teki
2019-07-29 7:47 ` [U-Boot] " Jagan Teki
2019-07-29 7:47 ` [PATCH 07/15] wdt: designware: Simplify enable function Jagan Teki
2019-07-29 7:47 ` [U-Boot] " Jagan Teki
2019-07-29 7:47 ` [PATCH 08/15] wdt: dw: Add driver-model support Jagan Teki
2019-07-29 7:47 ` [U-Boot] " Jagan Teki
[not found] ` <20190729074711.16988-9-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-07-29 9:09 ` Andy Shevchenko
2019-07-29 9:09 ` Andy Shevchenko
2019-07-29 7:47 ` [PATCH 09/15] wdt: dw: Rename to dw_wdt.c Jagan Teki
2019-07-29 7:47 ` [U-Boot] " Jagan Teki
2019-08-05 12:40 ` Kever Yang
2019-08-05 12:40 ` [U-Boot] " Kever Yang
[not found] ` <e7507f4e-de8d-e61c-5538-0a3cc203ceba-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2019-08-14 9:44 ` Jagan Teki
2019-08-14 9:44 ` [U-Boot] " Jagan Teki
2019-07-29 7:47 ` [PATCH 10/15] rockchip: dts: rk3399: Add u-boot, dm-pre-reloc for watchdog Jagan Teki
2019-07-29 7:47 ` [U-Boot] " Jagan Teki
2019-07-29 7:47 ` [PATCH 11/15] wdt: Kconfig: Add WDT_DW entry Jagan Teki
2019-07-29 7:47 ` [U-Boot] " Jagan Teki
2019-07-29 7:47 ` [PATCH 12/15] include: rk3399: Disable watchdog in TPL Jagan Teki
2019-07-29 7:47 ` [U-Boot] " Jagan Teki
[not found] ` <20190729074711.16988-13-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-08-05 12:43 ` Kever Yang
2019-08-05 12:43 ` [U-Boot] " Kever Yang
2019-08-25 20:14 ` Jagan Teki
2019-08-25 20:14 ` [U-Boot] " Jagan Teki
2019-08-26 1:34 ` Kever Yang
2019-08-26 1:34 ` [U-Boot] " Kever Yang
2019-07-29 7:47 ` [DO NOT MERGE] [PATCH 13/15] rk3399: rockpro64: Enable watchdog Jagan Teki
2019-07-29 7:47 ` [U-Boot] " Jagan Teki
2019-07-29 7:47 ` Jagan Teki [this message]
2019-07-29 7:47 ` [U-Boot] [PATCH 14/15] rockchip: rk3399: Add bootcount support Jagan Teki
2019-08-12 12:16 ` Kever Yang
2019-08-12 12:16 ` [U-Boot] " Kever Yang
2019-08-13 1:02 ` [PATCH 14/15] rockchip: rk3399: Add bootcount support【请注意，邮件由u-boot-bounces@lists.denx.de代发】 Kever Yang
2019-08-13 1:02 ` [U-Boot] " Kever Yang
2019-07-29 7:47 ` [DO NOT MERGE] [PATCH 15/15] rk3399: rockpro64: Enable bootcount Jagan Teki
2019-07-29 7:47 ` [U-Boot] " Jagan Teki
2019-08-05 12:18 ` [PATCH 00/15] rk3399: Add redundant boot support Kever Yang
2019-08-05 12:18 ` [U-Boot] " Kever Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190729074711.16988-15-jagan@amarulasolutions.com \
--to=jagan-dyjbcgdgk7pe9whmmfpqlfatqe2ktcn/@public.gmane.org \
--cc=akash-oRp2ZoJdM/RWk0Htik3J/w@public.gmane.org \
--cc=kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
--cc=linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org \
--cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=philipp.tomsich-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org \
--cc=sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.