generic: platform/mikrotik: make soft_config writable without 4K sectors
authorOskari Lemmela <oskari@lemmela.net>
Tue, 21 Dec 2021 07:45:59 +0000 (09:45 +0200)
committerKoen Vandeputte <koen.vandeputte@ncentric.com>
Thu, 13 Jan 2022 08:33:29 +0000 (09:33 +0100)
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@lemmela.net>
[bump rb_softconfig version number]
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c

index 070bd32d5ab43ccc1e20774df8d64e4cef07b24b..453e1347b2cc1a2f2bc0005c95bbd2fa2991bedd 100644 (file)
 
 #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