sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'ipe337'

This commit is contained in:
Marc Kleine-Budde 2007-11-12 15:58:53 +01:00
parent fcfd25606c e3b2a8f972
commit 57cae4e826
13 changed files with 55 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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; \

9
arch/blackfin/configs/ipe337_defconfig
View File

@ -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

20
board/ipe337/defenv/bin/update_kernel
View File

@ -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

20
board/ipe337/defenv/bin/update_root
View File

@ -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"

23
board/ipe337/env/bin/_update vendored Normal file
View File

@ -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

3
board/ipe337/defenv/bin/boot → board/ipe337/env/bin/boot vendored
View File

@ -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

0
board/ipe337/defenv/bin/init → board/ipe337/env/bin/init vendored
View File

6
board/ipe337/env/bin/update_kernel vendored Normal file
View File

@ -0,0 +1,6 @@
. /env/config
image=$uimage
part=/dev/nor0.kernel
. /env/bin/_update $1

6
board/ipe337/env/bin/update_root vendored Normal file
View File

@ -0,0 +1,6 @@
. /env/config
image=$jffs2
part=/dev/nor0.root
. /env/bin/_update $1

25
board/ipe337/defenv/config → board/ipe337/env/config vendored
View File

@ -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.netmask=255.255.255.0
eth0.gateway=192.168.25.1
nfsroot="/home/sha/octopus/blackfin/OSELAS.BSP-Pipetronix-ipe337-trunk/root"
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=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

2
commands/ls.c
View File

@ -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)

4
drivers/net/smc911x.c
View File

@ -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

2
lib/driver.c
View File

@ -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