| From 878651bbaa8a7da203fafccb164ca7b32287b8f9 Mon Sep 17 00:00:00 2001 |
| From: "Edward A. James" <eajames@us.ibm.com> |
| Date: Thu, 9 Nov 2017 11:39:10 -0600 |
| Subject: [PATCH 4/4] config/ast-common: Add conditional factory reset command |
| |
| Factory reset (removing persistent rwfs) has to occur before we've |
| mounted the rwfs. However, the variable to determine whether or not to |
| do the reset is stored in the u-boot env. This is tricky to access |
| before rwfs is mounted except in u-boot. So, check it before every boot. |
| |
| Signed-off-by: Edward A. James <eajames@us.ibm.com> |
| --- |
| include/configs/ast-common.h | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h |
| index 14191e4ab0..aaa5155e00 100644 |
| --- a/include/configs/ast-common.h |
| +++ b/include/configs/ast-common.h |
| @@ -121,6 +121,8 @@ |
| #define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ |
| #define CONFIG_ENV_SIZE_REDUND 0x10000 |
| |
| +#define CONFIG_RWFS_SIZE 0x600000 |
| + |
| #define CONFIG_BOOTCOMMAND "run set_bootargs; run obmc_bootcmd" |
| #define CONFIG_ENV_OVERWRITE |
| |
| @@ -130,11 +132,13 @@ |
| "kernelname=kernel-0 \0" \ |
| "loadaddr=" __stringify(CONFIG_LOADADDR) "\0" \ |
| "set_bootargs=setenv bootargs " CONFIG_BOOTARGS " ubi.block=\${ubiblock} root=\${root} \0" \ |
| - "obmc_bootcmd=ubi part obmc-ubi; ubi read ${loadaddr} ${kernelname}; bootm ${loadaddr} \0" \ |
| + "obmc_bootcmd=ubi part obmc-ubi; run do_rwreset; ubi read ${loadaddr} ${kernelname}; bootm ${loadaddr} \0" \ |
| "verify=yes\0" \ |
| "spi_dma=yes\0" \ |
| "mtdids=" MTDIDS_DEFAULT "\0" \ |
| "mtdparts=" MTDPARTS_DEFAULT "\0" \ |
| + "rwfs_size=" __stringify(CONFIG_RWFS_SIZE) "\0" \ |
| + "do_rwreset=if test \"\${rwreset}\" = \"true\"; then ubi remove rwfs; ubi create rwfs \${rwfs_size}; fi \0" \ |
| "" |
| |
| #endif /* __AST_COMMON_CONFIG_H */ |
| -- |
| 2.14.3 |
| |