[meta-freescale] [meta-fsl-arm-extra][PATCH] u-boot-boundary: update to 2013-07 release
Eric Nelson
eric.nelson at boundarydevices.com
Tue Aug 27 10:27:44 PDT 2013
This patch updates U-Boot and the boot script to the latest production
version as described in this post:
http://boundarydevices.com/u-boot-2013-07-release/
For Yocto users, it also adds support for processor and memory
configutations other than the standard Quad-core/1GB option.
To build U-Boot for other CPU or memory combinations, you can set
the UBOOT_MACHINE variable in your local.conf according to the
following table:
Processor Memory Configuration
-------------- ------ --------------------
i.MX6Quad/Dual 1GB nitrogen6q_config
i.MX6Quad/Dual 2GB nitrogen6q2g_config
i.MX6Dual-Lite 1GB nitrogen6dl_config
i.MX6Dual-Lite 2GB nitrogen6dl2g_config
i.MX6Solo 512MB nitrogen6s_config
i.MX6Solo 1GB nitrogen6s1g_config
This patch also updates the boot script to allow support
for device-tree-enabled kernels in preparation for a 3.5.7
alpha release.
If a device-tree binary (imx6q_sabrelite.dtb or imx6q_nitrogen6x.dtb)
is found in the root directory of the boot (p1) partition, it
will be passed to the kernel.
Signed-off-by: Eric Nelson <eric.nelson at boundarydevices.com>
---
conf/machine/nitrogen6x.conf | 26 +++++++++++++++++++++++-
recipes-bsp/u-boot/u-boot-boundary_git.bb | 2 +-
recipes-bsp/u-boot/u-boot-script-boundary_git.bb | 7 +++----
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf
index 9a2e440..dbf31c5 100644
--- a/conf/machine/nitrogen6x.conf
+++ b/conf/machine/nitrogen6x.conf
@@ -2,6 +2,30 @@
#@NAME: Boundary Devices Nitrogen6X
#@SOC: i.MX6Q
#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen6X
+#
+# Note that this machine configuration also supports the SABRE Lite
+# reference design and the Nitrogen6X-SOM.
+#
+# By default, this machine will build for the standard Quad-Core, 1GB
+# option.
+#
+# To build U-Boot for other CPU or memory combinations, you can set
+# the UBOOT_MACHINE variable in your local.conf according to the
+# following table:
+#
+# Processor Memory Configuration
+# -------------- ------ --------------------
+# i.MX6Quad/Dual 1GB nitrogen6q_config
+# i.MX6Quad/Dual 2GB nitrogen6q2g_config
+# i.MX6Dual-Lite 1GB nitrogen6dl_config
+# i.MX6Dual-Lite 2GB nitrogen6dl2g_config
+# i.MX6Solo 512MB nitrogen6s_config
+# i.MX6Solo 1GB nitrogen6s1g_config
+#
+# See this blog post for details:
+# http://boundarydevices.com/u-boot-updates-for-i-mx6-single
+#
+#
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa9.inc
@@ -20,7 +44,7 @@ do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
# Boot scripts to install
BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
-UBOOT_MACHINE = "nitrogen6X_config"
+UBOOT_MACHINE ?= "nitrogen6q_config"
SERIAL_CONSOLE = "115200 ttymxc1"
diff --git a/recipes-bsp/u-boot/u-boot-boundary_git.bb b/recipes-bsp/u-boot/u-boot-boundary_git.bb
index 02c8d2b..be542a6 100644
--- a/recipes-bsp/u-boot/u-boot-boundary_git.bb
+++ b/recipes-bsp/u-boot/u-boot-boundary_git.bb
@@ -8,7 +8,7 @@ PROVIDES = "u-boot"
PV = "v2013.01+git${SRCPV}"
-SRCREV = "d6b05d35b8b29392e71fdd8fa43d5cb8bd4fe276"
+SRCREV = "f89bc066db0569008418fac1a0408a9a57f2232f"
SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git"
S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
index 2088a4f..06ad438 100644
--- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
+++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
@@ -5,9 +5,8 @@ DEPENDS = "u-boot-mkimage-native"
PV = "v2013.01+git${SRCPV}"
-SRCREV = "d6b05d35b8b29392e71fdd8fa43d5cb8bd4fe276"
-SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git \
- file://nitrogen6x-bootscript-modify-for-use-with-the-Yocto.patch"
+SRCREV = "f89bc066db0569008418fac1a0408a9a57f2232f"
+SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git"
S = "${WORKDIR}/git"
@@ -19,7 +18,7 @@ do_mkimage () {
mkdir board/boundary/${MACHINE}
fi
uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
- -n "boot script" -d board/boundary/nitrogen6x/6x_bootscript.txt \
+ -n "boot script" -d board/boundary/nitrogen6x/6x_bootscript-yocto.txt \
board/boundary/${MACHINE}/6x_bootscript
uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
--
1.8.1.2
More information about the meta-freescale
mailing list