summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-04 07:59:08 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-03-04 07:59:08 +0000
commitdead6fde5190cfcf868e6b46299879c9eb72a886 (patch)
tree2c50068a9b2de21380f16c84a2b147fac085ab2d /target
parentfebbb945a927bfbdd74349a6a2b2a2fadfc0e169 (diff)
last minute bugfixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@305 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rwxr-xr-xtarget/default/target_skeleton/etc/preinit11
-rw-r--r--target/jffs2/jffs2root.mk4
2 files changed, 11 insertions, 4 deletions
diff --git a/target/default/target_skeleton/etc/preinit b/target/default/target_skeleton/etc/preinit
index 01df205831..6507d2319c 100755
--- a/target/default/target_skeleton/etc/preinit
+++ b/target/default/target_skeleton/etc/preinit
@@ -8,8 +8,15 @@ if [ $(cat /proc/sys/reset) = 1 ] ; then
while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
else
mount | grep jffs2 >&-
- if [ $? = 0 ] && [ $(cat /proc/mtd | wc -l) = 6 ] ; then
- jffs2root --move && reboot
+ if [ $? = 0 ] ; then
+ mtd unlock rootfs
+ [ $(cat /proc/mtd | wc -l) = 6 ] && {
+ echo 5 > /proc/sys/diag
+ mtd unlock OpenWrt
+ mtd erase OpenWrt
+ jffs2root --move
+ }
+ mount -o remount,rw /dev/root /
else
mtd unlock mtd4
mount -t jffs2 /dev/mtdblock/4 /jffs
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 5e9380821b..5a0259b27c 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -44,11 +44,11 @@ jffs2root-dirclean:
rm -rf $(MTD_DIR)
ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
-TARGETS+=openwrt-image
+TARGETS+=openwrt-jffs2root openwrt-image
ROOTFS=jffs2
JFFS2FLAGS=-a $(JFFS2_BLOCK_SIZE)
-openwrt-image: openwrt
+openwrt-image: openwrt
@make jffs2root openwrt-code.bin TAG=W54G \
EXTRAVERSION=$(EXTRAVERSION)-JFFS2-4M JFFS2_BLOCK_SIZE=0x10000
@make jffs2root openwrt-code.bin TAG=W54S \