[openwrt/openwrt] generic: platform/mikrotik: make soft_config writable without 4K sectors
LEDE Commits
lede-commits at lists.infradead.org
Thu Jan 13 00:35:39 PST 2022
xback pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/6eb196ed0f484148f04dedf65cd21651cf3349a7
commit 6eb196ed0f484148f04dedf65cd21651cf3349a7
Author: Oskari Lemmela <oskari at lemmela.net>
AuthorDate: Tue Dec 21 09:45:59 2021 +0200
generic: platform/mikrotik: make soft_config writable without 4K sectors
Make soft_config writable in all cases. Performing soft_config commit
will fail if mtd partition is not writable.
Signed-off-by: Oskari Lemmela <oskari at lemmela.net>
[bump rb_softconfig version number]
Signed-off-by: Koen Vandeputte <koen.vandeputte at ncentric.com>
---
.../files/drivers/platform/mikrotik/rb_softconfig.c | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c b/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c
index 070bd32d5a..453e1347b2 100644
--- a/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c
+++ b/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c
@@ -56,23 +56,12 @@
#include "routerboot.h"
-#define RB_SOFTCONFIG_VER "0.03"
+#define RB_SOFTCONFIG_VER "0.04"
#define RB_SC_PR_PFX "[rb_softconfig] "
-/*
- * mtd operations before 4.17 are asynchronous, not handled by this code
- * Also make the driver act read-only if 4K_SECTORS are not enabled, since they
- * are require to handle partial erasing of the small soft_config partition.
- */
-#if defined(CONFIG_MTD_SPI_NOR_USE_4K_SECTORS)
- #define RB_SC_HAS_WRITE_SUPPORT true
- #define RB_SC_WMODE S_IWUSR
- #define RB_SC_RMODE S_IRUSR
-#else
- #define RB_SC_HAS_WRITE_SUPPORT false
- #define RB_SC_WMODE 0
- #define RB_SC_RMODE S_IRUSR
-#endif
+#define RB_SC_HAS_WRITE_SUPPORT true
+#define RB_SC_WMODE S_IWUSR
+#define RB_SC_RMODE S_IRUSR
/* ID values for software settings */
#define RB_SCID_UART_SPEED 0x01 // u32*1
More information about the lede-commits
mailing list