MIRRORS/meta-freescale-3rdparty
1
0
Fork 0
mirror of https://github.com/Freescale/meta-freescale-3rdparty.git synced 2025-07-19 12:09:01 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

u-boot-boundary: Update to 2013-07 release

Browse Source 
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
configurations 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.

Change-Id: Ieeeb4b094ddfbcf3982bfe4a682015b5cbe25797
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Eric Nelson 2013-08-27 18:52:26 +00:00 committed by Otavio Salvador
parent 191404273c
commit 69bed23e70
4 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
conf/machine/nitrogen6x.conf
View File

@ -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"

2
recipes-bsp/u-boot/u-boot-boundary_git.bb
View File

@ -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"

34
recipes-bsp/u-boot/u-boot-script-boundary/nitrogen6x-bootscript-modify-for-use-with-the-Yocto.patch
View File

@ -1,34 +0,0 @@
From a0739ed017cd097817d227e98848f66c8e5d666e Mon Sep 17 00:00:00 2001
From: Eric Nelson <eric.nelson@boundarydevices.com>
Date: Tue, 11 Dec 2012 11:59:47 -0700
Subject: [PATCH] nitrogen6x bootscript: modify for use with the Yocto Project
Change 6x_bootscript to match the partitioning scheme currently in
use by meta-fsl-arm:
- Set root filesystem to partition 2 (/dev/mmcblk0p2)
- Load kernel from root of partition 1
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
board/boundary/nitrogen6x/6x_bootscript.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/board/boundary/nitrogen6x/6x_bootscript.txt b/board/boundary/nitrogen6x/6x_bootscript.txt
index fe75976..1d766ca 100644
--- a/board/boundary/nitrogen6x/6x_bootscript.txt
+++ b/board/boundary/nitrogen6x/6x_bootscript.txt
@@ -53,6 +53,6 @@ done
setenv bootargs $bootargs $fbmem
-setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p1 rootwait consoleblank=0 ;
-${fs}load mmc ${disk}:1 10800000 /boot/uImage && bootm 10800000 ; echo "Error loading kernel image"
+setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 ;
+${fs}load mmc ${disk}:1 10800000 uImage && bootm 10800000 ; echo "Error loading kernel image"
--
1.7.10.4

7
recipes-bsp/u-boot/u-boot-script-boundary_git.bb
View File

@ -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 \