OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 74... Line 74...
74 # 74 #
Line 75... Line 75...
75   75  
76 # take care of restoring a saved config 76 # take care of restoring a saved config
Line 77... Line 77...
77 [ "$SAVE_CONFIG" -eq 1 ] && restore_backup="${MTD_CONFIG_ARGS} -j ${CONF_TAR}" 77 [ "$SAVE_CONFIG" -eq 1 ] && restore_backup="${MTD_CONFIG_ARGS} -j ${CONF_TAR}"
78   78  
79 mtd -q erase inactive 79 # write concatinated kernel + rootfs to flash
Line 80... Line 80...
80 tar xf $tar_file ${board_dir}/root -O | mtd -n -p $kernel_length $restore_backup write - $PART_NAME 80 tar xf $tar_file ${board_dir}/kernel ${board_dir}/root -O | \
81 tar xf $tar_file ${board_dir}/kernel -O | mtd -n write - $PART_NAME 81 mtd $restore_backup write - $PART_NAME
82   82  
83 # prepare new u-boot env 83 # prepare new u-boot env
Line 96... Line 96...
96 printf "rootfs_start_addr 0x%08x\n" $((kernel_offset+kernel_length)) >> $setenv_script 96 printf "rootfs_start_addr 0x%08x\n" $((kernel_offset+kernel_length)) >> $setenv_script
97 printf "rootfs_size 0x%08x\n" ${rootfs_length} >> $setenv_script 97 printf "rootfs_size 0x%08x\n" ${rootfs_length} >> $setenv_script
98 printf "rootfs_checksum %s\n" ${rootfs_md5} >> $setenv_script 98 printf "rootfs_checksum %s\n" ${rootfs_md5} >> $setenv_script
Line 99... Line 99...
99   99  
100 # store u-boot env changes -  
101 mkdir -p /var/lock 100 # store u-boot env changes
102 fw_setenv -s $setenv_script || { 101 fw_setenv -s $setenv_script || {
103 echo "failed to update U-Boot environment" 102 echo "failed to update U-Boot environment"
104 return 1 103 return 1
105 } 104 }
-   105 }
-   106  
-   107 # create /var/lock for the lock "fw_setenv.lock" of fw_setenv
-   108 # the rest is copied using ipq806x's RAMFS_COPY_BIN and RAMFS_COPY_DATA
-   109 platform_add_ramfs_ubootenv()
-   110 {
-   111 mkdir -p $RAM_ROOT/var/lock
-   112 }