Merge lp:~salgado/linaro-image-tools/refactor-create_boot_cmd into lp:linaro-image-tools/11.11

[Guilherme Salgado]

Refactor create_boot_cmd to make it easier to port it to python

[Martin Ohlsson (martin-ohlson)]

Hi Guilherme,

Your changes looks good to me.

/Martin

review: Approve

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-11-12 17:21:46 +0000
+++ linaro-media-create	2010-11-18 18:01:41 +0000
@@ -34,6 +34,8 @@
 BOOTFS_STEP="create_boot_cmd populate_boot"
 ROOTFS_STEP="populate_rootfs"
 PARTITION_STEP="create_partitions"
+mmc_option="0:1"
+boot_args_options="rootwait ro"
 
 DIR=$PWD
 TMP_DIR=$(mktemp -d)
@@ -390,34 +392,8 @@
   else
     boot_snippet='root=UUID='${RFS_UUID}
   fi
-
-  # set board defaults
-  mmc_option="0:1"
-  boot_args_options="rootwait ro"
-
-  # set board specific options
-  case "$DEVIMAGE" in
-    beagle|igep)
-      boot_args_options="$boot_args_options earlyprintk fixrtc nocompcache vram=12M omapfb.debug=y omapfb.mode=dvi:1280x720MR-16@60"
-    ;;
-    
-    panda)
-      boot_args_options="$boot_args_options earlyprintk fixrtc nocompcache vram=32M omapfb.debug=y omapfb.vram=0:8M mem=463M ip=none"
-    ;;
-      
-    mx51evk)
-      mmc_option="0:2"
-    ;;
-    
-    ux500)
-      boot_args_options="$boot_args_options earlyprintk rootdelay=1 fixrtc nocompcache"
-      boot_args_options="$boot_args_options mem=96M@0 mem_modem=32M@96M mem=44M@128M pmem=22M@172M mem=30M@194M mem_mali=32M@224M pmem_hwb=54M@256M hwmem=48M@302M mem=152M@360M"
-      mmc_option="1:1"
-    ;;
-  esac
   
-    # write out boot options
-    cat > ${TMP_DIR}/boot.cmd << BOOTCMD
+  cat > ${TMP_DIR}/boot.cmd << BOOTCMD
 setenv bootcmd 'fatload mmc $mmc_option $KERNEL_ADDR uImage; fatload mmc $mmc_option $INITRD_ADDR uInitrd; bootm $KERNEL_ADDR $INITRD_ADDR'
 setenv bootargs '${serial_opts} ${splash_opts} ${lowmem_opt} ${boot_snippet} ${boot_args_options}'
 boot
@@ -838,6 +814,7 @@
       fi
       KERNEL_ADDR="0x80000000"
       INITRD_ADDR="0x81600000"
+      boot_args_options="$boot_args_options earlyprintk fixrtc nocompcache vram=12M omapfb.debug=y omapfb.mode=dvi:1280x720MR-16@60"
       ;;
     panda)
       serial_opts="$serial_opts console=tty0 console=ttyO2,115200n8"
@@ -846,6 +823,7 @@
       fi
       KERNEL_ADDR="0x80200000"
       INITRD_ADDR="0x81600000"
+      boot_args_options="$boot_args_options earlyprintk fixrtc nocompcache vram=32M omapfb.debug=y omapfb.vram=0:8M mem=463M ip=none"
       ;;
     ux500)
       serial_opts="$serial_opts console=tty0 console=ttyAMA2,115200n8"
@@ -854,6 +832,9 @@
       fi
       KERNEL_ADDR="0x00100000"
       INITRD_ADDR="0x08000000"
+      boot_args_options="$boot_args_options earlyprintk rootdelay=1 fixrtc nocompcache"
+      boot_args_options="$boot_args_options mem=96M@0 mem_modem=32M@96M mem=44M@128M pmem=22M@172M mem=30M@194M mem_mali=32M@224M pmem_hwb=54M@256M hwmem=48M@302M mem=152M@360M"
+      mmc_option="1:1"
       ;;
     mx51evk)
       serial_opts="$serial_opts console=tty0 console=ttymxc0,115200n8"
@@ -863,6 +844,7 @@
       KERNEL_ADDR="0x90000000"
       INITRD_ADDR="0x90800000"
       MMC_PART_OFFSET=1
+      mmc_option="0:2"
       ;;
     vexpress)
       serial_opts="$serial_opts console=tty0 console=ttyAMA0,38400n8"