* [Buildroot] [PATCH v2 01/14] freescale-imx: bump to 3.14.28-1.0.0_ga release
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 02/14] imx-kobs: add new package Gary Bisson
` (12 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Add hash files for the updated packages.
Also update the license of firmware-imx.
This patch is based on the Yocto equivalent:
5521d77c9f191b5808cb3bad4af9484ac
Those packages have been implicitely tested through gstreamer as the
plugins rely on them for vpu decoding for instance:
# gst-launch-0.10 playbin
# uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \
matroskademux ! imxvpudec ! imxipuvideosink
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
package/freescale-imx/firmware-imx/firmware-imx.hash | 2 ++
package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +-
package/freescale-imx/freescale-imx.mk | 2 +-
package/freescale-imx/imx-lib/imx-lib.hash | 2 ++
4 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 package/freescale-imx/firmware-imx/firmware-imx.hash
create mode 100644 package/freescale-imx/imx-lib/imx-lib.hash
diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash
new file mode 100644
index 0000000..0b89c4b
--- /dev/null
+++ b/package/freescale-imx/firmware-imx/firmware-imx.hash
@@ -0,0 +1,2 @@
+# locally computed
+sha256 1f09acd4d605efc78a0672068a658cb16274811d2f444cf3ae7aaa075266746f firmware-imx-3.14.28-1.0.0.bin
diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
index 71e49e6..9cab5c2 100644
--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -10,7 +10,7 @@ FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin
FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \
Atheros license (ath6k)
-FIRMWARE_IMX_LICENSE_FILES = EULA licenses/vpu/EULA
+FIRMWARE_IMX_LICENSE_FILES = EULA COPYING
FIRMWARE_IMX_REDISTRIBUTE = NO
FIRMWARE_IMX_BLOBS = ath6k sdma vpu
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index 26c591b..d4f8967 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FREESCALE_IMX_VERSION = 3.10.53-1.1.0
+FREESCALE_IMX_VERSION = 3.14.28-1.0.0
FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
# Helper for self-extracting binaries distributed by Freescale.
diff --git a/package/freescale-imx/imx-lib/imx-lib.hash b/package/freescale-imx/imx-lib/imx-lib.hash
new file mode 100644
index 0000000..85f0a40
--- /dev/null
+++ b/package/freescale-imx/imx-lib/imx-lib.hash
@@ -0,0 +1,2 @@
+# locally computed
+sha256 46022817d25f154b60247fdcbb87216e23e553bd88ec9664b1b5d5911e7aa2a2 imx-lib-3.14.28-1.0.0.tar.gz
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 02/14] imx-kobs: add new package
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 01/14] freescale-imx: bump to 3.14.28-1.0.0_ga release Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-19 13:44 ` Thomas Petazzoni
2015-09-11 9:39 ` [Buildroot] [PATCH v2 03/14] kobs-ng: remove obsolete package Gary Bisson
` (11 subsequent siblings)
13 siblings, 1 reply; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Based on the Yocto 3.14.28-1.0.0_ga update:
https://github.com/Freescale/meta-fsl-arm/commit/6c44744
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
Hi,
This package has only been built as I have no i.MX device that has a
NAND Flash.
Regards,
Gary
---
package/freescale-imx/Config.in | 1 +
package/freescale-imx/imx-kobs/Config.in | 10 ++++++++++
package/freescale-imx/imx-kobs/imx-kobs.hash | 2 ++
package/freescale-imx/imx-kobs/imx-kobs.mk | 12 ++++++++++++
4 files changed, 25 insertions(+)
create mode 100644 package/freescale-imx/imx-kobs/Config.in
create mode 100644 package/freescale-imx/imx-kobs/imx-kobs.hash
create mode 100644 package/freescale-imx/imx-kobs/imx-kobs.mk
diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index dffe76f..a958dbd 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -42,6 +42,7 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
default "IMX53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
+source "package/freescale-imx/imx-kobs/Config.in"
source "package/freescale-imx/imx-lib/Config.in"
source "package/freescale-imx/imx-vpu/Config.in"
source "package/freescale-imx/firmware-imx/Config.in"
diff --git a/package/freescale-imx/imx-kobs/Config.in b/package/freescale-imx/imx-kobs/Config.in
new file mode 100644
index 0000000..fc2344e
--- /dev/null
+++ b/package/freescale-imx/imx-kobs/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_IMX_KOBS
+ bool "imx-kobs"
+ depends on BR2_arm # Only relevant for i.MX
+ help
+ The imx-kobs tool is used for writing images to NAND on i.MX
+ platforms.
+
+ This library is provided by Freescale as-is and doesn't have
+ an upstream.
+
diff --git a/package/freescale-imx/imx-kobs/imx-kobs.hash b/package/freescale-imx/imx-kobs/imx-kobs.hash
new file mode 100644
index 0000000..13373ea
--- /dev/null
+++ b/package/freescale-imx/imx-kobs/imx-kobs.hash
@@ -0,0 +1,2 @@
+# locally computed
+sha256 cfac042f5c96731205c397a4a6b3ed966f804569ae4d0e2685d22fdf6bdc9eb7 imx-kobs-3.14.28-1.0.0.tar.gz
diff --git a/package/freescale-imx/imx-kobs/imx-kobs.mk b/package/freescale-imx/imx-kobs/imx-kobs.mk
new file mode 100644
index 0000000..02c5cad
--- /dev/null
+++ b/package/freescale-imx/imx-kobs/imx-kobs.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# imx-kobs
+#
+################################################################################
+
+IMX_KOBS_VERSION = $(FREESCALE_IMX_VERSION)
+IMX_KOBS_SITE = $(FREESCALE_IMX_SITE)
+IMX_KOBS_LICENSE = GPLv2+
+IMX_KOBS_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 02/14] imx-kobs: add new package
2015-09-11 9:39 ` [Buildroot] [PATCH v2 02/14] imx-kobs: add new package Gary Bisson
@ 2015-09-19 13:44 ` Thomas Petazzoni
0 siblings, 0 replies; 16+ messages in thread
From: Thomas Petazzoni @ 2015-09-19 13:44 UTC (permalink / raw)
To: buildroot
Dear Gary Bisson,
On Fri, 11 Sep 2015 11:39:41 +0200, Gary Bisson wrote:
> Based on the Yocto 3.14.28-1.0.0_ga update:
> https://github.com/Freescale/meta-fsl-arm/commit/6c44744
>
> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
This package does not build on musl, due to loff_t being undefined.
Since it fails on some MTD related code, maybe you should look into
mtd-utils commits to see how they fixed the musl compatibility
problems. I believe using the loff_t type is wrong, and another type
should be used, like off_t.
So I've marked this patch, and the kobs-ng deprecation patch as
"Changes Requested".
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v2 03/14] kobs-ng: remove obsolete package
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 01/14] freescale-imx: bump to 3.14.28-1.0.0_ga release Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 02/14] imx-kobs: add new package Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 04/14] imx-gpu-viv: bump version to 5.0.11 p4.5 Gary Bisson
` (10 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
In favor of imx-kobs maintained by Freescale.
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
Config.in.legacy | 8 ++++
package/Config.in | 1 -
package/kobs-ng/0001-fix-mtd-defines.patch | 73 ------------------------------
package/kobs-ng/Config.in | 9 ----
package/kobs-ng/kobs-ng.hash | 2 -
package/kobs-ng/kobs-ng.mk | 13 ------
6 files changed, 8 insertions(+), 98 deletions(-)
delete mode 100644 package/kobs-ng/0001-fix-mtd-defines.patch
delete mode 100644 package/kobs-ng/Config.in
delete mode 100644 package/kobs-ng/kobs-ng.hash
delete mode 100644 package/kobs-ng/kobs-ng.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 52031fe..dfbf6db 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -316,6 +316,14 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW
BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all
examples.
+config BR2_PACKAGE_KOBS_NG
+ bool "kobs-ng was replaced by imx-kobs"
+ select BR2_LEGACY
+ select BR2_PACKAGE_IMX_KOBS
+ help
+ The outdated kobs-ng has been replaced by the Freescale-
+ maintained imx-kobs package.
+
config BR2_PACKAGE_SAWMAN
bool "sawman package removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 030477a..bbd6f37 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -163,7 +163,6 @@ menu "Filesystem and flash utilities"
source "package/genext2fs/Config.in"
source "package/genpart/Config.in"
source "package/genromfs/Config.in"
- source "package/kobs-ng/Config.in"
source "package/makedevs/Config.in"
source "package/mmc-utils/Config.in"
source "package/mtd/Config.in"
diff --git a/package/kobs-ng/0001-fix-mtd-defines.patch b/package/kobs-ng/0001-fix-mtd-defines.patch
deleted file mode 100644
index 3ffba71..0000000
--- a/package/kobs-ng/0001-fix-mtd-defines.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Newer kernel headers renamed mtd mode defines and no longer support
-MEMSETOOBSEL. Allow code to work with both older and newer kernel
-versions.
-
-Signed-off-by: Paul B. Henson <henson@acm.org>
-Signed-off-by: Sergey Alyoshin <alyoshin.s@gmail.com>
-
-diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c
---- kobs-ng-3.0.35-4.0.0-orig/src/mtd.c 2012-12-17 22:37:40.000000000 -0800
-+++ kobs-ng-3.0.35-4.0.0/src/mtd.c 2013-07-28 19:39:59.000000000 -0700
-@@ -852,8 +852,11 @@
- mp = &md->part[i];
-
- if (mp->fd != -1) {
-+/* Newer kernels dropped MEMSETOOBSEL */
-+#ifdef MEMSETOOBSEL
- (void)ioctl(mp->fd, MEMSETOOBSEL,
- &mp->old_oobinfo);
-+#endif
- close(mp->fd);
- }
-
-@@ -896,6 +899,8 @@
- continue;
- }
-
-+/* Newer kernels dropped MEMSETOOBSEL */
-+#ifdef MEMSETOOBSEL
- if (r == -ENOTTY) {
- r = ioctl(mp->fd, MEMSETOOBSEL, &mp->old_oobinfo);
- if (r != 0) {
-@@ -904,6 +909,7 @@
- }
- mp->oobinfochanged = 0;
- }
-+#endif
- } else {
- r = ioctl(mp->fd, MTDFILEMODE, (void *)MTD_MODE_RAW);
- if (r != 0 && r != -ENOTTY) {
-@@ -911,6 +917,8 @@
- continue;
- }
-
-+/* Newer kernels dropped MEMSETOOBSEL */
-+#ifdef MEMSETOOBSEL
- if (r == -ENOTTY) {
- r = ioctl(mp->fd, MEMSETOOBSEL, &none_oobinfo);
- if (r != 0) {
-@@ -920,6 +928,7 @@
- mp->oobinfochanged = 1;
- } else
- mp->oobinfochanged = 2;
-+#endif
- }
-
- mp->ecc = ecc;
-diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.h kobs-ng-3.0.35-4.0.0/src/mtd.h
---- kobs-ng-3.0.35-4.0.0-orig/src/mtd.h 2012-12-17 22:37:40.000000000 -0800
-+++ kobs-ng-3.0.35-4.0.0/src/mtd.h 2013-07-28 19:33:57.000000000 -0700
-@@ -31,6 +31,13 @@
- #include "BootControlBlocks.h"
- #include "rom_nand_hamming_code_ecc.h"
-
-+// Newer kernel headers renamed define
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+# define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL
-+# define MTD_MODE_RAW MTD_FILE_MODE_RAW
-+#endif
-+
- //------------------------------------------------------------------------------
- // Re-definitions of true and false, because the standard ones aren't good
- // enough?
diff --git a/package/kobs-ng/Config.in b/package/kobs-ng/Config.in
deleted file mode 100644
index 1f6b2d1..0000000
--- a/package/kobs-ng/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_KOBS_NG
- bool "kobs-ng"
- depends on BR2_arm
- help
- The kobs-ng tool is used for writing images to NAND on i.MX
- platforms.
-
- This utility is provided by Freescale as-is and doesn't have an
- upstream.
diff --git a/package/kobs-ng/kobs-ng.hash b/package/kobs-ng/kobs-ng.hash
deleted file mode 100644
index 3e527da..0000000
--- a/package/kobs-ng/kobs-ng.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://repository.timesys.com/buildsources/k/kobs-ng/kobs-ng-3.0.35-4.0.0/kobs-ng-3.0.35-4.0.0.tar.gz.md5sum
-md5 26104c577f59a6b81782a5bd16aadd82 kobs-ng-3.0.35-4.0.0.tar.gz
diff --git a/package/kobs-ng/kobs-ng.mk b/package/kobs-ng/kobs-ng.mk
deleted file mode 100644
index 13d1faf..0000000
--- a/package/kobs-ng/kobs-ng.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# kobs-ng
-#
-################################################################################
-
-# kobs-ng versions have never made much sense :(
-KOBS_NG_VERSION = 3.0.35-4.0.0
-KOBS_NG_SITE = http://repository.timesys.com/buildsources/k/kobs-ng/kobs-ng-$(KOBS_NG_VERSION)
-KOBS_NG_LICENSE = GPLv2+
-KOBS_NG_LICENSE_FILES = COPYING
-
-$(eval $(autotools-package))
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 04/14] imx-gpu-viv: bump version to 5.0.11 p4.5
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
` (2 preceding siblings ...)
2015-09-11 9:39 ` [Buildroot] [PATCH v2 03/14] kobs-ng: remove obsolete package Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 05/14] xdriver_xf86-video-imx-viv: bump to version " Gary Bisson
` (9 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Also add the package hash file.
3.14.28-1.0.1 patch release has the following bug fixes:
MGS-554 [#1644] Fix the false alert with GPU commit dirty
MGS-528 [#ccc] Wayland does not free window memory until the application
exits
GRPH-56 [#ccc] Add environment variable to turn off memory fill
GRPH-55 [ccc] Add alpha channel for direct texture viv extension
MA-6540 [#1672] Fix native fence FD leak found by Android? CTS
MGS-663 [#1686] P4 release can't be built statically
MA-6527 [#1666] Fix android.webgl.cts.WebGLTest CTS failure
MGS-511-2 [#1593] Qt 3D app cannot run on i.MX 6SoloX board
MGS-658 [#ccc] Fix build warning of isInApiTraceMode for static link
Revert MGS-352 [#1453] Creating context on 5.x is slower than 4.x due to
process name
read
MGS-578 [#1657] GoogleEarth APK encounters a shader compile error
MGS-507 [#1323] RenderToTexture has distorted pictures on screen in DL
board
MGS-547 [#ccc] Add YVYU format test in g2d_overlay_test
MGS-547 [#1640] YVYU format gets wrong result when 2D is built
MGS-564 [#ccc] Resolve race condition in display frame sync
MGS-367 [#1589] "CTRL+C" to close the "tutorial7_es20" causes GPU to
hang
MGS-543 [#1604] Remove some unsupported extensions in gles10
MGS-436 [#ccc] Memory leak in glimagesink video loop playback
MA-6267 [#1600] Fix ES3.0 benchmark UBenchEnhanced can't run
MA-6208-1 [#1543] Fix build error
MA-6208 [#1543] Fix com.drawelements.deqp.gles3 CTS failure
MGS-511 [#1593] Qt 3D app cannot run on i.MX 6SoloX board
MGS-512 [#1493] Fix es30 conformance failures related to glReadPixels
MGS-502 [#ccc] libCLC failure
MGS-500 [#ccc] Disable apitrace for static build
This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-freescale/commit/8f74380a
This package has been tested with both X11 and Framebuffer backends:
# cd /usr/share/examples/viv_samples/vdk/
# ./tutorial7
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash | 3 +++
package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
new file mode 100644
index 0000000..aa1bdee
--- /dev/null
+++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
@@ -0,0 +1,3 @@
+# locally computed
+sha256 b5b9c8e216b2bc4281c2443e07eab90547de0abd705614756ed68c7ad2fcf97a imx-gpu-viv-5.0.11.p4.5-sfp.bin
+sha256 0591b495cd1c2547ae007d405b90729e2fb90603a5728b39d1a99cb4e1cf1eb4 imx-gpu-viv-5.0.11.p4.5-hfp.bin
diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
index ef2399f..aa1e3b6 100644
--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IMX_GPU_VIV_BASE_VERSION = 5.0.11.p4.1
+IMX_GPU_VIV_BASE_VERSION = 5.0.11.p4.5
ifeq ($(BR2_ARM_EABIHF),y)
IMX_GPU_VIV_VERSION = $(IMX_GPU_VIV_BASE_VERSION)-hfp
else
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 05/14] xdriver_xf86-video-imx-viv: bump to version 5.0.11 p4.5
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
` (3 preceding siblings ...)
2015-09-11 9:39 ` [Buildroot] [PATCH v2 04/14] imx-gpu-viv: bump version to 5.0.11 p4.5 Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 06/14] libfslcodec: bump version to 4.0.3 Gary Bisson
` (8 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Modify the version to match the version of imx-gpu-viv. Also add the
package hash file.
This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-freescale/commit/45582680
The following xorg.conf was used in order to force the use of the
vivante module:
https://github.com/Freescale/meta-fsl-arm/blob/master/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf
Note that the X server must be started with the "noreset" option to
avoid crashes when closing X apps.
# X -noreset
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
.../x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash | 2 ++
package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
create mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash
diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash
new file mode 100644
index 0000000..9b3c7d3
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash
@@ -0,0 +1,2 @@
+# locally computed
+sha256 1a0b25a91b493e99dfa94a802290320ea998ebd45d7aab0f73d7c7bb521b7e84 xserver-xorg-video-imx-viv-5.0.11.p4.5.tar.gz
diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
index f5cb946..a3a3167 100644
--- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
+++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = $(FREESCALE_IMX_VERSION)
+XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = 5.0.11.p4.5
XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(FREESCALE_IMX_SITE)
XDRIVER_XF86_VIDEO_IMX_VIV_SOURCE = xserver-xorg-video-imx-viv-$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION).tar.gz
XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv xserver_xorg-server \
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 06/14] libfslcodec: bump version to 4.0.3
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
` (4 preceding siblings ...)
2015-09-11 9:39 ` [Buildroot] [PATCH v2 05/14] xdriver_xf86-video-imx-viv: bump to version " Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 07/14] libfslparser: " Gary Bisson
` (7 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Update license file + add hash file.
This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/93b4c8c
This package has been implicitely tested through gstreamer as the 0.10
plugin relies on it:
# gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
package/libfslcodec/libfslcodec.hash | 2 ++
package/libfslcodec/libfslcodec.mk | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 package/libfslcodec/libfslcodec.hash
diff --git a/package/libfslcodec/libfslcodec.hash b/package/libfslcodec/libfslcodec.hash
new file mode 100644
index 0000000..6a41be1
--- /dev/null
+++ b/package/libfslcodec/libfslcodec.hash
@@ -0,0 +1,2 @@
+# locally computed
+sha256 0d0ff933eed0a021763115b9c8ae812c6376a19bbd95e555d89ea7404f6c8f2f libfslcodec-4.0.3.bin
diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk
index 665588a..473d662 100644
--- a/package/libfslcodec/libfslcodec.mk
+++ b/package/libfslcodec/libfslcodec.mk
@@ -4,13 +4,13 @@
#
################################################################################
-LIBFSLCODEC_VERSION = 4.0.2
+LIBFSLCODEC_VERSION = 4.0.3
LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE)
LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
LIBFSLCODEC_INSTALL_STAGING = YES
LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
-LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt
+LIBFSLCODEC_LICENSE_FILES = EULA COPYING
LIBFSLCODEC_REDISTRIBUTE = NO
define LIBFSLCODEC_EXTRACT_CMDS
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 07/14] libfslparser: bump version to 4.0.3
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
` (5 preceding siblings ...)
2015-09-11 9:39 ` [Buildroot] [PATCH v2 06/14] libfslcodec: bump version to 4.0.3 Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 08/14] libfslvpuwrap: bump version to 1.0.58 Gary Bisson
` (6 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Update license file + add hash file.
Changelog:
- Upgrade MP4 and MPEG2 parser
- Update COPYING with new version of license file
This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/a7c90ea6
This package has been implicitely tested through gstreamer as the 0.10
plugin relies on it:
# gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
package/libfslparser/libfslparser.hash | 2 ++
package/libfslparser/libfslparser.mk | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 package/libfslparser/libfslparser.hash
diff --git a/package/libfslparser/libfslparser.hash b/package/libfslparser/libfslparser.hash
new file mode 100644
index 0000000..19ee12e
--- /dev/null
+++ b/package/libfslparser/libfslparser.hash
@@ -0,0 +1,2 @@
+# locally computed
+sha256 9db10ca6a61c8fdbe91b55b65d084dcbb5f9cfb58b088996c7dd2d6dc8385730 libfslparser-4.0.3.bin
diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk
index 116a0a2..2b53d62 100644
--- a/package/libfslparser/libfslparser.mk
+++ b/package/libfslparser/libfslparser.mk
@@ -4,13 +4,13 @@
#
################################################################################
-LIBFSLPARSER_VERSION = 4.0.2
+LIBFSLPARSER_VERSION = 4.0.3
LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE)
LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
LIBFSLPARSER_INSTALL_STAGING = YES
LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
-LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt
+LIBFSLPARSER_LICENSE_FILES = EULA COPYING
LIBFSLPARSER_REDISTRIBUTE = NO
define LIBFSLPARSER_EXTRACT_CMDS
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 08/14] libfslvpuwrap: bump version to 1.0.58
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
` (6 preceding siblings ...)
2015-09-11 9:39 ` [Buildroot] [PATCH v2 07/14] libfslparser: " Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 09/14] gst-fsl-plugins: bump version to 4.0.3 Gary Bisson
` (5 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Change license file + add hash file.
Changelog:
- Update the license file with new version and use COPYING
- Remove the folder /usr/share to avoid empty folder installation
This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/1506776
This package has been implicitely tested through gstreamer as the
plugins rely on it for vpu decoding:
# gst-launch-0.10 playbin
# uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \
matroskademux ! imxvpudec ! imxipuvideosink
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
package/libfslvpuwrap/libfslvpuwrap.hash | 2 ++
package/libfslvpuwrap/libfslvpuwrap.mk | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 package/libfslvpuwrap/libfslvpuwrap.hash
diff --git a/package/libfslvpuwrap/libfslvpuwrap.hash b/package/libfslvpuwrap/libfslvpuwrap.hash
new file mode 100644
index 0000000..e7ca1a8
--- /dev/null
+++ b/package/libfslvpuwrap/libfslvpuwrap.hash
@@ -0,0 +1,2 @@
+# locally computed
+sha256 a278eb18ec24230166ac39e2eadf7b934798f0432654c2e24c4cb69c3ac1cf0f libfslvpuwrap-1.0.58.bin
diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk
index 625f586..7669c63 100644
--- a/package/libfslvpuwrap/libfslvpuwrap.mk
+++ b/package/libfslvpuwrap/libfslvpuwrap.mk
@@ -4,14 +4,14 @@
#
################################################################################
-LIBFSLVPUWRAP_VERSION = 1.0.57
+LIBFSLVPUWRAP_VERSION = 1.0.58
LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE)
LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin
LIBFSLVPUWRAP_DEPENDENCIES = imx-vpu
LIBFSLVPUWRAP_INSTALL_STAGING = YES
LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
-LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txt
+LIBFSLVPUWRAP_LICENSE_FILES = EULA COPYING
LIBFSLVPUWRAP_REDISTRIBUTE = NO
define LIBFSLVPUWRAP_EXTRACT_CMDS
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 09/14] gst-fsl-plugins: bump version to 4.0.3
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
` (7 preceding siblings ...)
2015-09-11 9:39 ` [Buildroot] [PATCH v2 08/14] libfslvpuwrap: bump version to 1.0.58 Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 10/14] gst1-imx: bump version to 0.11.1 Gary Bisson
` (4 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Also added the package hash file.
This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/0d2f4f8
This package has been tested using the following commands:
# gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-0.10 filesrc location=/root/tears_of_steel_1080p.webm ! \
matroskademux ! vpudec ! autovideosink
# gst-launch-0.10 filesrc location=/root/tears_of_steel_1080p.webm ! \
matroskademux ! vpudec ! mfw_isink
# gst-launch-0.10 imxv4l2src ! autovideosink
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash | 2 ++
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
create mode 100644 package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash
diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash
new file mode 100644
index 0000000..f1d6391
--- /dev/null
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash
@@ -0,0 +1,2 @@
+# locally computed
+sha256 568883b2a1d8d32e4004cb3f123790d0b4286c91c1fac38c9dc8e20bd1250764 gst-fsl-plugins-4.0.3.tar.gz
diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
index a7dea0f..2ac558a 100644
--- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GST_FSL_PLUGINS_VERSION = 4.0.2
+GST_FSL_PLUGINS_VERSION = 4.0.3
GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE)
# Most is LGPLv2+, but some sources are copied from upstream and are
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 10/14] gst1-imx: bump version to 0.11.1
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
` (8 preceding siblings ...)
2015-09-11 9:39 ` [Buildroot] [PATCH v2 09/14] gst-fsl-plugins: bump version to 4.0.3 Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 11/14] freescale_imx6*_defconfig: bump version to 3.14.28-1.0.0_ga Gary Bisson
` (3 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Changelog:
(0.11.1)
- vpu: decoder: Keep track of unfinished gstvideo frames
- blitter fixes and enhancements
- ipu: All pages are now cleared when page flipping is used
- compositor: Added support for cropping input streams
- imxv4l2src fixes and enhancements
(0.11.0)
- new common codebase for rectangular regions and video canvases
- new blitter-based video sink with full support for vsync to
eliminate tearing
- complete rewrite of blitter base code
- new compositor elements
- vpu: decoder: Memory leaks fixed
- vpu: encoder: Bitrate can now be set on the fly
- eglvivsink: In Wayland, window x/y coordinates are now supported
- several v4l2src fixes
(0.10.2)
- v4l2src: renamed imxv4l2src to imxv4l2videosrc to avoid name
collisions with the FSL plugins
- v4l2src: Call the buffer pool baseclass stop() function (fixes
segfaults)
- uniaudio: Create correct config header even if no codecs were found
- audio: new MP3 encoder element using the libfslcodec MP3 encoder
- g2d/ipu/pxp blitter sink: Respect aspect ratio also in 90/270 degree
rotations
- pxp: Remove broken/unsupported formats
- eglvivsink: Fix double mutex unlock
- phys mem meta naming cleanup
Tested with the following commands:
# gst-launch-1.0 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \
matroskademux ! imxvpudec ! imxipuvideosink
# gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \
matroskademux ! imxvpudec ! imxeglvivsink
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
package/gstreamer1/gst1-imx/gst1-imx.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk
index 9ba7550..8ede8ad 100644
--- a/package/gstreamer1/gst1-imx/gst1-imx.mk
+++ b/package/gstreamer1/gst1-imx/gst1-imx.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GST1_IMX_VERSION = 0.10.1
+GST1_IMX_VERSION = 0.11.1
GST1_IMX_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX_VERSION))
GST1_IMX_LICENSE = LGPLv2+
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 11/14] freescale_imx6*_defconfig: bump version to 3.14.28-1.0.0_ga
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
` (9 preceding siblings ...)
2015-09-11 9:39 ` [Buildroot] [PATCH v2 10/14] gst1-imx: bump version to 0.11.1 Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 12/14] qmx6_defconfig: bump version to 3.14.28_1.0.0 Gary Bisson
` (2 subsequent siblings)
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
Hi,
This update has only been built, it'd be great if anyone could give
it a try on the actual hardware.
Regards,
Gary
---
configs/freescale_imx6dlsabreauto_defconfig | 8 ++++----
configs/freescale_imx6dlsabresd_defconfig | 8 ++++----
configs/freescale_imx6qsabreauto_defconfig | 8 ++++----
configs/freescale_imx6qsabresd_defconfig | 8 ++++----
configs/freescale_imx6sololiteevk_defconfig | 4 ++--
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig
index 6a80712..0de8eea 100644
--- a/configs/freescale_imx6dlsabreauto_defconfig
+++ b/configs/freescale_imx6dlsabreauto_defconfig
@@ -7,8 +7,8 @@ BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
# toolchain
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.53"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
+BR2_DEFAULT_KERNEL_VERSION="3.14.28"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
# system
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
@@ -17,7 +17,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.14.28_1.0.0_ga"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -32,4 +32,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto"
BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.14.28_1.0.0_ga"
diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig
index 0aac2de..3010d7d 100644
--- a/configs/freescale_imx6dlsabresd_defconfig
+++ b/configs/freescale_imx6dlsabresd_defconfig
@@ -7,8 +7,8 @@ BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
# toolchain
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.53"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
+BR2_DEFAULT_KERNEL_VERSION="3.14.28"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
# system
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -17,7 +17,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.14.28_1.0.0_ga"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -32,4 +32,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd"
BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.14.28_1.0.0_ga"
diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig
index f0d6a5e..70367a7 100644
--- a/configs/freescale_imx6qsabreauto_defconfig
+++ b/configs/freescale_imx6qsabreauto_defconfig
@@ -7,8 +7,8 @@ BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
# toolchain
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.53"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
+BR2_DEFAULT_KERNEL_VERSION="3.14.28"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
# system
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
@@ -17,7 +17,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.14.28_1.0.0_ga"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -32,4 +32,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto"
BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.14.28_1.0.0_ga"
diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig
index a705534..3fad77a 100644
--- a/configs/freescale_imx6qsabresd_defconfig
+++ b/configs/freescale_imx6qsabresd_defconfig
@@ -7,8 +7,8 @@ BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
# toolchain
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.53"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
+BR2_DEFAULT_KERNEL_VERSION="3.14.28"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
# system
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -17,7 +17,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.14.28_1.0.0_ga"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -32,4 +32,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd"
BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.14.28_1.0.0_ga"
diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig
index d4cca4e..5d98e9a 100644
--- a/configs/freescale_imx6sololiteevk_defconfig
+++ b/configs/freescale_imx6sololiteevk_defconfig
@@ -9,7 +9,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.14.28_1.0.0_ga"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -24,4 +24,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6slevk"
BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.14.28_1.0.0_ga"
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 12/14] qmx6_defconfig: bump version to 3.14.28_1.0.0
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
` (10 preceding siblings ...)
2015-09-11 9:39 ` [Buildroot] [PATCH v2 11/14] freescale_imx6*_defconfig: bump version to 3.14.28-1.0.0_ga Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 13/14] nitrogen6x_defconfig: bump version to 3.14.28-1.0.0 Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 14/14] board/boundarydevices: update u-boot scripts for 3.14 kernels Gary Bisson
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
Hi,
This update has only been built, it'd be great if anyone could give
it a try on the actual hardware.
Regards,
Gary
---
configs/qmx6_defconfig | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/configs/qmx6_defconfig b/configs/qmx6_defconfig
index d693d82..a829b4c 100644
--- a/configs/qmx6_defconfig
+++ b/configs/qmx6_defconfig
@@ -1,17 +1,17 @@
BR2_arm=y
BR2_cortex_a9=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.53"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
+BR2_DEFAULT_KERNEL_VERSION="3.14.28"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
# Notice you need a recent version of u-boot (with DT support) to be able
# to boot this kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.congatec.com/arm/qmx6_kernel.git"
-# Last version of branch cgt_imx_3.10.53_1.1.0
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="cea0de46e2c8f0a5c67f46005e84ae1d418731bc"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.congatec.com/arm/imx6_kernel_3.14.git"
+# Last version of branch cgt_qmx6_3.14.28_1.0.0
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="105820d6bd251deb49c3dd3f71fa0d76adce97c7"
BR2_LINUX_KERNEL_DEFCONFIG="qmx6"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -23,7 +23,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="cgt_qmx6_pn016103"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://git.congatec.com/arm/qmx6_uboot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="30ba236ef6df04e4cca58c3e06c4f63c2db12115"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="4d3b64e93064ed3d97ef7d91ff0f61a693a460fc"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.pn016103.imx"
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 13/14] nitrogen6x_defconfig: bump version to 3.14.28-1.0.0
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
` (11 preceding siblings ...)
2015-09-11 9:39 ` [Buildroot] [PATCH v2 12/14] qmx6_defconfig: bump version to 3.14.28_1.0.0 Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
2015-09-11 9:39 ` [Buildroot] [PATCH v2 14/14] board/boundarydevices: update u-boot scripts for 3.14 kernels Gary Bisson
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
U-Boot version is updated to v2015.07.
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
configs/nitrogen6x_defconfig | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index 71b01f0..51c5161 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_2r1=y
# Lock headers to match kernel
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.53"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
+BR2_DEFAULT_KERNEL_VERSION="3.14.28"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
# bootloader
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="nitrogen6q"
BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/21eb4146/u-boot-21eb4146.tar.gz"
+# Last version of branch boundary-v2015.07
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/5115a9e/u-boot-5115a9e.tar.gz"
# kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Last version of branch boundary-imx_3.10.53_1.1.1_ga
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/tarball/98c0fdbe/linux-imx6-98c0fdbe.tar.gz"
+# Last version of branch boundary-imx_3.14.28_1.0.0_ga
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/tarball/3417c66/linux-imx6-3417c66.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH v2 14/14] board/boundarydevices: update u-boot scripts for 3.14 kernels
2015-09-11 9:39 [Buildroot] [PATCH v2 00/14] Update Freescale packages to 3.14.28-1.0.0_ga Gary Bisson
` (12 preceding siblings ...)
2015-09-11 9:39 ` [Buildroot] [PATCH v2 13/14] nitrogen6x_defconfig: bump version to 3.14.28-1.0.0 Gary Bisson
@ 2015-09-11 9:39 ` Gary Bisson
13 siblings, 0 replies; 16+ messages in thread
From: Gary Bisson @ 2015-09-11 9:39 UTC (permalink / raw)
To: buildroot
Those scripts will support coming platforms such as iMX6SoloX or
iMX6QuadPlus.
One important change is that the bootscript now relies on U-Boot to
make the display detection in order to simplify the script.
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
board/boundarydevices/nitrogen6x/6x_bootscript.txt | 223 ++++++++-------------
board/boundarydevices/nitrogen6x/6x_upgrade.txt | 106 ++++++----
2 files changed, 147 insertions(+), 182 deletions(-)
diff --git a/board/boundarydevices/nitrogen6x/6x_bootscript.txt b/board/boundarydevices/nitrogen6x/6x_bootscript.txt
index ac86fe5..694a9b6 100644
--- a/board/boundarydevices/nitrogen6x/6x_bootscript.txt
+++ b/board/boundarydevices/nitrogen6x/6x_bootscript.txt
@@ -1,186 +1,131 @@
setenv bootargs ''
-if ${fs}load ${dtype} ${disk}:1 10800000 uEnv.txt ; then
- env import -t 10800000 $filesize
-fi
-
-if itest.s "x" == "x$dtbname" ; then
- dtbname="imx6";
- if itest.s x6SOLO == "x$cpu" ; then
- dtbname=${dtbname}dl-;
- elif itest.s x6DL == "x$cpu" ; then
- dtbname=${dtbname}dl-;
+a_script=0x10800000
+a_uImage=0x10800000
+a_fdt=0x13000000
+
+setenv initrd_high 0xffffffff
+if itest.s "x" == "x${dtbname}" ; then
+ if itest.s x6SOLO == "x${cpu}" ; then
+ dtbname=imx6dl-${board}.dtb;
+ elif itest.s x6DL == "x${cpu}" ; then
+ dtbname=imx6dl-${board}.dtb;
+ elif itest.s x6QP == "x${cpu}" ; then
+ dtbname=imx6qp-${board}.dtb;
+ elif itest.s x6SX == "x${cpu}" ; then
+ if itest.s "x1" != "x$m4enabled" ; then
+ dtbname=imx6sx-${board}.dtb;
+ else
+ run m4boot;
+ dtbname=imx6sx-${board}-m4.dtb;
+ fi
+ a_script=0x80800000
+ a_uImage=0x80800000
+ a_fdt=0x83000000
else
- dtbname=${dtbname}q-;
- fi
- if itest.s x == "x$board" ; then
- board=sabrelite
+ dtbname=imx6q-${board}.dtb;
fi
- dtbname=${dtbname}${board}.dtb;
+fi
+
+if load ${dtype} ${disk}:1 ${a_script} uEnv.txt ; then
+ env import -t ${a_script} ${filesize}
fi
if itest.s x == x${bootdir} ; then
bootdir=/boot/
fi
-setenv fdt_addr 0x12000000
-if ${fs}load ${dtype} ${disk}:1 $fdt_addr ${bootdir}$dtbname ; then
- fdt addr $fdt_addr
+if itest.s x${bootpart} == x ; then
+ bootpart=1
+fi
+
+if load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}${dtbname} ; then
+ fdt addr ${a_fdt}
setenv fdt_high 0xffffffff
else
- echo "!!!! Error loading ${bootdir}$dtbname";
+ echo "!!!! Error loading ${bootdir}${dtbname}";
exit;
fi
-# ------------------- HDMI detection
-i2c dev 1 ;
-if i2c probe 0x50 ; then
- echo "------ have HDMI monitor";
- if itest.s x == x$allow_noncea ; then
- setenv bootargs $bootargs mxc_hdmi.only_cea=1;
- echo "only CEA modes allowed on HDMI port";
- else
- setenv bootargs $bootargs mxc_hdmi.only_cea=0;
- echo "non-CEA modes allowed on HDMI, audio may be affected";
- fi
-else
- fdt rm hdmi_display
- echo "------ no HDMI monitor";
-fi
-
-# ------------------- LVDS detection
-if itest.s "x" != "x$lvds_1080p" ; then
- echo "----- 1080P dual channel LVDS";
- fdt rm okaya1024x600
- fdt rm lg1280x800
- fdt rm hannstar;
- fdt set ldb split-mode 1
- fdt set lvds_display interface_pix_fmt "RGB24"
- fdt set ldb/lvds-channel at 0 fsl,data-width <24>
-else
- fdt rm ldb split-mode
- fdt rm lvds1080p
-
- # -------- LVDS0 (bottom on Nitrogen6_Max)
- setenv have_lvds
- i2c dev 2
- if i2c probe 0x04 ; then
- echo "------ have Freescale display";
- setenv have_lvds 1
- else
- echo "------ no Freescale display";
- fdt rm hannstar;
- fi
+# first enable tfp410
+i2c dev 1
+i2c mw 38 8.1 bd
- if i2c probe 0x38 ; then
- if itest.s "xLDB-WXGA" == "x$panel"; then
- screenres=1280,800
- fdt rm okaya1024x600
- else
- screenres=1024,600
- fdt rm lg1280x800
- fi
- setenv have_lvds 1
- setenv bootargs $bootargs ft5x06_ts.screenres=$screenres
- if itest.s "x" -ne "x$calibration" ; then
- setenv bootargs $bootargs ft5x06_ts.calibration=$calibration
- fi
- else
- echo "------ no ft5x06 touch controller";
- fdt rm okaya1024x600
- fdt rm lg1280x800
- fi
-
- if itest.s "x" == "x$have_lvds"; then
- fdt rm lvds_display;
- fi
-
- # -------- LVDS1 (top on Nitrogen6_Max)
- if itest.s "xhannstar" == "x$lvds1_panel" ; then
- echo "configure LVDS1 for Hannstar panel"
- fdt rm okaya1024x600_2;
- fdt rm lg1280x800_2;
- fdt set lvds_display_2 status okay
- elif itest.s "xokaya1024x600" == "x$lvds1_panel" ; then
- echo "configure LVDS1 for 1024x600 panel"
- fdt rm hannstar_2;
- fdt rm lg1280x800_2;
- fdt set lvds_display_2 status okay
- elif itest.s "xlg1280x800" == "x$lvds1_panel" ; then
- echo "configure LVDS1 for 1280x800 panel"
- fdt rm hannstar_2;
- fdt rm okaya1024x600_2;
- fdt set lvds_display_2 status okay
- else
- fdt rm lvds_display_2 ; # ignore errors on boards != 6_max
- fi
+cmd_xxx_present=
+fdt resize
+if itest.s "x" != "x${cmd_custom}" ; then
+ run cmd_custom
+ cmd_xxx_present=1;
fi
-# ------------------- LCD detection
-setenv have_lcd '';
-if i2c probe 0x48 ; then
- setenv have_lcd 1;
- echo "------- found TSC2004 touch controller";
- if itest.s "x" -eq "x$tsc_calibration" ; then
- setenv bootargs $bootargs tsc2004.calibration=-67247,-764,272499173,324,69283,-8653010,65536
+if itest.s "x" != "x${cmd_hdmi}" ; then
+ run cmd_hdmi
+ cmd_xxx_present=1;
+ if itest.s x == x${allow_noncea} ; then
+ setenv bootargs ${bootargs} mxc_hdmi.only_cea=1;
+ echo "only CEA modes allowed on HDMI port";
else
- setenv bootargs $bootargs tsc2004.calibration=$tsc_calibration
+ setenv bootargs ${bootargs} mxc_hdmi.only_cea=0;
+ echo "non-CEA modes allowed on HDMI, audio may be affected";
fi
-elif i2c probe 0x4d ; then
- setenv have_lcd 1;
- echo "------- found AR1020 touch controller";
fi
-if itest.s "x" != "x$ignore_lcd" ; then
- echo "------ ignoring LCD display";
- setenv have_lcd '';
+if itest.s "x" != "x${cmd_lcd}" ; then
+ run cmd_lcd
+ cmd_xxx_present=1;
+fi
+if itest.s "x" != "x${cmd_lvds}" ; then
+ run cmd_lvds
+ cmd_xxx_present=1;
+fi
+if itest.s "x" != "x${cmd_lvds2}" ; then
+ run cmd_lvds2
+ cmd_xxx_present=1;
fi
-if itest.s "x" != "x$have_lcd" ; then
- echo "----- found LCD display";
-else
- fdt rm lcd_display;
+if itest.s "x" == "x${cmd_xxx_present}" ; then
+ echo "!!!!!!!!!!!!!!!!"
+ echo "warning: your u-boot may be outdated, please upgrade"
+ echo "!!!!!!!!!!!!!!!!"
fi
-setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 rootwait"
+setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc"
-if itest.s x$bootpart == x ; then
- bootpart=1
-fi
+bpart=1
if test "sata" = "${dtype}" ; then
- setenv bootargs "$bootargs root=/dev/sda$bootpart" ;
+ setenv bootargs "${bootargs} root=/dev/sda${bpart}" ;
+elif test "usb" = "${dtype}" ; then
+ setenv bootargs "${bootargs} root=/dev/sda${bpart}" ;
else
- if test "usb" = "${dtype}" ; then
- setenv bootargs "$bootargs root=/dev/sda$bootpart" ;
- elif itest 0 -eq ${disk}; then
- setenv bootargs "$bootargs root=/dev/mmcblk2p$bootpart" ;
- else
- setenv bootargs "$bootargs root=/dev/mmcblk3p$bootpart" ;
- fi
+ setenv bootargs "${bootargs} root=/dev/mmcblk${disk}p${bpart}"
fi
if itest.s "x" != "x${disable_giga}" ; then
- setenv bootargs $bootargs fec.disable_giga=1
+ setenv bootargs ${bootargs} fec.disable_giga=1
+fi
+
+if itest.s "x" != "x${wlmac}" ; then
+ setenv bootargs ${bootargs} wlcore.mac=${wlmac}
fi
-if itest.s "x" != "x$wlmac" ; then
- setenv bootargs $bootargs wlcore.mac=$wlmac
+if itest.s "x" != "x${gpumem}" ; then
+ setenv bootargs ${bootargs} galcore.contiguousSize=${gpumem}
fi
-if itest.s "x" != "x$gpumem" ; then
- setenv bootargs $bootargs galcore.contiguousSize=$gpumem
+if itest.s "x" != "x${cma}" ; then
+ setenv bootargs ${bootargs} cma=${cma}
fi
-if itest.s "x" != "x$show_fdt" ; then
+if itest.s "x" != "x${show_fdt}" ; then
fdt print /
fi
-if itest.s "x" != "x$show_env" ; then
+if itest.s "x" != "x${show_env}" ; then
printenv
fi
-if ${fs}load ${dtype} ${disk}:1 10800000 ${bootdir}uImage ; then
- bootm 10800000 - $fdt_addr
+if load ${dtype} ${disk}:${bootpart} ${a_uImage} ${bootdir}/uImage ; then
+ bootm ${a_uImage} - ${a_fdt}
fi
echo "Error loading kernel image"
diff --git a/board/boundarydevices/nitrogen6x/6x_upgrade.txt b/board/boundarydevices/nitrogen6x/6x_upgrade.txt
index 3f1b96f..9715f16 100644
--- a/board/boundarydevices/nitrogen6x/6x_upgrade.txt
+++ b/board/boundarydevices/nitrogen6x/6x_upgrade.txt
@@ -1,49 +1,69 @@
-if itest.s a$bootfile == a; then
- bootfile=u-boot.imx
+if itest.s a$uboot_defconfig == a; then
+ echo "Please set uboot_defconfig to the appropriate value"
+ exit
+fi
+
+offset=0x400
+a_uImage1=0x12000000
+a_uImage2=0x12400000
+
+if itest.s x6SX == "x$cpu" ; then
+ a_uImage1=0x82000000
+ a_uImage2=0x82400000
fi
setenv stdout serial,vga
echo "check U-Boot" ;
-setenv offset 0x400
-if ${fs}load ${dtype} ${disk}:1 12000000 $bootfile || ${fs}load ${dtype} ${disk}:1 12000000 u-boot.nopadding ; then
- echo "read $filesize bytes from SD card" ;
- if sf probe || sf probe || \
- sf probe 1 27000000 || sf probe 1 27000000 ; then
- echo "probed SPI ROM" ;
- if sf read 0x12400000 $offset $filesize ; then
- if cmp.b 0x12000000 0x12400000 $filesize ; then
- echo "------- U-Boot versions match" ;
- else
- echo "Need U-Boot upgrade" ;
- echo "Program in 5 seconds" ;
- for n in 5 4 3 2 1 ; do
- echo $n ;
- sleep 1 ;
- done
- echo "erasing" ;
- sf erase 0 0xC0000 ;
- # two steps to prevent bricking
- echo "programming" ;
- sf write 0x12000000 $offset $filesize ;
- echo "verifying" ;
- if sf read 0x12400000 $offset $filesize ; then
- if cmp.b 0x12000000 0x12400000 $filesize ; then
- while echo "---- U-Boot upgraded. reset" ; do
- sleep 120
- done
- else
- echo "Read verification error" ;
- fi
- else
- echo "Error re-reading EEPROM" ;
- fi
- fi
- else
- echo "Error reading boot loader from EEPROM" ;
- fi
- else
- echo "Error initializing EEPROM" ;
- fi ;
+
+if load ${dtype} ${disk}:1 ${a_uImage1} u-boot.$uboot_defconfig ; then
+else
+ echo "No U-Boot image found on SD card" ;
+ exit
+fi
+echo "read $filesize bytes from SD card" ;
+if sf probe || sf probe || sf probe 1 27000000 || sf probe 1 27000000 ; then
+ echo "probed SPI ROM" ;
+else
+ echo "Error initializing EEPROM" ;
+ exit
+fi ;
+if sf read ${a_uImage2} $offset $filesize ; then
+else
+ echo "Error reading boot loader from EEPROM" ;
+ exit
+fi
+if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then
+ echo "------- U-Boot versions match" ;
+ exit
+fi
+echo "Need U-Boot upgrade" ;
+echo "Program in 5 seconds" ;
+for n in 5 4 3 2 1 ; do
+ echo $n ;
+ sleep 1 ;
+done
+echo "erasing" ;
+sf erase 0 0xC0000 ;
+
+# two steps to prevent bricking
+echo "programming" ;
+setexpr a1 ${a_uImage1} + 0x400
+setexpr o1 ${offset} + 0x400
+setexpr s1 ${filesize} - 0x400
+sf write ${a1} ${o1} ${s1} ;
+sf write ${a_uImage1} $offset 0x400 ;
+
+echo "verifying" ;
+if sf read ${a_uImage2} $offset $filesize ; then
+else
+ echo "Error re-reading EEPROM" ;
+ exit
+fi
+if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then
else
- echo "No U-Boot image found on SD card" ;
+ echo "Read verification error" ;
+ exit
fi
+while echo "---- U-Boot upgraded. reset" ; do
+ sleep 120
+done
--
2.5.1
^ permalink raw reply related [flat|nested] 16+ messages in thread