diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index 9803304fd7a..b1f88c0d1b7 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -198,6 +198,10 @@ void up_initialize(void)
   devnull_register();   /* Standard /dev/null */
 #endif
 
+#if defined(CONFIG_DEV_RANDOM)
+  devrandom_register(); /* Standard /dev/random */
+#endif
+
 #if defined(CONFIG_DEV_URANDOM)
   devurandom_register();   /* Standard /dev/urandom */
 #endif
@@ -257,12 +261,6 @@ void up_initialize(void)
   devcrypto_register();
 #endif
 
-#ifdef CONFIG_DEV_RANDOM
-  /* Initialize the Random Number Generator (RNG)  */
-
-  devrandom_register();
-#endif
-
 #ifndef CONFIG_NETDEV_LATEINIT
   /* Initialize the network */
 
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index a38c0be2e5d..14c273c414b 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -239,6 +239,10 @@ void up_initialize(void)
   devnull_register();   /* Standard /dev/null */
 #endif
 
+#if defined(CONFIG_DEV_RANDOM)
+  devrandom_register(); /* Standard /dev/random */
+#endif
+
 #if defined(CONFIG_DEV_URANDOM)
   devurandom_register();   /* Standard /dev/urandom */
 #endif
@@ -298,12 +302,6 @@ void up_initialize(void)
   devcrypto_register();
 #endif
 
-#ifdef CONFIG_DEV_RANDOM
-  /* Initialize the Random Number Generator (RNG)  */
-
-  devrandom_register();
-#endif
-
 #ifndef CONFIG_NETDEV_LATEINIT
   /* Initialize the network */
 
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index a51d156f043..8ae73d30eb4 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -165,6 +165,10 @@ void up_initialize(void)
   devnull_register();   /* Standard /dev/null */
 #endif
 
+#if defined(CONFIG_DEV_RANDOM)
+  devrandom_register(); /* Standard /dev/random */
+#endif
+
 #if defined(CONFIG_DEV_URANDOM)
   devurandom_register();   /* Standard /dev/urandom */
 #endif
@@ -224,12 +228,6 @@ void up_initialize(void)
   devcrypto_register();
 #endif
 
-#ifdef CONFIG_DEV_RANDOM
-  /* Initialize the Random Number Generator (RNG)  */
-
-  devrandom_register();
-#endif
-
 #ifndef CONFIG_NETDEV_LATEINIT
   /* Initialize the network */
 
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index bcd29d37fa0..93652972e0c 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -167,6 +167,10 @@ void up_initialize(void)
   devnull_register();   /* Standard /dev/null */
 #endif
 
+#if defined(CONFIG_DEV_RANDOM)
+  devrandom_register(); /* Standard /dev/random */
+#endif
+
 #if defined(CONFIG_DEV_URANDOM)
   devurandom_register();   /* Standard /dev/urandom */
 #endif
@@ -226,12 +230,6 @@ void up_initialize(void)
   devcrypto_register();
 #endif
 
-#ifdef CONFIG_DEV_RANDOM
-  /* Initialize the Random Number Generator (RNG)  */
-
-  devrandom_register();
-#endif
-
 #ifndef CONFIG_NETDEV_LATEINIT
   /* Initialize the network */
 
diff --git a/arch/rgmp/src/nuttx.c b/arch/rgmp/src/nuttx.c
index fe5af0e4dd6..3e694d503f8 100644
--- a/arch/rgmp/src/nuttx.c
+++ b/arch/rgmp/src/nuttx.c
@@ -141,6 +141,10 @@ void up_initialize(void)
   devnull_register();   /* Standard /dev/null */
 #endif
 
+#if defined(CONFIG_DEV_RANDOM)
+  devrandom_register(); /* Standard /dev/random */
+#endif
+
 #if defined(CONFIG_DEV_URANDOM)
   devurandom_register();   /* Standard /dev/urandom */
 #endif
@@ -169,12 +173,6 @@ void up_initialize(void)
   devcrypto_register();
 #endif
 
-#ifdef CONFIG_DEV_RANDOM
-  /* Initialize the Random Number Generator (RNG)  */
-
-  devrandom_register();
-#endif
-
   /* Enable interrupt */
 
   local_irq_enable();
diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c
index f4fd01baffb..80e93410cbd 100644
--- a/arch/sh/src/common/up_initialize.c
+++ b/arch/sh/src/common/up_initialize.c
@@ -156,6 +156,10 @@ void up_initialize(void)
   devnull_register();   /* Standard /dev/null */
 #endif
 
+#if defined(CONFIG_DEV_RANDOM)
+  devrandom_register(); /* Standard /dev/random */
+#endif
+
 #if defined(CONFIG_DEV_URANDOM)
   devurandom_register();   /* Standard /dev/urandom */
 #endif
@@ -218,12 +222,6 @@ void up_initialize(void)
   devcrypto_register();
 #endif
 
-#ifdef CONFIG_DEV_RANDOM
-  /* Initialize the Random Number Generator (RNG)  */
-
-  devrandom_register();
-#endif
-
 #ifndef CONFIG_NETDEV_LATEINIT
   /* Initialize the network */
 
diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c
index d8f761f8855..cc670ef93ed 100644
--- a/arch/sim/src/up_initialize.c
+++ b/arch/sim/src/up_initialize.c
@@ -153,6 +153,10 @@ void up_initialize(void)
   devnull_register();       /* Standard /dev/null */
 #endif
 
+#if defined(CONFIG_DEV_RANDOM)
+  devrandom_register(); /* Standard /dev/random */
+#endif
+
 #if defined(CONFIG_DEV_URANDOM)
   devurandom_register();   /* Standard /dev/urandom */
 #endif
@@ -208,12 +212,6 @@ void up_initialize(void)
   devcrypto_register();
 #endif
 
-#ifdef CONFIG_DEV_RANDOM
-  /* Initialize the Random Number Generator (RNG)  */
-
-  devrandom_register();
-#endif
-
 #if defined(CONFIG_FS_FAT) && !defined(CONFIG_DISABLE_MOUNTPOINT)
   up_registerblockdevice(); /* Our FAT ramdisk at /dev/ram0 */
 #endif
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index dc12de56030..1261a5eb369 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -167,6 +167,10 @@ void up_initialize(void)
   devnull_register();   /* Standard /dev/null */
 #endif
 
+#if defined(CONFIG_DEV_RANDOM)
+  devrandom_register(); /* Standard /dev/random */
+#endif
+
 #if defined(CONFIG_DEV_URANDOM)
   devurandom_register();   /* Standard /dev/urandom */
 #endif
@@ -226,12 +230,6 @@ void up_initialize(void)
   devcrypto_register();
 #endif
 
-#ifdef CONFIG_DEV_RANDOM
-  /* Initialize the Random Number Generator (RNG)  */
-
-  devrandom_register();
-#endif
-
 #ifndef CONFIG_NETDEV_LATEINIT
   /* Initialize the network */
 
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index 6d239130be2..349e68b0d78 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -167,6 +167,10 @@ void up_initialize(void)
   devnull_register();   /* Standard /dev/null */
 #endif
 
+#if defined(CONFIG_DEV_RANDOM)
+  devrandom_register(); /* Standard /dev/random */
+#endif
+
 #if defined(CONFIG_DEV_URANDOM)
   devurandom_register();   /* Standard /dev/urandom */
 #endif
@@ -226,12 +230,6 @@ void up_initialize(void)
   devcrypto_register();
 #endif
 
-#ifdef CONFIG_DEV_RANDOM
-  /* Initialize the Random Number Generator (RNG)  */
-
-  devrandom_register();
-#endif
-
 #ifndef CONFIG_NETDEV_LATEINIT
   /* Initialize the network */
 
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index f3adc1dd613..a42635cbe8f 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -164,6 +164,10 @@ void up_initialize(void)
   devnull_register();   /* Standard /dev/null */
 #endif
 
+#if defined(CONFIG_DEV_RANDOM)
+  devrandom_register(); /* Standard /dev/random */
+#endif
+
 #if defined(CONFIG_DEV_URANDOM)
   devurandom_register();   /* Standard /dev/urandom */
 #endif
@@ -223,12 +227,6 @@ void up_initialize(void)
   devcrypto_register();
 #endif
 
-#ifdef CONFIG_DEV_RANDOM
-  /* Initialize the Random Number Generator (RNG)  */
-
-  devrandom_register();
-#endif
-
 #ifndef CONFIG_NETDEV_LATEINIT
   /* Initialize the network */