summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-02-27 11:03:07 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-03-03 16:22:06 +0100
commit3d61f0865bc4fbacbb00a15939565e9e888d0dc9 (patch)
tree46adf4ffbf2e940895135b90e9db270bc8eea87a
parent2cc328ec2d59367d617dac89ede9ef716a08d059 (diff)
downloadbarebox-3d61f0865bc4fbacbb00a15939565e9e888d0dc9.tar.gz
barebox-3d61f0865bc4fbacbb00a15939565e9e888d0dc9.tar.xz
ARM: cfa10036: Remove the boot partition and boot from ext
Support for ext filesystems has been introduced recently. We can now boot directly from our rootfs, loading the kernel and device tree images from /boot. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext36
-rw-r--r--arch/arm/configs/cfa10036_defconfig1
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 b/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3
index 439d1746a..4d830edc6 100644
--- a/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3
+++ b/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3
@@ -5,6 +5,6 @@ if [ "$1" = menu ]; then
exit
fi
-global.bootm.image="/mnt/disk0.2/zImage-${global.hostname}"
-global.bootm.oftree="/mnt/disk0.2/oftree-${global.board.variant}"
-global.linux.bootargs.dyn.root="root=/dev/mmcblk0p4 rootfstype=ext3 rootwait"
+global.bootm.image="/mnt/disk0.2/boot/zImage-${global.hostname}"
+global.bootm.oftree="/mnt/disk0.2/boot/oftree-${global.board.variant}"
+global.linux.bootargs.dyn.root="root=/dev/mmcblk0p3 rootfstype=ext3 rootwait"
diff --git a/arch/arm/configs/cfa10036_defconfig b/arch/arm/configs/cfa10036_defconfig
index c55d50dcd..277a3ec9e 100644
--- a/arch/arm/configs/cfa10036_defconfig
+++ b/arch/arm/configs/cfa10036_defconfig
@@ -39,5 +39,6 @@ CONFIG_I2C=y
CONFIG_MCI=y
CONFIG_MCI_STARTUP=y
CONFIG_MCI_MXS=y
+CONFIG_FS_EXT4=y
CONFIG_FS_FAT=y
CONFIG_FS_FAT_LFN=y