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

Merge branch 'for-next/defenv-2'

This commit is contained in:
Sascha Hauer 2012-11-16 14:00:45 +01:00
parent cce8e6ed41 e3e11053ef
commit c914f8aaea
39 changed files with 76 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 vendored
View File

@ -7,4 +7,4 @@ fi
global.bootm.image="/mnt/disk0.1/zImage-cfa10036"
global.bootm.oftree="/mnt/disk0.1/oftree-cfa10036"
bootargs-root-ext -r 3 -m mmcblk0p3
global.linux.bootargs.dyn.root="root=/dev/mmcblk0p3 rootfstype=ext3 rootwait"

8
arch/arm/boards/crystalfontz-cfa10036/env/init/bootargs-base vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "Base bootargs"
exit
fi
global.linux.bootargs.base="console=ttyAMA0,115200"

7
arch/arm/boards/crystalfontz-cfa10036/env/init/config-board vendored Normal file
View File

@ -0,0 +1,7 @@
#!/bin/sh
# board defaults, do not change in running system. Change /env/config
# instead
global.hostname=cfa10036
global.linux.bootargs.base="console=ttyAMA0,115200"

8
arch/arm/boards/crystalfontz-cfa10036/env/init/hostname vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "hostname"
exit
fi
global.hostname=cfa10036

8
arch/arm/boards/freescale-mx51-pdk/env/init/bootargs-base vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "Base bootargs"
exit
fi
global.linux.bootargs.base="console=ttymxc0,115200"

7
arch/arm/boards/freescale-mx51-pdk/env/init/config-board vendored Normal file
View File

@ -0,0 +1,7 @@
#!/bin/sh
# board defaults, do not change in running system. Change /env/config
# instead
global.hostname=babbage
global.linux.bootargs.base="console=ttymxc0,115200"

8
arch/arm/boards/freescale-mx51-pdk/env/init/hostname vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "hostname"
exit
fi
global.hostname=babbage

8
arch/arm/boards/freescale-mx6-sabrelite/env/init/bootargs-base vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "Base bootargs"
exit
fi
global.linux.bootargs.base="console=ttymxc1,115200"

7
arch/arm/boards/freescale-mx6-sabrelite/env/init/config-board vendored Normal file
View File

@ -0,0 +1,7 @@
#!/bin/sh
# board defaults, do not change in running system. Change /env/config
# instead
global.hostname=SabreLite
global.linux.bootargs.base="console=ttymxc1,115200"

8
arch/arm/boards/freescale-mx6-sabrelite/env/init/hostname vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "hostname"
exit
fi
global.hostname=SabreLite

8
arch/arm/boards/karo-tx53/env/init/bootargs-base vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "Base bootargs"
exit
fi
global.linux.bootargs.base="console=ttymxc0,115200"

7
arch/arm/boards/karo-tx53/env/init/config-board vendored Normal file
View File

@ -0,0 +1,7 @@
#!/bin/sh
# board defaults, do not change in running system. Change /env/config
# instead
global.hostname=tx53
global.linux.bootargs.base="console=ttymxc0,115200"

8
arch/arm/boards/karo-tx53/env/init/hostname vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "hostname"
exit
fi
global.hostname=tx53

2
arch/arm/boards/pcm038/env/boot/nand-ubi vendored
View File

@ -7,4 +7,4 @@ fi
global.bootm.image="/dev/nand0.kernel.bb"
#global.bootm.oftree="/env/oftree"
bootargs-root-ubi -r root -m nand0.root
global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root rootfstype=ubifs"

8
arch/arm/boards/pcm038/env/init/bootargs-base vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "Base bootargs"
exit
fi
global.linux.bootargs.base="console=ttymxc0,115200"

7
arch/arm/boards/pcm038/env/init/config-board vendored Normal file
View File

@ -0,0 +1,7 @@
#!/bin/sh
# board defaults, do not change in running system. Change /env/config
# instead
global.hostname=pcm038
global.linux.bootargs.base="console=ttymxc0,115200"

8
arch/arm/boards/pcm038/env/init/hostname vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "hostname"
exit
fi
global.hostname=pcm038

8
arch/arm/boards/tqma53/env/init/bootargs-base vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "Base bootargs"
exit
fi
global.linux.bootargs.base="console=ttymxc0,115200"

7
arch/arm/boards/tqma53/env/init/config-board vendored Normal file
View File

@ -0,0 +1,7 @@
#!/bin/sh
# board defaults, do not change in running system. Change /env/config
# instead
global.hostname=tqma53
global.linux.bootargs.base="console=ttymxc0,115200"

8
arch/arm/boards/tqma53/env/init/hostname vendored
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "hostname"
exit
fi
global.hostname=tqma53

7
defaultenv-2/base/bin/bootargs-ip-barebox
View File

@ -1,7 +0,0 @@
#!/bin/sh
# pass barebox ip settings for eth0 to Linux
ifup eth0
global.linux.bootargs.dyn.ip="ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask::eth0:"

5
defaultenv-2/base/bin/bootargs-ip-dhcp
View File

@ -1,5 +0,0 @@
#!/bin/sh
# Do dhcp in Linux
global.linux.bootargs.dyn.ip="ip=dhcp"

5
defaultenv-2/base/bin/bootargs-ip-none
View File

@ -1,5 +0,0 @@
#!/bin/sh
# disable ip setup in Linux
global.linux.bootargs.dyn.ip="ip=none"

26
defaultenv-2/base/bin/bootargs-root-disk
View File

@ -1,26 +0,0 @@
#!/bin/sh
usage="$0 [OPTIONS]\n -p <partition>\n -t <fstype>"
while getopt "p:t:h" opt; do
if [ ${opt} = p ]; then
part=${OPTARG}
elif [ ${opt} = t ]; then
fstype=${OPTARG}
elif [ ${opt} = h ]; then
echo -e "$usage"
exit 0
fi
done
if [ -z "${part}" ]; then
echo "$0: no partition given"
exit 1
fi
if [ -z "${fstype}" ]; then
echo "$0: no filesystem type given"
exit 1
fi
global.linux.bootargs.dyn.root="root=/dev/$part rootfstype=$fstype rootwait"

12
defaultenv-2/base/bin/bootargs-root-ext
View File

@ -1,12 +0,0 @@
#!/bin/sh
while getopt "m:r:" opt; do
if [ ${opt} = m ]; then
part=${OPTARG}
fi
if [ ${opt} = r ]; then
type=${OPTARG}
fi
done
global.linux.bootargs.dyn.root="root=/dev/$part rootfstype=ext$type rootwait"

16
defaultenv-2/base/bin/bootargs-root-initrd
View File

@ -1,16 +0,0 @@
#!/bin/sh
rdinit="/sbin/init"
usage="$0 [OPTIONS]\n -i <rdinitpath> (/sbin/init)"
while getopt "i:h" opt; do
if [ ${opt} = i ]; then
rdinit=${OPTARG}
elif [ ${opt} = h ]; then
echo -e "$usage"
exit 0
fi
done
global.linux.bootargs.dyn.root="root=/dev/ram0 rdinit=${rdinit}"

21
defaultenv-2/base/bin/bootargs-root-jffs2
View File

@ -1,21 +0,0 @@
#!/bin/sh
mtd=
usage="$0 [OPTIONS]\n -m <mtd>"
while getopt "m:h" opt; do
if [ ${opt} = m ]; then
mtd=${OPTARG}
elif [ ${opt} = h ]; then
echo -e "$usage"
exit 0
fi
done
if [ -z "$mtd" ]; then
echo -e "$usage"
exit 1
fi
global.linux.bootargs.dyn.root="root=$mtd rootfstype=jffs2"

20
defaultenv-2/base/bin/bootargs-root-nfs
View File

@ -1,20 +0,0 @@
#!/bin/sh
usage="$0 [OPTIONS]\n -n <nfspath>\n -s <serverip>"
while getopt "n:s:h" opt; do
if [ ${opt} = n ]; then
nfsroot=${OPTARG}
elif [ ${opt} = s ]; then
serverip=${OPTARG}
elif [ ${opt} = h ]; then
echo -e "$usage"
exit 0
fi
done
if [ -n ${serverip} ]; then
nfsroot="$serverip:$nfsroot"
fi
global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp"

24
defaultenv-2/base/bin/bootargs-root-ubi
View File

@ -1,24 +0,0 @@
#!/bin/sh
ubiroot=root
mtd=
usage="$0 [OPTIONS]\n -r <ubiroot> (root)\n -m <mtd>"
while getopt "m:r:h" opt; do
if [ ${opt} = r ]; then
ubiroot=${OPTARG}
elif [ ${opt} = m ]; then
mtd=${OPTARG}
elif [ ${opt} = h ]; then
echo -e "$usage"
exit 0
fi
done
if [ -z "$mtd" ]; then
echo -e "$usage"
exit 1
fi
global.linux.bootargs.dyn.root="root=ubi0:$ubiroot ubi.mtd=$mtd rootfstype=ubifs"

10
defaultenv-2/base/bin/init
View File

@ -8,12 +8,18 @@ global autoboot_timeout=3
global boot.default=net
global allow_color=true
global linux.bootargs.base
#linux.bootargs.dyn.* will be clearer at the beginning of boot
#linux.bootargs.dyn.* will be cleared at the beginning of boot
global linux.bootargs.dyn.ip
global linux.bootargs.dyn.root
global editcmd=sedit
/env/init/general
/env/config
if [ ${global.allow_color} = "true" ]; then
export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m "
else
export PS1="barebox@\h:\w "
fi
if [ -e /env/menu ]; then
echo -e -n "\nHit m for menu or any other key to stop autoboot: "

17
defaultenv-2/base/boot/initrd
View File

@ -1,17 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
boot-menu-add-entry "$0" "kernel + initrd via tftp"
exit
fi
path="/mnt/tftp"
global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
global.bootm.initrd="${path}/initramfs"
bootargs-root-initrd
#global.bootm.oftree=<path to oftree>
global.linux.bootargs.dyn.root="root=/dev/ram0"
#bootargs-root-nfs -n "<path on server>" -s <serverip>
#bootargs-root-ubi -r <volume> -m <mtdname>

2
defaultenv-2/base/boot/net
View File

@ -11,4 +11,4 @@ global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
#global.bootm.oftree="${path}/${global.user}-oftree-${global.hostname}"
nfsroot="/home/${global.user}/nfsroot/${global.hostname}"
bootargs-ip
bootargs-root-nfs -n "$nfsroot"
global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp"

21
defaultenv-2/base/config Normal file
View File

@ -0,0 +1,21 @@
#!/bin/sh
# change network settings in /env/network/eth0
# change mtd partition settings and automountpoints in /env/init/*
#global.hostname=
# set to false if you do not want to have colors
global.allow_color=true
# user (used for network filenames)
global.user=none
# timeout in seconds before the default boot entry is started
global.autoboot_timeout=3
# default boot entry (one of /env/boot/*)
global.boot.default=net
# base bootargs
#global.linux.bootargs.base="console=ttyS0,115200"

4
defaultenv-2/base/data/boot-template
View File

@ -11,6 +11,4 @@ global.bootm.image=<path to image>
#bootargs-ip
#bootargs-root-nfs -n "<path on server>" -s <serverip>
#bootargs-root-jffs2 -m <mtdname>
#bootargs-root-ubi -r <volume> -m <mtdname>
global.linux.bootargs.dyn.root="root=<rootfs here>"

8
defaultenv-2/base/init/bootargs-base
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "Base bootargs"
exit
fi
global.linux.bootargs.base="console=ttyS0,115200"

15
defaultenv-2/base/init/general
View File

@ -1,15 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "general config settings"
exit
fi
# user (used for network filenames)
global.user=none
# timeout in seconds before the default boot entry is started
global.autoboot_timeout=3
# default boot entry (one of /env/boot/*)
global.boot.default=net

8
defaultenv-2/base/init/hostname
View File

@ -1,8 +0,0 @@
#!/bin/sh
if [ "$1" = menu ]; then
init-menu-add-entry "$0" "hostname"
exit
fi
global.hostname=generic

7
defaultenv-2/base/init/prompt
View File

@ -1,7 +0,0 @@
#!/bin/sh
if [ ${global.allow_color} = "true" ]; then
export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m "
else
export PS1="barebox@\h:\w "
fi

1
defaultenv-2/menu/menu/mainmenu
View File

@ -15,6 +15,7 @@ while true; do
boot-entries-collect
menu -e -a -R -m boot -c "$global.editcmd /env/network/eth0" -d "Network settings"
menu -e -a -R -m boot -c "$global.editcmd /env/config" -d "Config settings"
menu -e -a -m boot -c "boot-entries-edit" -d "Edit boot entries"
menu -e -a -m boot -c "init-entries-edit" -d "Edit init entries"
menu -e -a -R -m boot -c "saveenv || echo \"failed to save environment\" && sleep 2" -d "Save settings"