diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-14 21:30:58 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-15 11:07:15 +0100 |
| commit | 52fac4b1ff5da3deff3e9f0cae681ff23337c1f1 (patch) | |
| tree | b6428d6eb2cdabeef48844dd8ef48a5077ee0e1f /arch/arm/boards/chumby_falconwing | |
| parent | d9d9c41f776a4b4744592ab0fb64398bb8ff6636 (diff) | |
| download | barebox-52fac4b1ff5da3deff3e9f0cae681ff23337c1f1.tar.gz barebox-52fac4b1ff5da3deff3e9f0cae681ff23337c1f1.tar.xz | |
defaultenv: simplify boot
Now that we have a bootm command which boots everything we can
simplify the defaultenvironment. We can call bootm on every
image type and can remove the kernelimage_type variables.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/chumby_falconwing')
| -rw-r--r-- | arch/arm/boards/chumby_falconwing/env/bin/boot | 9 | ||||
| -rw-r--r-- | arch/arm/boards/chumby_falconwing/env/config | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/boards/chumby_falconwing/env/bin/boot b/arch/arm/boards/chumby_falconwing/env/bin/boot index 981a387a1d..999170cb4b 100644 --- a/arch/arm/boards/chumby_falconwing/env/bin/boot +++ b/arch/arm/boards/chumby_falconwing/env/bin/boot @@ -26,13 +26,6 @@ elif [ x$rootfs_loc = xinitrd ]; then bootargs="$bootargs root=/dev/ram0 rdinit=/sbin/init" fi -if [ x$kernelimage_type = xuimage ]; then - bootm /dev/$kernel_part -elif [ x$kernelimage_type = xzimage ]; then - bootz /dev/$kernel_part -else - echo "Booting failed. Correct setup of 'kernelimage_type'?" - exit -fi +bootm /dev/$kernel_part echo "Booting failed. Correct setup of 'kernel_part'?" diff --git a/arch/arm/boards/chumby_falconwing/env/config b/arch/arm/boards/chumby_falconwing/env/config index 1e61dce976..1419161253 100644 --- a/arch/arm/boards/chumby_falconwing/env/config +++ b/arch/arm/boards/chumby_falconwing/env/config @@ -25,8 +25,6 @@ rootfs_part=mmcblk0p4 # Where is the rootfs in case of 'rootfs_loc=net' nfsroot=FIXME -# The image type of the kernel. Can be uimage, zimage -kernelimage_type=uimage # Where to get the kernel image in case of 'kernel_loc=disk' kernel_part=disk0.2 |