diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-06 14:11:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-06 14:11:57 +0200 |
| commit | 497d1c49f4b75a6827bb400513d53a39dc8bb57c (patch) | |
| tree | 3227133463cb942c4d5be45108aab82e79daa98c /arch/arm/boards/freescale-mx51-pdk | |
| parent | 94418c2d0d3d7dbaa6995fb53f00a5d5fc9f4028 (diff) | |
| parent | 4024d9ca11295b63dd2b9b795a8f1019b9bba64a (diff) | |
| download | barebox-497d1c49f4b75a6827bb400513d53a39dc8bb57c.tar.gz barebox-497d1c49f4b75a6827bb400513d53a39dc8bb57c.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/boards/freescale-mx51-pdk')
4 files changed, 18 insertions, 49 deletions
diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c index 00133fc22f..0bb2ffed29 100644 --- a/arch/arm/boards/freescale-mx51-pdk/board.c +++ b/arch/arm/boards/freescale-mx51-pdk/board.c @@ -257,8 +257,8 @@ device_initcall(f3s_devices_init); static int f3s_part_init(void) { - devfs_add_partition("disk0", 0x00000, 0x40000, PARTITION_FIXED, "self0"); - devfs_add_partition("disk0", 0x40000, 0x20000, PARTITION_FIXED, "env0"); + devfs_add_partition("disk0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self0"); + devfs_add_partition("disk0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0"); return 0; } diff --git a/arch/arm/boards/freescale-mx51-pdk/env/config b/arch/arm/boards/freescale-mx51-pdk/env/config deleted file mode 100644 index 7a2841e606..0000000000 --- a/arch/arm/boards/freescale-mx51-pdk/env/config +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -hostname=babbage -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', 'nor' or 'nand' -kernel_loc=tftp -# can be either 'net', 'nor', 'nand' or 'initrd' -rootfs_loc=net - -# can be either 'jffs2' or 'ubifs' -rootfs_type=ubifs -rootfsimage=root-$hostname.$rootfs_type - -kernelimage=zImage-$hostname -#kernelimage=uImage-$hostname -#kernelimage=Image-$hostname -#kernelimage=Image-$hostname.lzo - -if [ -n $user ]; then - kernelimage="$user"-"$kernelimage" - nfsroot="$eth0.serverip:/home/$user/nfsroot/$hostname" - rootfsimage="$user"-"$rootfsimage" -else - nfsroot="$eth0.serverip:/path/to/nfs/root" -fi - -autoboot_timeout=3 - -bootargs="console=ttymxc0,115200" - -disk_parts="256k(barebox)ro,128k(bareboxenv),4M(kernel),-(root)" - -# 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/freescale-mx51-pdk/env/init/bootargs-base b/arch/arm/boards/freescale-mx51-pdk/env/init/bootargs-base new file mode 100644 index 0000000000..d86975406e --- /dev/null +++ b/arch/arm/boards/freescale-mx51-pdk/env/init/bootargs-base @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ "$1" = menu ]; then + init-menu-add-entry "$0" "Base bootargs" + exit +fi + +global.linux.bootargs.base="console=ttymxc0,115200" diff --git a/arch/arm/boards/freescale-mx51-pdk/env/init/hostname b/arch/arm/boards/freescale-mx51-pdk/env/init/hostname new file mode 100644 index 0000000000..4c78902a17 --- /dev/null +++ b/arch/arm/boards/freescale-mx51-pdk/env/init/hostname @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ "$1" = menu ]; then + init-menu-add-entry "$0" "hostname" + exit +fi + +global.hostname=babbage |