Merge branch 'ipe337'

13 files changed, 54 insertions, 66 deletions

diff --git a/Makefile b/Makefile
index c5ba2e3bfe..6e785bba78 100644
--- a/Makefile
+++ b/Makefile
@@ -1059,8 +1059,6 @@ define find-sources
 	       find $(__srctree)arch/$${ARCH} $(RCS_FIND_IGNORE) \
 	            -name $1 -print; \
 	  done ; \
-	  find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \
-	       -name $1 -print; \
 	  find $(__srctree)include $(RCS_FIND_IGNORE) \
 	       \( -name config -o -name 'asm-*' \) -prune \
 	       -o -name $1 -print; \
diff --git a/arch/blackfin/configs/ipe337_defconfig b/arch/blackfin/configs/ipe337_defconfig
index 9b564c76fa..4c273aaf32 100644
--- a/arch/blackfin/configs/ipe337_defconfig
+++ b/arch/blackfin/configs/ipe337_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # U-Boot version: 2.0.0-git
-# Wed Oct 24 10:04:52 2007
+# Thu Oct  4 13:24:51 2007
 #
 CONFIG_BLACKFIN=y
 CONFIG_BF561=y
@@ -34,14 +34,11 @@ CONFIG_TIMESTAMP=y
 CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
 CONFIG_DEFAULT_ENVIRONMENT=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="board/ipe337/defenv"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="board/ipe337/env"
 
 #
 # Debugging                     
 #
-# CONFIG_ENABLE_FLASH_NOISE is not set
-# CONFIG_ENABLE_PARTITION_NOISE is not set
-# CONFIG_ENABLE_DEVICE_NOISE is not set
 
 #
 # Commands                      
@@ -54,7 +51,6 @@ CONFIG_CMD_EDIT=y
 CONFIG_CMD_SLEEP=y
 CONFIG_CMD_ENVIRONMENT=y
 CONFIG_CMD_HELP=y
-# CONFIG_CMD_READLINE is not set
 
 #
 # file commands                 
@@ -132,7 +128,6 @@ CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT=1
 CONFIG_DRIVER_CFI=y
 # CONFIG_DRIVER_CFI_NEW is not set
 CONFIG_CFI_BUFFER_WRITE=y
-# CONFIG_NAND is not set
 
 #
 # Filesystem support            
diff --git a/board/ipe337/defenv/bin/update_kernel b/board/ipe337/defenv/bin/update_kernel
deleted file mode 100644
index a9ce158f9c..0000000000
--- a/board/ipe337/defenv/bin/update_kernel
+++ /dev/null
@@ -1,20 +0,0 @@
-. /env/config
-
-if [ -z /dev/nor0.kernel ]; then
-        echo "Please add a partition /dev/nor0.kernel containing the kernel image"
-        exit 1
-fi
-
-image=uImage-ipe337
-
-if [ $# = 1 ]; then
-        image=$1
-fi
-
-if [ x$ip = xdhcp ]; then
-        dhcp
-fi
-
-unprotect /dev/nor0.kernel
-erase /dev/nor0.kernel
-tftp "$image" /dev/nor0.kernel
diff --git a/board/ipe337/defenv/bin/update_root b/board/ipe337/defenv/bin/update_root
deleted file mode 100644
index 7d0a21dea1..0000000000
--- a/board/ipe337/defenv/bin/update_root
+++ /dev/null
@@ -1,20 +0,0 @@
-. /env/config
-
-if [ -z $rootdev ]; then
-        echo "$rootdev not set. Please set to your device containing the root image"
-        exit 1
-fi
-
-image=root-ipe337.jffs2
-
-if [ $# = 1 ]; then
-        image=$1
-fi
-
-if [ x$ip = xdhcp ]; then
-        dhcp
-fi
-
-unprotect "$rootdev"
-erase "$rootdev"
-tftp $image "$rootdev"
diff --git a/board/ipe337/env/bin/_update b/board/ipe337/env/bin/_update
new file mode 100644
index 0000000000..b21d17378a
--- /dev/null
+++ b/board/ipe337/env/bin/_update
@@ -0,0 +1,23 @@
+echo "updating $image to $part"
+
+if [ -z "$part" -o -z "$image" ]; then
+	echo "define \$part and \$image"
+	exit 1
+fi
+
+if [ \! -e "$part" ]; then
+        echo "Partition $part does not exist"
+        exit 1
+fi
+
+if [ $# = 1 ]; then
+        image=$1
+fi
+
+if [ x$ip = xdhcp ]; then
+        dhcp
+fi
+
+unprotect $part
+erase $part
+tftp $image $part
diff --git a/board/ipe337/defenv/bin/boot b/board/ipe337/env/bin/boot
index b10ab73d64..ee10b46f3e 100644
--- a/board/ipe337/defenv/bin/boot
+++ b/board/ipe337/env/bin/boot
@@ -1,4 +1,3 @@
-
 . /env/config
 
 if [ x$1 = "xflash" ]; then 
@@ -17,7 +16,7 @@ else
 	if [ "$ip" = dhcp ]; then
 		bootargs="$bootargs ip=dhcp"
 	else
-		bootargs="$bootargs ip=$eth0.ip:$eth0.serverip:$eth0.gateway:$eth0.netmask:::"
+		bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::"
 	fi
 	bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp"
 fi
diff --git a/board/ipe337/defenv/bin/init b/board/ipe337/env/bin/init
index 93eef1c9ca..93eef1c9ca 100644
--- a/board/ipe337/defenv/bin/init
+++ b/board/ipe337/env/bin/init
diff --git a/board/ipe337/env/bin/update_kernel b/board/ipe337/env/bin/update_kernel
new file mode 100644
index 0000000000..b62caea72e
--- /dev/null
+++ b/board/ipe337/env/bin/update_kernel
@@ -0,0 +1,6 @@
+. /env/config
+
+image=$uimage
+part=/dev/nor0.kernel
+
+. /env/bin/_update $1
diff --git a/board/ipe337/env/bin/update_root b/board/ipe337/env/bin/update_root
new file mode 100644
index 0000000000..4d0c9b6802
--- /dev/null
+++ b/board/ipe337/env/bin/update_root
@@ -0,0 +1,6 @@
+. /env/config
+
+image=$jffs2
+part=/dev/nor0.root
+
+. /env/bin/_update $1
diff --git a/board/ipe337/defenv/config b/board/ipe337/env/config
index c7d6368d68..c15fba89b4 100644
--- a/board/ipe337/defenv/config
+++ b/board/ipe337/env/config
@@ -1,25 +1,22 @@
 echo /env/config
 
-eth0.serverip=192.168.23.2
-eth0.ethaddr=80:87:78:74:73:63
-
-mtdparts="128k(uboot)ro,128k(ubootenv),128k(alternate),1536k(kernel),-(root)"
-
 ip=dhcp
-eth0.ip=192.168.25.2
+
+eth0.ipaddr=192.168.23.164
+eth0.ethaddr=80:87:78:74:73:63
+eth0.serverip=192.168.23.1
 eth0.netmask=255.255.255.0
-eth0.gateway=192.168.25.1
+eth0.gateway=192.168.23.1
 
-nfsroot="/home/sha/octopus/blackfin/OSELAS.BSP-Pipetronix-ipe337-trunk/root"
 uimage=uImage-bfin
 jffs2=root-bfin.jffs2
 
+nfsroot="/home/kleineb/pengutronix/pii-bf/OSELAS.BSP-Pipetronix-ipe337-trunk/root"
 bootargs="console=ttyBF0,115200"
 
 # can be either 'net' or 'flash'
-kernel=flash
-root=flash
+kernel=net
+root=net
 
-if [ ! -e dev/nor0.0 ]; then
-        addpart /dev/nor0 $mtdparts
-fi
+mtdparts="128k(uboot)ro,128k(ubootenv),128k(alternate),1536k(kernel),-(root)"
+addpart /dev/nor0 $mtdparts
diff --git a/commands/ls.c b/commands/ls.c
index 6b88688426..276b5e2893 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -34,7 +34,7 @@ static void ls_one(const char *path, struct stat *s)
 	unsigned long namelen = strlen(path);
 
 	mkmodestr(s->st_mode, modestr);
-	printf("%s %8d %*.*s\n",modestr, s->st_size, namelen, namelen, path);
+	printf("%s %10u %*.*s\n", modestr, s->st_size, namelen, namelen, path);
 }
 
 int ls(const char *path, ulong flags)
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index ccfcc957f5..32e107746b 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -331,6 +331,10 @@
 
 #define MII_DATA		0x07	  /* R/W mask 0x0000FFFFUL */
 
+#ifdef FLOW
+#undef FLOW	/* clashed with include/asm/cpu/defBF561.h:1654 */
+#endif
+
 #define FLOW			0x08	  /* R/W */
 #define FLOW_FCPT			0xFFFF0000
 #define FLOW_FCPASS			0x00000004
diff --git a/lib/driver.c b/lib/driver.c
index e7c98a4d36..d3d3dc4458 100644
--- a/lib/driver.c
+++ b/lib/driver.c
@@ -353,7 +353,7 @@ U_BOOT_CMD_END
 
   no info available for eth0
   Parameters:
-          ip = 192.168.23.197
+      ipaddr = 192.168.23.197
      ethaddr = 80:81:82:83:84:86
      gateway = 192.168.23.1
      netmask = 255.255.255.0