summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/usb-a926x/env/config
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-01-05 10:25:17 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-01-05 10:25:17 +0100
commit0d22025084222720b85c6019e8eb728e71dc8986 (patch)
tree1938fa6daa3598aed5c48293f684fba389fa8016 /arch/arm/boards/usb-a926x/env/config
parentea2211218c291d08b22fef201ccf23dbeb073eb3 (diff)
parent8eae82e3ae44e74fcbb2a619037db3e0f10c4f58 (diff)
downloadbarebox-0d22025084222720b85c6019e8eb728e71dc8986.tar.gz
barebox-0d22025084222720b85c6019e8eb728e71dc8986.tar.xz
Merge branch 'next'
Diffstat (limited to 'arch/arm/boards/usb-a926x/env/config')
-rw-r--r--arch/arm/boards/usb-a926x/env/config5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/boards/usb-a926x/env/config b/arch/arm/boards/usb-a926x/env/config
index d77f6785f5..96a4524844 100644
--- a/arch/arm/boards/usb-a926x/env/config
+++ b/arch/arm/boards/usb-a926x/env/config
@@ -19,14 +19,9 @@ rootfs_loc=net
rootfs_type=ubifs
rootfsimage=root.$rootfs_type
-# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
-#kernelimage_type=zimage
#kernelimage=zImage
-kernelimage_type=uimage
kernelimage=uImage
-#kernelimage_type=raw
#kernelimage=Image
-#kernelimage_type=raw_lzo
#kernelimage=Image.lzo
nand_device=atmel_nand