diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-05-18 16:46:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-19 09:39:14 +0200 |
| commit | 81d081d1add8c180d79882bee9cf3ab2cc599b11 (patch) | |
| tree | a38a4f7882f0d0f8812b466cb68c9122758c1b27 /arch/arm/boards/friendlyarm-mini2440 | |
| parent | f104f55c04befbf4de0887824ff8250d022df642 (diff) | |
| download | barebox-81d081d1add8c180d79882bee9cf3ab2cc599b11.tar.gz barebox-81d081d1add8c180d79882bee9cf3ab2cc599b11.tar.xz | |
ARM: mini2440: switch to env2
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/friendlyarm-mini2440')
4 files changed, 36 insertions, 54 deletions
diff --git a/arch/arm/boards/friendlyarm-mini2440/env/boot/nand b/arch/arm/boards/friendlyarm-mini2440/env/boot/nand new file mode 100644 index 0000000000..3037fd4ca9 --- /dev/null +++ b/arch/arm/boards/friendlyarm-mini2440/env/boot/nand @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ "$1" = menu ]; then + boot-menu-add-entry "$0" "nand (UBI)" + exit +fi + +global.bootm.image="/dev/nand0.kernel.bb" +global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root rootfstype=ubifs" diff --git a/arch/arm/boards/friendlyarm-mini2440/env/config b/arch/arm/boards/friendlyarm-mini2440/env/config deleted file mode 100644 index f060aae86e..0000000000 --- a/arch/arm/boards/friendlyarm-mini2440/env/config +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -eth0.serverip= -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' or 'nand' -kernel_loc=tftp -# can be either 'net', 'nand' or 'initrd' -rootfs_loc=net - -# can be either 'jffs2' or 'ubifs' -rootfs_type=ubifs -rootfsimage=root-${global.hostname}.${rootfs_type} - -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 - -# -# "mini2440" kernel parameter -# 0 .. 9 = screen type -# b = backlight enabled -# t = touch enabled -# c = camera enabled -# Note: can be "minit2440= " if nothing of these components are connected -# -bootargs="console=ttySAC0,115200 mini2440=0tbc" - -# TODO NOR support - -nand_device="nand" -nand_parts="256k(barebox),128k(bareboxenv),1536k(kernel),-(root)" -rootfs_mtdblock_nand=3 diff --git a/arch/arm/boards/friendlyarm-mini2440/env/config-board b/arch/arm/boards/friendlyarm-mini2440/env/config-board new file mode 100644 index 0000000000..3e07a015b0 --- /dev/null +++ b/arch/arm/boards/friendlyarm-mini2440/env/config-board @@ -0,0 +1,16 @@ +#!/bin/sh + +# board defaults, do not change in running system. Change /env/config +# instead + +global.linux.bootargs.console="console=ttySAC0,115200" + +# +# "mini2440" kernel parameter +# 0 .. 9 = screen type +# b = backlight enabled +# t = touch enabled +# c = camera enabled +# Note: can be "minit2440= " if nothing of these components are connected +# +global.linux.bootargs.base="mini2440=6tb" diff --git a/arch/arm/boards/friendlyarm-mini2440/env/init/mtdparts-nand b/arch/arm/boards/friendlyarm-mini2440/env/init/mtdparts-nand new file mode 100644 index 0000000000..7271341565 --- /dev/null +++ b/arch/arm/boards/friendlyarm-mini2440/env/init/mtdparts-nand @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ "$1" = menu ]; then + init-menu-add-entry "$0" "NAND partitions" + exit +fi + +mtdparts="256k(nand0.barebox),128k(nand0.bareboxenv),1536k(nand0.kernel),-(nand0.root)" +kernelname="nand" + +mtdparts-add -b -d nand0 -k ${kernelname} -p ${mtdparts} |