Changeset 305


Ignore:
Timestamp:
2005-03-04T08:59:08+01:00 (13 years ago)
Author:
mbm
Message:

last minute bugfixes

Location:
trunk/openwrt
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/openwrt/jffs2root.c

    r294 r305  
    8585      if (ptr->offsets[1] >= ptr->len) { 
    8686        printf("Partition already moved outside trx\n"); 
     87#if 0 
    8788      } else if (ptr->offsets[1] & 0x0001ffff) { 
    8889        printf("Partition does not start on a block boundary\n"); 
     90#endif 
    8991      } else { 
    9092        init_crc32(); 
    91         bzero((void *)((int)ptr + ptr->len), (size_t)(len - ptr->len)); 
     93        //bzero((void *)((int)ptr + ptr->len), (size_t)(len - ptr->len)); 
    9294        ptr->len = ptr->offsets[1]; 
    9395        ptr->crc32 = crc32buf((void *) &(ptr->flag_version), ptr->len - offsetof(struct trx_header, flag_version)); 
  • trunk/openwrt/package/openwrt/mtd.c

    r224 r305  
    141141                 mtdEraseInfo.start += mtdInfo.erasesize) { 
    142142                 
    143                 if(ioctl(fd, MEMUNLOCK, &mtdEraseInfo)) { 
    144                         fprintf(stderr, "Could not unlock MTD device: %s\n", mtd); 
    145                         close(fd); 
    146                         exit(1); 
    147                 } 
     143                ioctl(fd, MEMUNLOCK, &mtdEraseInfo); 
    148144                if(ioctl(fd, MEMERASE, &mtdEraseInfo)) { 
    149145                        fprintf(stderr, "Could not erase MTD device: %s\n", mtd); 
  • trunk/openwrt/package/openwrt/openwrt.mk

    r298 r305  
    113113OPENWRT_JFFS2ROOT_TARGET_BINARY:=sbin/jffs2root 
    114114 
    115 $(TARGET_DIR)/$(OPENWRT_JFFS2ROOT_TARGET_BINARY):  
     115$(TARGET_DIR)/$(OPENWRT_JFFS2ROOT_TARGET_BINARY): openwrt 
    116116                $(TARGET_CC) -o $(TARGET_DIR)/$(OPENWRT_JFFS2ROOT_TARGET_BINARY) $(OPENWRT_JFFS2ROOT_SOURCE) 
    117117 
     
    161161linksys:        linksys-shared linksys-nvram linksys-wlconf 
    162162 
    163 openwrt:        linksys openwrt-mtd openwrt-trx openwrt-addpattern openwrt-jffs2root openwrt-sstrip 
     163openwrt:        linksys openwrt-mtd openwrt-trx openwrt-addpattern openwrt-sstrip 
    164164 
    165165openwrt-dirclean: linksys-shared-dirclean linksys-nvram-dirclean linksys-wlconf-dirclean 
  • trunk/openwrt/target/default/target_skeleton/etc/preinit

    r297 r305  
    99else 
    1010  mount | grep jffs2 >&- 
    11   if [ $? = 0 ] && [ $(cat /proc/mtd | wc -l) = 6 ] ; then 
    12     jffs2root --move && reboot  
     11  if [ $? = 0 ] ; then  
     12    mtd unlock rootfs 
     13    [ $(cat /proc/mtd | wc -l) = 6 ] && { 
     14      echo 5 > /proc/sys/diag 
     15      mtd unlock OpenWrt 
     16      mtd erase OpenWrt 
     17      jffs2root --move 
     18    } 
     19    mount -o remount,rw /dev/root / 
    1320  else 
    1421    mtd unlock mtd4 
  • trunk/openwrt/target/jffs2/jffs2root.mk

    r304 r305  
    4545 
    4646ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) 
    47 TARGETS+=openwrt-image 
     47TARGETS+=openwrt-jffs2root openwrt-image 
    4848ROOTFS=jffs2 
    4949JFFS2FLAGS=-a $(JFFS2_BLOCK_SIZE) 
    5050 
    51 openwrt-image:  openwrt 
     51openwrt-image: openwrt 
    5252        @make jffs2root openwrt-code.bin TAG=W54G \ 
    5353        EXTRAVERSION=$(EXTRAVERSION)-JFFS2-4M JFFS2_BLOCK_SIZE=0x10000 
Note: See TracChangeset for help on using the changeset viewer.