[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-506-g7dd62cb
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-506-g7dd62cb
|
From: Sébastien S. <ss...@us...> - 2014-12-10 17:13:35
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 7dd62cb34d2a8b02ecea698f1b46e1fb2a5c1b37 (commit)
from d3f2d831df92f35b47457a02e11ebf2b81b22d54 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7dd62cb34d2a8b02ecea698f1b46e1fb2a5c1b37
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Dec 10 18:14:35 2014 +0100
[BUILDROOT] move imx-usb-loader in buildroot package directory
While at it, add host-imx-usb-loader in apf6_deconfig.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 1 +
buildroot/package/armadeus/Config.in | 1 -
.../package/armadeus/imx_usb_loader/Config.in | 13 --
.../armadeus/imx_usb_loader/imx_usb_loader.mk | 42 ------
.../221-v2-3-3-imx-usb-loader-new-package.patch | 142 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 4 +
.../221-v2-3-3-imx-usb-loader-new-package.patch | 142 ++++++++++++++++++++
patches/buildroot/2014.11/cleanup_buildroot.sh | 4 +
8 files changed, 293 insertions(+), 56 deletions(-)
delete mode 100644 buildroot/package/armadeus/imx_usb_loader/Config.in
delete mode 100644 buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk
create mode 100644 patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
create mode 100644 patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index ca208d3..a3ba048 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -75,3 +75,4 @@ BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_PACKAGE_HOST_IMX_USB_LOADER=y
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index 6ba7f6f..2dedd75 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -5,7 +5,6 @@ source package/armadeus/as_devices/Config.in
source package/armadeus/demos/Config.in
source package/armadeus/fpgaregs/Config.in
source package/armadeus/fpga_firmware/Config.in
-source package/armadeus/imx_usb_loader/Config.in
source package/armadeus/imx28-usb-downloader/Config.in
source package/armadeus/imxregs/Config.in
source package/armadeus/imxssi/Config.in
diff --git a/buildroot/package/armadeus/imx_usb_loader/Config.in b/buildroot/package/armadeus/imx_usb_loader/Config.in
deleted file mode 100644
index 7e98bca..0000000
--- a/buildroot/package/armadeus/imx_usb_loader/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_IMX_USB_LOADER
- bool "imx_usb_loader (target)"
- depends on BR2_PACKAGE_LIBUSB_COMPAT
- help
- Target tool to download i.MX51, i.MX53 and i.MX6 binary through USB and
- serial.
-
-config BR2_PACKAGE_HOST_IMX_USB_LOADER
- bool "imx_usb_loader (host)"
- depends on BR2_PACKAGE_LIBUSB_COMPAT
- help
- Target tool to download i.MX51, i.MX53 and i.MX6 binary through USB and
- serial.
diff --git a/buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk b/buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk
deleted file mode 100644
index 02c7042..0000000
--- a/buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-################################################################################
-#
-# imx_usb_loader from github
-#
-################################################################################
-
-IMX_USB_LOADER_VERSION = 18d858d3c62dde9bd67580a740f07d07930c9b4f
-IMX_USB_LOADER_SITE = https://github.com/boundarydevices/imx_usb_loader.git
-IMX_USB_LOADER_SITE_METHOD = git
-IMX_USB_LOADER_DEPENDENCIES = libusb-compat libusb
-
-IMX_USB_LOADER_BIN_NAME = imx_usb
-IMX_UART_LOADER_BIN_NAME = imx_uart
-
-define IMX_USB_LOADER_BUILD_CMDS
- $(MAKE) CC="$(TARGET_CC)" -C $(@D) imx_usb
- $(MAKE) CC="$(TARGET_CC)" -C $(@D) imx_uart
-endef
-
-define HOST_IMX_USB_LOADER_BUILD_CMDS
- $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" USBCFLAGS="-lusb" USBLDFLAGS="-lusb" -C $(@D) imx_usb
- $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) imx_uart
-endef
-
-define IMX_USB_LOADER_INSTALL_TARGET_CMDS
- $(INSTALL) -m 0755 $(@D)/$(IMX_USB_LOADER_BIN_NAME) \
- $(TARGET_DIR)/usr/bin/$(IMX_USB_LOADER_BIN_NAME)
- $(INSTALL) -m 0755 $(@D)/$(IMX_UART_LOADER_BIN_NAME) \
- $(TARGET_DIR)/usr/bin/$(IMX_UART_LOADER_BIN_NAME)
- $(INSTALL) -m 644 $(@D)/*.conf \
- $(TARGET_DIR)/usr/share/
-endef
-
-define HOST_IMX_USB_LOADER_INSTALL_CMDS
- $(INSTALL) -D -m 0755 $(@D)/$(IMX_USB_LOADER_BIN_NAME) \
- $(HOST_DIR)/usr/bin/$(IMX_USB_LOADER_BIN_NAME)
- $(INSTALL) -m 0755 $(@D)/$(IMX_UART_LOADER_BIN_NAME) \
- $(HOST_DIR)/usr/bin/$(IMX_UART_LOADER_BIN_NAME)
-endef
-
-$(eval $(generic-package))
-$(eval $(host-generic-package))
diff --git a/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
new file mode 100644
index 0000000..1cf5780
--- /dev/null
+++ b/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -0,0 +1,142 @@
+From patchwork Wed Oct 1 15:03:46 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v2,3/3] imx-usb-loader: new package
+From: Luca Ceresoli <lu...@lu...>
+X-Patchwork-Id: 395569
+Message-Id: <141...@lu...>
+To: bui...@uc...
+Cc: Luca Ceresoli <lu...@lu...>
+Date: Wed, 1 Oct 2014 17:03:46 +0200
+
+Signed-off-by: Luca Ceresoli <lu...@lu...>
+---
+ package/Config.in.host | 1 +
+ package/imx-usb-loader/Config.in.host | 14 ++++++++++++++
+ package/imx-usb-loader/imx-usb-loader.mk | 22 ++++++++++++++++++++++
+ 3 files changed, 37 insertions(+)
+ create mode 100644 package/imx-usb-loader/Config.in.host
+ create mode 100644 package/imx-usb-loader/imx-usb-loader.mk
+
+Index: buildroot/package/Config.in.host
+===================================================================
+--- buildroot.orig/package/Config.in.host
++++ buildroot/package/Config.in.host
+@@ -6,6 +6,7 @@ source "package/e2fsprogs/Config.in.host
+ source "package/genext2fs/Config.in.host"
+ source "package/genimage/Config.in.host"
+ source "package/genpart/Config.in.host"
++source "package/imx-usb-loader/Config.in.host"
+ source "package/lpc3250loader/Config.in.host"
+ source "package/mtools/Config.in.host"
+ source "package/omap-u-boot-utils/Config.in.host"
+Index: buildroot/package/imx-usb-loader/Config.in.host
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/Config.in.host
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_HOST_IMX_USB_LOADER
++ bool "host imx-usb-loader"
++ depends on BR2_arm || BR2_armeb
++ help
++ This utility allows to download and execute code on Freescale
++ i.MX5/i.MX6 and Vybrid SoCs through the Serial Download Protocol
++ (SDP). Depending on the board, there is usually some kind of recovery
++ button to bring the SoC into serial download boot mode, check
++ documentation of your hardware.
++
++ The utility support USB and UART as serial link.
++
++ https://github.com/boundarydevices/imx_usb_loader
+Index: buildroot/package/imx-usb-loader/imx-usb-loader.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/imx-usb-loader.mk
+@@ -0,0 +1,36 @@
++################################################################################
++#
++# imx-usb-loader
++#
++################################################################################
++
++IMX_USB_LOADER_VERSION = f96aee286ea17c832b7ec922dd76842deb5ce299
++IMX_USB_LOADER_SITE = https://github.com/boundarydevices/imx_usb_loader.git
++IMX_USB_LOADER_SITE_METHOD = git
++IMX_USB_LOADER_DEPENDENCIES = libusb
++HOST_IMX_USB_LOADER_DEPENDENCIES = host-libusb
++
++define IMX_USB_LOADER_BUILD_CMDS
++ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
++endef
++
++define IMX_USB_LOADER_INSTALL_TARGET_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/imx_usb $(TARGET_DIR)/usr/bin/imx_usb
++ $(INSTALL) -D -m 0755 $(@D)/imx_uart $(TARGET_DIR)/usr/bin/imx_uart
++ mkdir -p $(TARGET_DIR)/usr/share/imx_usb_loader
++ $(INSTALL) -D -m 0644 $(@D)/*.conf $(TARGET_DIR)/usr/share/imx_usb_loader
++endef
++
++define HOST_IMX_USB_LOADER_BUILD_CMDS
++ $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)
++endef
++
++define HOST_IMX_USB_LOADER_INSTALL_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/imx_usb $(HOST_DIR)/usr/bin/imx_usb
++ $(INSTALL) -D -m 0755 $(@D)/imx_uart $(HOST_DIR)/usr/bin/imx_uart
++ mkdir -p $(HOST_DIR)/usr/share/imx_usb_loader
++ $(INSTALL) -D -m 0644 $(@D)/*.conf $(HOST_DIR)/usr/share/imx_usb_loader
++endef
++
++$(eval $(generic-package))
++$(eval $(host-generic-package))
+Index: buildroot/package/imx-usb-loader/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/Config.in
+@@ -0,0 +1,14 @@
++config BR2_PACKAGE_IMX_USB_LOADER
++ bool "imx-usb-loader"
++ depends on BR2_arm || BR2_armeb
++ select BR2_PACKAGE_LIBUSB
++ help
++ This utility allows to download and execute code on Freescale
++ i.MX5/i.MX6 and Vybrid SoCs through the Serial Download Protocol
++ (SDP). Depending on the board, there is usually some kind of recovery
++ button to bring the SoC into serial download boot mode, check
++ documentation of your hardware.
++
++ The utility support USB and UART as serial link.
++
++ https://github.com/boundarydevices/imx_usb_loader
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -316,6 +316,7 @@ endif
+ source "package/hwdata/Config.in"
+ source "package/i2c-tools/Config.in"
+ source "package/imx-test/Config.in"
++source "package/imx-usb-loader/Config.in"
+ source "package/input-event-daemon/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/iostat/Config.in"
+Index: buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+@@ -0,0 +1,14 @@
++diff --git a/mx6_usb_work.conf b/mx6_usb_work.conf
++index b484c51..fa952e2 100644
++--- a/mx6_usb_work.conf
+++++ b/mx6_usb_work.conf
++@@ -1,6 +1,7 @@
++-mx6_qsb
+++apf6qdl
++ #hid/bulk,[old_header,]max packet size, {ram start, ram size}(repeat valid ram areas)
++-hid,1024,0x10000000,1G,0x00907000,0x31000
+++#IMX6 quad and dual have 196KB OCRAM Free Area but IMX6 dual light and solo have only 68KB.
+++hid,1024,0x00907000,0x11000
++ #file:dcd,plug,load nnn,jump [nnn/header/header2]
++ #jump nnn - header is after last downloaded word
++ # entire file is loaded before jump, needs load nnn as well
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 4957742..3a5d008 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -75,6 +75,10 @@ rm -rf buildroot/package/imx-test/Config.in
rm -rf buildroot/package/imx-test/imx-test-01_fixes.patch
rm -rf buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
rm -rf buildroot/package/imx-test/imx-test.mk
+rm -rf buildroot/package/imx-usb-loader/Config.in
+rm -rf buildroot/package/imx-usb-loader/Config.in.host
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/joe/Config.in
rm -rf buildroot/package/joe/joe-3.7-disable-j0-j1-y0-y1-math-functions.patch
rm -rf buildroot/package/joe/joe.mk
diff --git a/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
new file mode 100644
index 0000000..8035d79
--- /dev/null
+++ b/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -0,0 +1,142 @@
+From patchwork Wed Oct 1 15:03:46 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v2,3/3] imx-usb-loader: new package
+From: Luca Ceresoli <lu...@lu...>
+X-Patchwork-Id: 395569
+Message-Id: <141...@lu...>
+To: bui...@uc...
+Cc: Luca Ceresoli <lu...@lu...>
+Date: Wed, 1 Oct 2014 17:03:46 +0200
+
+Signed-off-by: Luca Ceresoli <lu...@lu...>
+---
+ package/Config.in.host | 1 +
+ package/imx-usb-loader/Config.in.host | 14 ++++++++++++++
+ package/imx-usb-loader/imx-usb-loader.mk | 22 ++++++++++++++++++++++
+ 3 files changed, 37 insertions(+)
+ create mode 100644 package/imx-usb-loader/Config.in.host
+ create mode 100644 package/imx-usb-loader/imx-usb-loader.mk
+
+Index: buildroot/package/Config.in.host
+===================================================================
+--- buildroot.orig/package/Config.in.host
++++ buildroot/package/Config.in.host
+@@ -9,6 +9,7 @@ menu "Host utilities"
+ source "package/genext2fs/Config.in.host"
+ source "package/genimage/Config.in.host"
+ source "package/genpart/Config.in.host"
++ source "package/imx-usb-loader/Config.in.host"
+ source "package/lpc3250loader/Config.in.host"
+ source "package/mtd/Config.in.host"
+ source "package/mtools/Config.in.host"
+Index: buildroot/package/imx-usb-loader/Config.in.host
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/Config.in.host
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_HOST_IMX_USB_LOADER
++ bool "host imx-usb-loader"
++ depends on BR2_arm || BR2_armeb
++ help
++ This utility allows to download and execute code on Freescale
++ i.MX5/i.MX6 and Vybrid SoCs through the Serial Download Protocol
++ (SDP). Depending on the board, there is usually some kind of recovery
++ button to bring the SoC into serial download boot mode, check
++ documentation of your hardware.
++
++ The utility support USB and UART as serial link.
++
++ https://github.com/boundarydevices/imx_usb_loader
+Index: buildroot/package/imx-usb-loader/imx-usb-loader.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/imx-usb-loader.mk
+@@ -0,0 +1,36 @@
++################################################################################
++#
++# imx-usb-loader
++#
++################################################################################
++
++IMX_USB_LOADER_VERSION = f96aee286ea17c832b7ec922dd76842deb5ce299
++IMX_USB_LOADER_SITE = https://github.com/boundarydevices/imx_usb_loader.git
++IMX_USB_LOADER_SITE_METHOD = git
++IMX_USB_LOADER_DEPENDENCIES = libusb
++HOST_IMX_USB_LOADER_DEPENDENCIES = host-libusb
++
++define IMX_USB_LOADER_BUILD_CMDS
++ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
++endef
++
++define IMX_USB_LOADER_INSTALL_TARGET_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/imx_usb $(TARGET_DIR)/usr/bin/imx_usb
++ $(INSTALL) -D -m 0755 $(@D)/imx_uart $(TARGET_DIR)/usr/bin/imx_uart
++ mkdir -p $(TARGET_DIR)/usr/share/imx_usb_loader
++ $(INSTALL) -D -m 0644 $(@D)/*.conf $(TARGET_DIR)/usr/share/imx_usb_loader
++endef
++
++define HOST_IMX_USB_LOADER_BUILD_CMDS
++ $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)
++endef
++
++define HOST_IMX_USB_LOADER_INSTALL_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/imx_usb $(HOST_DIR)/usr/bin/imx_usb
++ $(INSTALL) -D -m 0755 $(@D)/imx_uart $(HOST_DIR)/usr/bin/imx_uart
++ mkdir -p $(HOST_DIR)/usr/share/imx_usb_loader
++ $(INSTALL) -D -m 0644 $(@D)/*.conf $(HOST_DIR)/usr/share/imx_usb_loader
++endef
++
++$(eval $(generic-package))
++$(eval $(host-generic-package))
+Index: buildroot/package/imx-usb-loader/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/Config.in
+@@ -0,0 +1,14 @@
++config BR2_PACKAGE_IMX_USB_LOADER
++ bool "imx-usb-loader"
++ depends on BR2_arm || BR2_armeb
++ select BR2_PACKAGE_LIBUSB
++ help
++ This utility allows to download and execute code on Freescale
++ i.MX5/i.MX6 and Vybrid SoCs through the Serial Download Protocol
++ (SDP). Depending on the board, there is usually some kind of recovery
++ button to bring the SoC into serial download boot mode, check
++ documentation of your hardware.
++
++ The utility support USB and UART as serial link.
++
++ https://github.com/boundarydevices/imx_usb_loader
+Index: buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+@@ -0,0 +1,14 @@
++diff --git a/mx6_usb_work.conf b/mx6_usb_work.conf
++index b484c51..fa952e2 100644
++--- a/mx6_usb_work.conf
+++++ b/mx6_usb_work.conf
++@@ -1,6 +1,7 @@
++-mx6_qsb
+++apf6qdl
++ #hid/bulk,[old_header,]max packet size, {ram start, ram size}(repeat valid ram areas)
++-hid,1024,0x10000000,1G,0x00907000,0x31000
+++#IMX6 quad and dual have 196KB OCRAM Free Area but IMX6 dual light and solo have only 68KB.
+++hid,1024,0x00907000,0x11000
++ #file:dcd,plug,load nnn,jump [nnn/header/header2]
++ #jump nnn - header is after last downloaded word
++ # entire file is loaded before jump, needs load nnn as well
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -344,6 +344,7 @@ endif
+ source "package/hwdata/Config.in"
+ source "package/i2c-tools/Config.in"
+ source "package/imx-test/Config.in"
++ source "package/imx-usb-loader/Config.in"
+ source "package/input-event-daemon/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/intel-microcode/Config.in"
diff --git a/patches/buildroot/2014.11/cleanup_buildroot.sh b/patches/buildroot/2014.11/cleanup_buildroot.sh
index 43e0cd6..3d1e485 100755
--- a/patches/buildroot/2014.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2014.11/cleanup_buildroot.sh
@@ -52,6 +52,10 @@ rm -rf buildroot/package/imx-test/Config.in
rm -rf buildroot/package/imx-test/imx-test-01_fixes.patch
rm -rf buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
rm -rf buildroot/package/imx-test/imx-test.mk
+rm -rf buildroot/package/imx-usb-loader/Config.in
+rm -rf buildroot/package/imx-usb-loader/Config.in.host
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/marble/Config.in
rm -rf buildroot/package/marble/marble.mk
rm -rf buildroot/package/matiec/Config.in
hooks/post-receive
--
armadeus
|
