diff --git a/Makefile b/Makefile index c5ba2e3..6e785bb 100644 --- a/Makefile +++ b/Makefile @@ -1059,8 +1059,6 @@ 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 9b564c7..4c273aa 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_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_SLEEP=y CONFIG_CMD_ENVIRONMENT=y CONFIG_CMD_HELP=y -# CONFIG_CMD_READLINE is not set # # file commands @@ -132,7 +128,6 @@ 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/boot b/board/ipe337/defenv/bin/boot deleted file mode 100644 index b10ab73..0000000 --- a/board/ipe337/defenv/bin/boot +++ /dev/null @@ -1,35 +0,0 @@ - -. /env/config - -if [ x$1 = "xflash" ]; then - root=flash - kernel=flash -fi - -if [ x$1 = "xnet" ]; then - root=net - kernel=net -fi - -if [ "$root" = flash ]; then - bootargs="$bootargs root=/dev/mtdblock4 rootfstype=jffs2" -else - if [ "$ip" = dhcp ]; then - bootargs="$bootargs ip=dhcp" - else - bootargs="$bootargs ip=$eth0.ip:$eth0.serverip:$eth0.gateway:$eth0.netmask:::" - fi - bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp" -fi - -bootargs="$bootargs mtdparts=physmap-flash.0:$mtdparts" - -if [ "$kernel" = net ]; then - if [ $ip = dhcp ]; then - dhcp - fi - tftp $uimage uImage - bootm uImage -else - bootm /dev/nor0.kernel -fi diff --git a/board/ipe337/defenv/bin/init b/board/ipe337/defenv/bin/init deleted file mode 100644 index 93eef1c..0000000 --- a/board/ipe337/defenv/bin/init +++ /dev/null @@ -1,14 +0,0 @@ -PATH=/env/bin -export PATH - -. /env/config - -echo -n "Hit any key to stop autoboot: " -timeout -a 1 -if [ $? != 0 ]; then - echo "type update_kernel to update kernel into flash" - echo "type udate_root to update rootfs into flash" - exit -fi - -boot diff --git a/board/ipe337/defenv/bin/update_kernel b/board/ipe337/defenv/bin/update_kernel deleted file mode 100644 index a9ce158..0000000 --- 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 7d0a21d..0000000 --- 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/defenv/config b/board/ipe337/defenv/config deleted file mode 100644 index c7d6368..0000000 --- a/board/ipe337/defenv/config +++ /dev/null @@ -1,25 +0,0 @@ -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.netmask=255.255.255.0 -eth0.gateway=192.168.25.1 - -nfsroot="/home/sha/octopus/blackfin/OSELAS.BSP-Pipetronix-ipe337-trunk/root" -uimage=uImage-bfin -jffs2=root-bfin.jffs2 - -bootargs="console=ttyBF0,115200" - -# can be either 'net' or 'flash' -kernel=flash -root=flash - -if [ ! -e dev/nor0.0 ]; then - addpart /dev/nor0 $mtdparts -fi diff --git a/board/ipe337/env/bin/_update b/board/ipe337/env/bin/_update new file mode 100644 index 0000000..b21d173 --- /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/env/bin/boot b/board/ipe337/env/bin/boot new file mode 100644 index 0000000..ee10b46 --- /dev/null +++ b/board/ipe337/env/bin/boot @@ -0,0 +1,34 @@ +. /env/config + +if [ x$1 = "xflash" ]; then + root=flash + kernel=flash +fi + +if [ x$1 = "xnet" ]; then + root=net + kernel=net +fi + +if [ "$root" = flash ]; then + bootargs="$bootargs root=/dev/mtdblock4 rootfstype=jffs2" +else + if [ "$ip" = dhcp ]; then + bootargs="$bootargs ip=dhcp" + else + bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::" + fi + bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp" +fi + +bootargs="$bootargs mtdparts=physmap-flash.0:$mtdparts" + +if [ "$kernel" = net ]; then + if [ $ip = dhcp ]; then + dhcp + fi + tftp $uimage uImage + bootm uImage +else + bootm /dev/nor0.kernel +fi diff --git a/board/ipe337/env/bin/init b/board/ipe337/env/bin/init new file mode 100644 index 0000000..93eef1c --- /dev/null +++ b/board/ipe337/env/bin/init @@ -0,0 +1,14 @@ +PATH=/env/bin +export PATH + +. /env/config + +echo -n "Hit any key to stop autoboot: " +timeout -a 1 +if [ $? != 0 ]; then + echo "type update_kernel to update kernel into flash" + echo "type udate_root to update rootfs into flash" + exit +fi + +boot diff --git a/board/ipe337/env/bin/update_kernel b/board/ipe337/env/bin/update_kernel new file mode 100644 index 0000000..b62caea --- /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 0000000..4d0c9b6 --- /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/env/config b/board/ipe337/env/config new file mode 100644 index 0000000..c15fba8 --- /dev/null +++ b/board/ipe337/env/config @@ -0,0 +1,22 @@ +echo /env/config + +ip=dhcp + +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.23.1 + +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=net +root=net + +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 6b88688..276b5e2 100644 --- a/commands/ls.c +++ b/commands/ls.c @@ -34,7 +34,7 @@ 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 ccfcc95..32e1077 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 e7c98a4..d3d3dc4 100644 --- a/lib/driver.c +++ b/lib/driver.c @@ -353,7 +353,7 @@ 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