diff --git a/arch b/arch
index 09b17215058..09d21fd8e0b 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 09b1721505896b61b147e2fa25cab9ad532579cd
+Subproject commit 09d21fd8e0b47fd0d6f7c32adf39b9b29dba9cd3
diff --git a/configs b/configs
index 9495be51198..36aec1e67d0 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 9495be511983679867e898407f87d18a37ac72bd
+Subproject commit 36aec1e67d0f2c877d3943c2c30297516ae051a1
diff --git a/include/nuttx/fs/ramdisk.h b/include/nuttx/fs/ramdisk.h
index 8721839775f..0f425c46aaf 100644
--- a/include/nuttx/fs/ramdisk.h
+++ b/include/nuttx/fs/ramdisk.h
@@ -94,9 +94,9 @@ extern "C"
 #ifdef CONFIG_FS_WRITABLE
 int ramdisk_register(int minor, FAR uint8_t *buffer, uint32_t nsectors,
                      uint16_t sectize, uint8_t rdflags);
-#define romdisk_register(m,b,n,s) ramdisk_register(m,b,n,s,0)
+#define romdisk_register(m,b,n,s) ramdisk_register(m,(FAR uint8_t *)b,n,s,0)
 #else
-int romdisk_register(int minor, FAR uint8_t *buffer, uint32_t nsectors,
+int romdisk_register(int minor, FAR const uint8_t *buffer, uint32_t nsectors,
                      uint16_t sectize);
 #endif
 
diff --git a/tools/README.txt b/tools/README.txt
index 7a9d013caae..d4acb034f5e 100644
--- a/tools/README.txt
+++ b/tools/README.txt
@@ -393,6 +393,9 @@ mkromfsimg.sh
   image.  It accepts an rcS script "template" and generates and image that
   may be mounted under /etc in the NuttX pseudo file system.
 
+  TIP: Edit the resulting header file and mark the generated data values
+  as 'const' so that they will be stored in FLASH.
+
 mkdeps.c
 cnvwindeps.c
 mkwindeps.sh