Merge "WindCharger: Fix shared variable mapping being set in RO buf."
diff --git a/common/cmd_sysvar.c b/common/cmd_sysvar.c
index 134a370..b377b20 100644
--- a/common/cmd_sysvar.c
+++ b/common/cmd_sysvar.c
@@ -737,10 +737,16 @@
       /* add a system variable(RO) */
       printf("SV: adding %s\n", argv[2]);
       ret = sf_setvar(&ro_buf, SYSVAR_RO_BUF, argv[2], argv[3]);
+      if (ret == SYSVAR_SUCCESS) {
+        set_sysvar_uboot(argv[2], argv[3]);
+      }
     } else if (argc == 3) {
       /* delete a system variable(RO) */
       printf("SV: deleting %s\n", argv[2]);
       ret = sf_setvar(&ro_buf, SYSVAR_RO_BUF, argv[2], NULL);
+      if (ret == SYSVAR_SUCCESS) {
+        set_sysvar_uboot(argv[2], NULL);
+      }
     } else if (argc == 2) {
       /* delete all system variables(RO) */
       printf("SV: deleting all RO vars. . .\n");