diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index 336fe336039d08d44579532cb5ed64947e8a61a7..f294440a7d3a92c106ae41bba9e4a4150d0714c8 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -176,6 +176,11 @@ arm_setup_boot() {
                    arm_boot_start='usb start; '
                fi
                ;;
+        "sun"*) { echo "rtc_sunxi";
+                  echo "vfat"; } >> /etc/initramfs-tools/modules
+                ;;
+        "rock"*) echo "vfat" >> /etc/initramfs-tools/modules
+                 ;;
     esac
 
     case "$dtb" in
@@ -254,17 +259,6 @@ EOF
         cp /usr/lib/linux-image-*-armmp/* /boot/dtbs
     fi
 
-
-    # extra boot modules
-    case "$dtb" in
-        "sun"*)
-            { echo "rtc_sunxi";
-              echo "vfat"; } >> /etc/initramfs-tools/modules
-            ;;
-        "rock"*) echo "vfat" >> /etc/initramfs-tools/modules
-              ;;
-    esac
-
     if [ "$arm_flash_name" ]; then
         case "$arm_flash_name" in
             "TI "*)