diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:49 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:49 +0100 |
commit | 154496f736db54123c3f6daaba18809fab54ed9b (patch) | |
tree | 825c8676a1af7e332c60b2c45a13f3b8ee99c19d /arch/arm/boards/panda | |
parent | 05d251f15ff50f6d114c7b9328dcbe3c8eece20f (diff) | |
parent | bd6d12be451acd7a142c0c9734721dbe4caa8fb0 (diff) | |
download | barebox-154496f736db54123c3f6daaba18809fab54ed9b.tar.gz barebox-154496f736db54123c3f6daaba18809fab54ed9b.tar.xz |
Merge branch 'for-next/omap'
Diffstat (limited to 'arch/arm/boards/panda')
-rw-r--r-- | arch/arm/boards/panda/env/boot/mmc | 10 | ||||
-rw-r--r-- | arch/arm/boards/panda/env/config | 40 | ||||
-rw-r--r-- | arch/arm/boards/panda/env/init/config-board | 7 | ||||
-rw-r--r-- | arch/arm/boards/panda/env/network/eth0-discover | 5 |
4 files changed, 22 insertions, 40 deletions
diff --git a/arch/arm/boards/panda/env/boot/mmc b/arch/arm/boards/panda/env/boot/mmc new file mode 100644 index 0000000000..58bd55742c --- /dev/null +++ b/arch/arm/boards/panda/env/boot/mmc @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ "$1" = menu ]; then + boot-menu-add-entry "$0" "MMC (ext3)" + exit +fi + +global.bootm.image="/boot/zImage" +#global.bootm.oftree="/boot/oftree" +global.linux.bootargs.dyn.root="root=mmcblk0p2 rootfstype=ext3 rootwait" diff --git a/arch/arm/boards/panda/env/config b/arch/arm/boards/panda/env/config deleted file mode 100644 index 1cd7eaa352..0000000000 --- a/arch/arm/boards/panda/env/config +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -global.hostname=panda -user= - -# use 'dhcp' to do dhcp in barebox and in kernel -# use 'none' if you want to skip kernel ip autoconfiguration -ip=dhcp - -# or set your networking parameters here -#eth0.ipaddr=a.b.c.d -#eth0.netmask=a.b.c.d -#eth0.gateway=a.b.c.d -#eth0.serverip=a.b.c.d - -# can be either 'nfs', 'tftp', 'nor' or 'nand' -kernel_loc=tftp -# can be either 'net', 'nor', 'nand' or 'initrd' -rootfs_loc=net - -kernelimage=zImage-${global.hostname} -#kernelimage=uImage-${global.hostname} -#kernelimage=Image-${global.hostname} -#kernelimage=Image-${global.hostname}.lzo - -if [ -n $user ]; then - kernelimage="$user"-"$kernelimage" - nfsroot="$eth0.serverip:/home/$user/nfsroot/${global.hostname}" - rootfsimage="$user"-"$rootfsimage" -else - nfsroot="$eth0.serverip:/path/to/nfs/root" -fi - -autoboot_timeout=3 - -bootargs="console=ttyO2,115200" - -# set a fancy prompt (if support is compiled in) -PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m " - diff --git a/arch/arm/boards/panda/env/init/config-board b/arch/arm/boards/panda/env/init/config-board new file mode 100644 index 0000000000..27e7339658 --- /dev/null +++ b/arch/arm/boards/panda/env/init/config-board @@ -0,0 +1,7 @@ +#!/bin/sh + +# board defaults, do not change in running system. Change /env/config +# instead + +global.hostname=panda +global.linux.bootargs.base="console=ttyO2,115200" diff --git a/arch/arm/boards/panda/env/network/eth0-discover b/arch/arm/boards/panda/env/network/eth0-discover new file mode 100644 index 0000000000..77552d30b3 --- /dev/null +++ b/arch/arm/boards/panda/env/network/eth0-discover @@ -0,0 +1,5 @@ +#!/bin/sh + +# Panda has a network adapter on USB + +usb |