From 26a95b0002bf7c6d2037f971181a183cc777291b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Eric=20B=C3=A9nard?= Date: Sun, 1 Apr 2012 15:15:06 +0200 Subject: [PATCH] barebox: adapt to new sdcard class MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 8353415 Major refactor in SDCard generation now puts the uImage in a fat partition even for barebox so adapt the barebox environment to this new behaviour (which makes kernel updates easier then in the previous bbsdimage) Signed-off-by: Eric Bénard --- ...default-config-for-OE-s-sdcard-image.patch | 41 +++++++++++++++++++ .../barebox/barebox-2012.02.0/imx53qsb/config | 6 +-- .../recipes-bsp/barebox/barebox_2012.02.0.bb | 3 +- 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 meta-fsl-arm/recipes-bsp/barebox/barebox-2012.02.0/imx53qsb/0001-imx53qsb-default-config-for-OE-s-sdcard-image.patch diff --git a/meta-fsl-arm/recipes-bsp/barebox/barebox-2012.02.0/imx53qsb/0001-imx53qsb-default-config-for-OE-s-sdcard-image.patch b/meta-fsl-arm/recipes-bsp/barebox/barebox-2012.02.0/imx53qsb/0001-imx53qsb-default-config-for-OE-s-sdcard-image.patch new file mode 100644 index 00000000..6a3c0006 --- /dev/null +++ b/meta-fsl-arm/recipes-bsp/barebox/barebox-2012.02.0/imx53qsb/0001-imx53qsb-default-config-for-OE-s-sdcard-image.patch @@ -0,0 +1,41 @@ +From b2c59fb4fd00e4a1ef153a09bf2717738ee437a2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Sat, 31 Mar 2012 15:13:02 +0200 +Subject: [PATCH] imx53qsb: default config for OE's sdcard image +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Eric Bénard +--- + .../boards/freescale-mx53-loco/env/bin/init_board | 4 ++++ + defaultenv/bin/boot | 2 ++ + 2 files changed, 6 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/boards/freescale-mx53-loco/env/bin/init_board + +diff --git a/arch/arm/boards/freescale-mx53-loco/env/bin/init_board b/arch/arm/boards/freescale-mx53-loco/env/bin/init_board +new file mode 100644 +index 0000000..3a5ae42 +--- /dev/null ++++ b/arch/arm/boards/freescale-mx53-loco/env/bin/init_board +@@ -0,0 +1,4 @@ ++#!/bin/sh ++ ++mkdir /mnt ++mount /dev/disk0.1 fat /mnt +diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot +index 1120757..e46705d 100644 +--- a/defaultenv/bin/boot ++++ b/defaultenv/bin/boot +@@ -84,6 +84,8 @@ elif [ x$kernel_loc = xnand ]; then + kdev="/dev/nand0.kernel.bb" + elif [ x$kernel_loc = xdisk ]; then + kdev="/dev/$kernel_part" ++elif [ x$kernel_loc = xmnt ]; then ++ kdev="/mnt/$kernel_name" + else + echo "error: set kernel_loc to one of 'tftp', 'nfs', 'nand', 'nor' or 'disk'" + exit 1 +-- +1.7.7.6 + diff --git a/meta-fsl-arm/recipes-bsp/barebox/barebox-2012.02.0/imx53qsb/config b/meta-fsl-arm/recipes-bsp/barebox/barebox-2012.02.0/imx53qsb/config index 3398c957..b60bf3ca 100644 --- a/meta-fsl-arm/recipes-bsp/barebox/barebox-2012.02.0/imx53qsb/config +++ b/meta-fsl-arm/recipes-bsp/barebox/barebox-2012.02.0/imx53qsb/config @@ -15,13 +15,13 @@ ip=dhcp #eth0.serverip=a.b.c.d # can be either 'nfs', 'tftp', 'nor' or 'nand' -kernel_loc=disk +kernel_loc=mnt # can be either 'net', 'nor', 'nand' or 'initrd' rootfs_loc=disk # boot parameters for SDCard boot -kernel_part=disk0.kernel -rootfs_part_linux_dev=mmcblk0p1 +kernel_name=uImage +rootfs_part_linux_dev=mmcblk0p3 rootfs_type=ext3 # can be either 'jffs2' or 'ubifs' diff --git a/meta-fsl-arm/recipes-bsp/barebox/barebox_2012.02.0.bb b/meta-fsl-arm/recipes-bsp/barebox/barebox_2012.02.0.bb index 3969c79b..3fad26f4 100644 --- a/meta-fsl-arm/recipes-bsp/barebox/barebox_2012.02.0.bb +++ b/meta-fsl-arm/recipes-bsp/barebox/barebox_2012.02.0.bb @@ -1,6 +1,6 @@ require barebox.inc -PR = "r0" +PR = "r1" SRC_URI = "http://barebox.org/download/${PN}-${PV}.tar.bz2 \ file://defconfig \ @@ -18,6 +18,7 @@ SRC_URI_append_imx53qsb = " \ file://0005-mx53-loco-add-i2c-support.patch \ file://0006-mx53-loco-add-board-revision-support.patch \ file://0007-mx53-loco-update-defconfig.patch \ + file://0001-imx53qsb-default-config-for-OE-s-sdcard-image.patch \ " do_configure_prepend_imx53qsb() { -- 2.40.1