diff options
author | Bo Shen <voice.shen@atmel.com> | 2015-03-10 14:42:46 +0800 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-12 08:30:49 +0100 |
commit | 510a3b54ead624adc38226475c7405b52f64aa40 (patch) | |
tree | 06ec0e6732ab96490f37e1bb2e3c561e3ef3f693 /arch/arm/boards/sama5d4_xplained | |
parent | dcc4a70a3c279669d21a90764cda29854244c237 (diff) | |
download | barebox-510a3b54ead624adc38226475c7405b52f64aa40.tar.gz barebox-510a3b54ead624adc38226475c7405b52f64aa40.tar.xz |
ARM: atmel: sama5d4_xplained: switch to env2
Switch sama5d4 xplained board to use default environment 2.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/sama5d4_xplained')
-rw-r--r-- | arch/arm/boards/sama5d4_xplained/env/boot/mmc | 8 | ||||
-rw-r--r-- | arch/arm/boards/sama5d4_xplained/env/boot/nand | 8 | ||||
-rw-r--r-- | arch/arm/boards/sama5d4_xplained/env/config | 42 | ||||
-rw-r--r-- | arch/arm/boards/sama5d4_xplained/env/init/automount | 5 | ||||
-rw-r--r-- | arch/arm/boards/sama5d4_xplained/env/init/mtdparts-nand | 6 | ||||
-rw-r--r-- | arch/arm/boards/sama5d4_xplained/env/init/splash (renamed from arch/arm/boards/sama5d4_xplained/env/bin/init_board) | 0 | ||||
-rw-r--r-- | arch/arm/boards/sama5d4_xplained/env/nv/boot.default | 1 | ||||
-rw-r--r-- | arch/arm/boards/sama5d4_xplained/env/nv/linux.bootargs.console | 1 |
8 files changed, 29 insertions, 42 deletions
diff --git a/arch/arm/boards/sama5d4_xplained/env/boot/mmc b/arch/arm/boards/sama5d4_xplained/env/boot/mmc new file mode 100644 index 0000000000..75a0f9b696 --- /dev/null +++ b/arch/arm/boards/sama5d4_xplained/env/boot/mmc @@ -0,0 +1,8 @@ +#!/bin/sh + +global.bootm.oftree="/mnt/mmcblk0p1/at91-sama5d4_xplained.dtb" +global.bootm.image="/mnt/mmcblk0p1/zImage" + +bootargs-ip + +global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rw rootwait" diff --git a/arch/arm/boards/sama5d4_xplained/env/boot/nand b/arch/arm/boards/sama5d4_xplained/env/boot/nand new file mode 100644 index 0000000000..d1485c6c86 --- /dev/null +++ b/arch/arm/boards/sama5d4_xplained/env/boot/nand @@ -0,0 +1,8 @@ +#!/bin/sh + +global.bootm.image="/dev/nand0.kernel.bb" +global.bootm.oftree="/dev/nand0.oftree.bb" + +bootargs-ip + +global.linux.bootargs.dyn.root="root=ubi0:rootfs ubi.mtd=rootfs rootfstype=ubifs noinitrd" diff --git a/arch/arm/boards/sama5d4_xplained/env/config b/arch/arm/boards/sama5d4_xplained/env/config deleted file mode 100644 index 1007345b9b..0000000000 --- a/arch/arm/boards/sama5d4_xplained/env/config +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# 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=nfs -# can be either 'net', 'nor', 'nand' or 'initrd' -rootfs_loc=net -# can be either 'nfs', 'tftp', 'nand' or empty -oftree_loc=nfs - -# can be either 'jffs2' or 'ubifs' -rootfs_type=ubifs -rootfsimage=root.$rootfs_type -ubiroot=rootfs - -# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo -kernelimage=zImage -#kernelimage=uImage -#kernelimage=Image -#kernelimage=Image.lzo - -nand_device=atmel_nand -nand_parts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),-(rootfs)" -rootfs_mtdblock_nand=7 - -m25p80_parts="64k(bootstrap),384k(barebox),256k(bareboxenv),256k(bareboxenv2),128k(oftree),-(updater)" - -autoboot_timeout=3 - -bootargs="console=ttyS0,115200" - -# set a fancy prompt (if support is compiled in) -PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m\n# " diff --git a/arch/arm/boards/sama5d4_xplained/env/init/automount b/arch/arm/boards/sama5d4_xplained/env/init/automount new file mode 100644 index 0000000000..3476922753 --- /dev/null +++ b/arch/arm/boards/sama5d4_xplained/env/init/automount @@ -0,0 +1,5 @@ +#!/bin/sh + +# SD card slot, first partition +mkdir -p /mnt/mmcblk0p1 +automount -d /mnt/mmcblk0p1 'mount /dev/disk0.0 /mnt/mmcblk0p1' diff --git a/arch/arm/boards/sama5d4_xplained/env/init/mtdparts-nand b/arch/arm/boards/sama5d4_xplained/env/init/mtdparts-nand new file mode 100644 index 0000000000..c947910643 --- /dev/null +++ b/arch/arm/boards/sama5d4_xplained/env/init/mtdparts-nand @@ -0,0 +1,6 @@ +#!/bin/sh + +mtdparts="256k(at91bootstrap),512k(barebox)ro,256k(bareboxenv),256k(bareboxenv2),256k(spare),512k(oftree),6M(kernel),-(rootfs)" +kernelname="atmel_nand" + +mtdparts-add -b -d nand0 -k ${kernelname} -p ${mtdparts} diff --git a/arch/arm/boards/sama5d4_xplained/env/bin/init_board b/arch/arm/boards/sama5d4_xplained/env/init/splash index f3d417e356..f3d417e356 100644 --- a/arch/arm/boards/sama5d4_xplained/env/bin/init_board +++ b/arch/arm/boards/sama5d4_xplained/env/init/splash diff --git a/arch/arm/boards/sama5d4_xplained/env/nv/boot.default b/arch/arm/boards/sama5d4_xplained/env/nv/boot.default new file mode 100644 index 0000000000..026a25cc7e --- /dev/null +++ b/arch/arm/boards/sama5d4_xplained/env/nv/boot.default @@ -0,0 +1 @@ +nand diff --git a/arch/arm/boards/sama5d4_xplained/env/nv/linux.bootargs.console b/arch/arm/boards/sama5d4_xplained/env/nv/linux.bootargs.console new file mode 100644 index 0000000000..476b1fbe49 --- /dev/null +++ b/arch/arm/boards/sama5d4_xplained/env/nv/linux.bootargs.console @@ -0,0 +1 @@ +console=ttyS0,115200 |