Commit d3a262f8 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

flash_erase for rootfs does not depend on hardcoded value anymore - depends on...

flash_erase for rootfs does not depend on hardcoded value anymore - depends on sysfs (device tree) instead
parent fde729b5
...@@ -34,7 +34,10 @@ $BKP_DIR = "/etc/elphel393"; ...@@ -34,7 +34,10 @@ $BKP_DIR = "/etc/elphel393";
# update files # update files
# file, expertise level, nand partition, size - see http://wiki.elphel.com/index.php?title=NAND_flash_boot_rootfs # file, expertise level, nand partition, size - see http://wiki.elphel.com/index.php?title=NAND_flash_boot_rootfs
# partitions are also listed in the device tree # partitions are also listed in the device tree
# WARNING: DO NOT CHANGE
# for rootfs.ubi - e[3] (=="0 2560") for flash_erase is now calculated from sysfs and depends on the device tree
# WARNING: TRY NOT TO CHANGE
$UPDATE_LIST = array( $UPDATE_LIST = array(
array(0,"boot.bin", "/dev/mtd0","0 2"), array(0,"boot.bin", "/dev/mtd0","0 2"),
array(0,"u-boot-dtb.img","/dev/mtd1","0 8"), array(0,"u-boot-dtb.img","/dev/mtd1","0 8"),
...@@ -155,7 +158,15 @@ function nandflash($list){ ...@@ -155,7 +158,15 @@ function nandflash($list){
}else{ }else{
if (!is_dir($NAND_PATH)) { if (!is_dir($NAND_PATH)) {
exec("flash_unlock ${e[2]} >> $FLASH_LOG"); exec("flash_unlock ${e[2]} >> $FLASH_LOG");
exec("flash_erase ${e[2]} ${e[3]} >> $FLASH_LOG"); // make more universal
$mtd_device = explode("/",$e[2])[2];
$mtd_sysfs_path = "/sys/class/mtd/$mtd_device";
$mtd_size = intval(file_get_contents("$mtd_sysfs_path/size"));
$mtd_erasesize = intval(file_get_contents("$mtd_sysfs_path/erasesize"));
$mtd_size_blocks = intval($mtd_size/$mtd_erasesize);
$mtd_erase_start = 0;
//exec("flash_erase ${e[2]} ${e[3]} >> $FLASH_LOG");
exec("flash_erase ${e[2]} $mtd_erase_start $mtd_size_blocks >> $FLASH_LOG");
exec("ubiformat ${e[2]} -f $UPDATE_DIR/${e[1]} ${e[4]} >> $FLASH_LOG"); exec("ubiformat ${e[2]} -f $UPDATE_DIR/${e[1]} ${e[4]} >> $FLASH_LOG");
}else{ }else{
rootfs_warning_note(); rootfs_warning_note();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment