[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-320-g7f72ecd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-320-g7f72ecd
|
From: Julien B a. A. <ar...@us...> - 2017-08-23 12:42:38
|
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 7f72ecdfdb4ef70c0642af450b55c8eb5fcee6d2 (commit)
via 6976fc6a711d6289e848d9cfada1a0d4b34b5dd0 (commit)
via 548c562c744103494377aa623da0ef57ac621c43 (commit)
from df3368ccf38003549f30e764b651fb86fa2dacb2 (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 7f72ecdfdb4ef70c0642af450b55c8eb5fcee6d2
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Aug 23 14:42:21 2017 +0200
[BUILDROOT] apf6legacy-4.1_defconfig: add imx-test by default and activate BR glibc toolchain to be able to use Freescale kernel includes
commit 6976fc6a711d6289e848d9cfada1a0d4b34b5dd0
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Aug 23 14:22:26 2017 +0200
[BUILDROOT] bump imx-test version to 5.4 (for 4.1 Freescale kernels)
commit 548c562c744103494377aa623da0ef57ac621c43
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Aug 22 15:37:01 2017 +0200
[DEBUG] imx6regs: move IPUx_FS_XXX_FLOW_N registers declaration and add IPUx_PROC_TASKS_STAT one
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy-4.1_defconfig | 9 +-
.../2017.02/176-imx-test-add_package.patch | 150 ++++++++++++++++++---
patches/buildroot/2017.02/cleanup_buildroot.sh | 5 +-
target/linux/debug/imxregs/imx6regs.h | 14 +-
4 files changed, 147 insertions(+), 31 deletions(-)
diff --git a/buildroot/configs/apf6legacy-4.1_defconfig b/buildroot/configs/apf6legacy-4.1_defconfig
index e7b8602..1c6b847 100644
--- a/buildroot/configs/apf6legacy-4.1_defconfig
+++ b/buildroot/configs/apf6legacy-4.1_defconfig
@@ -6,7 +6,13 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_TOOLCHAIN_EXTERNAL=y
+# Needed to have FSL 4.1 custom kernel includes:
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PACKAGE_HOST_GDB=y
+BR2_PACKAGE_HOST_GDB_TUI=y
+BR2_PACKAGE_HOST_GDB_PYTHON=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
@@ -106,6 +112,7 @@ BR2_PACKAGE_IMX_GPU_VIV_APITRACE=y
BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES=y
BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO=y
BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IMX_TEST=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_PCI_DEBUG=y
BR2_PACKAGE_PCIUTILS=y
diff --git a/patches/buildroot/2017.02/176-imx-test-add_package.patch b/patches/buildroot/2017.02/176-imx-test-add_package.patch
index 9a00fdb..5951c47 100644
--- a/patches/buildroot/2017.02/176-imx-test-add_package.patch
+++ b/patches/buildroot/2017.02/176-imx-test-add_package.patch
@@ -4,33 +4,47 @@ Index: buildroot/package/imx-test/Config.in
===================================================================
--- /dev/null
+++ buildroot/package/imx-test/Config.in
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,7 @@
+config BR2_PACKAGE_IMX_TEST
+ bool "imx-test"
+ select BR2_PACKAGE_IMX_LIB
+ help
-+ Freescale specific test utilities for i.MX processors family.
++ Freescale specific utilities for testing some i.MX processors
++ hardware features.
++ Requires a Freescale Linux kernel (to have corresponding drivers).
Index: buildroot/package/imx-test/imx-test.mk
===================================================================
--- /dev/null
+++ buildroot/package/imx-test/imx-test.mk
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,52 @@
+#############################################################
+#
+# imx-test (test tools from Freescale BSP)
+#
+#############################################################
-+IMX_TEST_VERSION = 10.11.01
++IMX_TEST_VERSION = 5.4
+IMX_TEST_SOURCE = imx-test-$(IMX_TEST_VERSION).tar.gz
+IMX_TEST_SITE = ftp://ftp2.armadeus.com/armadeusw/download
+IMX_TEST_DEPENDENCIES = imx-lib
+
++DIRS = mxc_spi_test mxc_uart_test mxc_usb_test
++DIRS += mxc_vpu_test mxc_fb_test mxc_v4l2_test
++
+ifeq ($(BR2_CPU_NAME),imx27)
+BUILD_PLATFORM = IMX27
+BUILD_CFLAGS = -DCONFIG_ARCH_MX2
-+else
++else ifeq ($(BR2_CPU_NAME),imx51)
+BUILD_PLATFORM = IMX51
+BUILD_CFLAGS = -DCONFIG_ARCH_MX5
++DIRS += mxc_ipudev_test
++else
++BUILD_PLATFORM = IMX6
++BUILD_CFLAGS = -DCONFIG_ARCH_MX6 -lpthread
++DIRS += mxc_ipudev_test
++ifeq ($(BR2_PACKAGE_PXPLIB),y)
++DIRS += pxp_lib_test
++endif
++DIRS += pxp_v4l2_test
+endif
+
+define IMX_TEST_BUILD_CMDS
@@ -39,29 +53,26 @@ Index: buildroot/package/imx-test/imx-test.mk
+ LINUXPATH=$(LINUX_DIR) \
+ CROSS_COMPILE="$(HOST_DIR)/usr/bin/arm-linux-" \
+ PLATFORM=$(BUILD_PLATFORM) \
-+ DIRS="mxc_sahara_test mxc_scc2 mxc_spi_test mxc_vpu_test mxc_uart_test mxc_usb_test" \
-+ CFLAGS="$(BUILD_CFLAGS) -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include" \
++ DIRS="$(DIRS)" \
++ CFLAGS="$(BUILD_CFLAGS)" \
+ -C $(@D)
+endef
+
+define IMX_TEST_INSTALL_TARGET_CMDS
-+ $(MAKE) LINUXPATH=$(LINUX_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) install -C $(@D)/module_test
-+ $(MAKE) DESTDIR=$(TARGET_DIR)/unit_tests PLATFORM=IMX51 install -C $(@D)
-+endef
-+
-+define IMX_TEST_UNINSTALL_TARGET_CMDS
-+ rm -rf $(TARGET_DIR)/unit_tests
-+endef
-+
-+define IMX_TEST_CLEAN_CMDS
-+ -$(MAKE) -C $(@D) clean
++ $(MAKE) LINUXPATH=$(LINUX_DIR) \
++ INSTALL_MOD_PATH=$(TARGET_DIR) \
++ CROSS_COMPILE="$(HOST_DIR)/usr/bin/arm-linux-" \
++ -C $(@D)/module_test install
++ $(MAKE) DESTDIR=$(TARGET_DIR)/unit_tests \
++ PLATFORM=$(BUILD_PLATFORM) \
++ -C $(@D) install
+endef
+
+$(eval $(generic-package))
-Index: buildroot/package/imx-test/imx-test-01_fixes.patch
+Index: buildroot/package/imx-test/10.11.01/imx-test-01_fixes.patch
===================================================================
--- /dev/null
-+++ buildroot/package/imx-test/imx-test-01_fixes.patch
++++ buildroot/package/imx-test/10.11.01/imx-test-01_fixes.patch
@@ -0,0 +1,50 @@
+Add some fixes for imx-test. Some are temporary.
+
@@ -113,10 +124,10 @@ Index: buildroot/package/imx-test/imx-test-01_fixes.patch
+ #endif
+ error_code = -IOCTL_SCC2_INVALID_CMD;
+ break;
-Index: buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
+Index: buildroot/package/imx-test/10.11.01/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
===================================================================
--- /dev/null
-+++ buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
++++ buildroot/package/imx-test/10.11.01/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
@@ -0,0 +1,16 @@
+linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
+
@@ -138,7 +149,7 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -406,6 +406,7 @@ endif
+@@ -412,6 +412,7 @@ endmenu
source "package/hwloc/Config.in"
source "package/i2c-tools/Config.in"
source "package/i7z/Config.in"
@@ -146,3 +157,98 @@ Index: buildroot/package/Config.in
source "package/input-event-daemon/Config.in"
source "package/input-tools/Config.in"
source "package/intel-microcode/Config.in"
+Index: buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
+@@ -0,0 +1,90 @@
++Add some fixes for imx-test.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++--- imx-test-5.4/test/mxc_ipudev_test/mxc_ipudev_test.c 2016-03-10 16:08:10.000000000 +0100
+++++ imx-test-5.4.mod/test/mxc_ipudev_test/mxc_ipudev_test.c 2017-08-08 17:32:52.983398969 +0200
++@@ -117,7 +117,7 @@
++ {
++ printf("====== ipu task ======\n");
++ printf("input:\n");
++- printf("\tforamt: 0x%x\n", t->input.format);
+++ printf("\tformat: 0x%x\n", t->input.format);
++ printf("\twidth: %d\n", t->input.width);
++ printf("\theight: %d\n", t->input.height);
++ printf("\tcrop.w = %d\n", t->input.crop.w);
++@@ -132,7 +132,7 @@
++ printf("\thigh motion\n");
++ }
++ printf("output:\n");
++- printf("\tforamt: 0x%x\n", t->output.format);
+++ printf("\tformat: 0x%x\n", t->output.format);
++ printf("\twidth: %d\n", t->output.width);
++ printf("\theight: %d\n", t->output.height);
++ printf("\troate: %d\n", t->output.rotate);
++@@ -142,7 +142,7 @@
++ printf("\tcrop.pos.y = %d\n", t->output.crop.pos.y);
++ if (t->overlay_en) {
++ printf("overlay:\n");
++- printf("\tforamt: 0x%x\n", t->overlay.format);
+++ printf("\tformat: 0x%x\n", t->overlay.format);
++ printf("\twidth: %d\n", t->overlay.width);
++ printf("\theight: %d\n", t->overlay.height);
++ printf("\tcrop.w = %d\n", t->overlay.crop.w);
++--- imx-test-5.4/test/mxc_v4l2_test/mxc_v4l2_overlay.c 2016-03-10 16:08:10.000000000 +0100
+++++ imx-test-5.4.mod/test/mxc_v4l2_test/mxc_v4l2_overlay.c 2017-08-08 15:34:22.159544071 +0200
++@@ -73,8 +73,8 @@
++ int g_sensor_height = 480;
++ int g_sensor_top = 0;
++ int g_sensor_left = 0;
++-int g_display_width = 240;
++-int g_display_height = 320;
+++int g_display_width = 320;
+++int g_display_height = 240;
++ int g_display_top = 0;
++ int g_display_left = 0;
++ int g_rotate = 0;
++@@ -550,7 +550,7 @@
++ else if (strcmp(argv[i], "-a") == 0) {
++ g_alpha_mode = atoi(argv[++i]);
++ }
++- else if (strcmp(argv[i], "-help") == 0) {
+++ else if (strcmp(argv[i], "-h") == 0) {
++ printf("MXC Video4Linux overlay Device Test\n\n" \
++ " -iw <input width>\n -ih <input height>\n" \
++ " -it <input top>\n -il <input left>\n" \
++@@ -598,7 +598,7 @@
++ struct mxcfb_loc_alpha l_alpha;
++ int ret = 0;
++ struct sigaction act;
++- struct v4l2_dbg_chip_ident chip;
+++// struct v4l2_dbg_chip_ident chip;
++
++ /* for ctrl-c */
++ sigemptyset(&act.sa_mask);
++@@ -618,14 +618,14 @@
++ printf("Unable to open %s\n", v4l_device);
++ return TFAIL;
++ }
++-
+++/*
++ if (ioctl(fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip))
++ {
++ printf("VIDIOC_DBG_G_CHIP_IDENT failed.\n");
++ return TFAIL;
++ }
++ printf("sensor chip is %s\n", chip.match.name);
++-
+++*/
++ if ((fd_fb_0 = open(fb_device_0, O_RDWR )) < 0) {
++ printf("Unable to open frame buffer 0\n");
++ return TFAIL;
++@@ -717,7 +717,7 @@
++ }
++
++ if (!g_overlay) {
++- g_alpha.alpha = 255;
+++ g_alpha.alpha = 128; //255;
++ g_alpha.enable = 1;
++ if (ioctl(fd_fb_0, MXCFB_SET_GBL_ALPHA, &g_alpha) < 0) {
++ printf("Set global alpha failed\n");
diff --git a/patches/buildroot/2017.02/cleanup_buildroot.sh b/patches/buildroot/2017.02/cleanup_buildroot.sh
index abaefe8..67db5e2 100755
--- a/patches/buildroot/2017.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2017.02/cleanup_buildroot.sh
@@ -51,9 +51,10 @@ rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gpsd/gpsd.mk
rm -rf buildroot/package/gsmmux/Config.in
rm -rf buildroot/package/gsmmux/gsmmux.mk
+rm -rf buildroot/package/imx-test/10.11.01/imx-test-01_fixes.patch
+rm -rf buildroot/package/imx-test/10.11.01/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
+rm -rf buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
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/imx-usb-loader-0001-fix-ram-size.patch
diff --git a/target/linux/debug/imxregs/imx6regs.h b/target/linux/debug/imxregs/imx6regs.h
index 7706da7..27a21e6 100644
--- a/target/linux/debug/imxregs/imx6regs.h
+++ b/target/linux/debug/imxregs/imx6regs.h
@@ -50,6 +50,12 @@ static struct reg_info regs[] =
{ "IPU1_INT_CTRL_14", 0x02600070, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Control Register 14" },
{ "IPU1_INT_CTRL_15", 0x02600074, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Control Register 15" },
+{ "IPU1_FS_PROC_FLOW_1", 0x026000a8, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 1 Register" },
+{ "IPU1_FS_PROC_FLOW_2", 0x026000ac, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 2 Register" },
+{ "IPU1_FS_PROC_FLOW_3", 0x026000b0, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 3 Register" },
+{ "IPU1_FS_DISP_FLOW_1", 0x026000b4, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Displaying Flow 1 Register" },
+{ "IPU1_FS_DISP_FLOW_2", 0x026000b8, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Displaying Flow 2 Register" },
+
{ "IPU1_INT_STAT_1", 0x02600200, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Status Register 1" },
{ "IPU1_INT_STAT_2", 0x02600204, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Status Register 2" },
{ "IPU1_INT_STAT_3", 0x02600208, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Status Register 3" },
@@ -66,6 +72,8 @@ static struct reg_info regs[] =
{ "IPU1_INT_STAT_14", 0x02600234, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Status Register 14" },
{ "IPU1_INT_STAT_15", 0x02600238, 0, 0xffffffff, 'x', "IPU1 (#0) Interrupt Status Register 15" },
+{ "IPU1_PROC_TASKS_STAT",0x02600250, 0, 0xffffffff, 'x', "IPU1 (#0) Processing Status Tasks Register" },
+
{ "IPU1_IDMAC_CONF", 0x02608000, 0, 0xffffffff, 'x', "IPU1 (#0) IDMAC Configuration Register" },
{ "IPU1_IDMAC_CH_EN_1", 0x02608004, 0, 0xffffffff, 'x', "IPU1 (#0) IDMAC Channel Enable 1 Register" },
{ "IPU1_IDMAC_CH_EN_2", 0x02608008, 0, 0xffffffff, 'x', "IPU1 (#0) IDMAC Channel Enable 2 Register" },
@@ -74,12 +82,6 @@ static struct reg_info regs[] =
{ "IPU1_IDMAC_BNDM_EN_1", 0x02608040, 0, 0xffffffff, 'x', "IPU1 (#0) IDMAC Band Mode Enable 1 Register" },
{ "IPU1_IDMAC_BNDM_EN_2", 0x02608044, 0, 0xffffffff, 'x', "IPU1 (#0) IDMAC Band Mode Enable 2 Register" },
-{ "IPU1_FS_PROC_FLOW_1", 0x026000a8, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 1 Register" },
-{ "IPU1_FS_PROC_FLOW_2", 0x026000ac, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 2 Register" },
-{ "IPU1_FS_PROC_FLOW_3", 0x026000b0, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Processing Flow 3 Register" },
-{ "IPU1_FS_DISP_FLOW_1", 0x026000b4, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Displaying Flow 1 Register" },
-{ "IPU1_FS_DISP_FLOW_2", 0x026000b8, 0, 0xffffffff, 'x', "IPU1 (#0) FSU Displaying Flow 2 Register" },
-
{ "IPU1_IC_CONF", 0x02620000, 0, 0xffffffff, 'x', "IPU1 (#0) IC Configuration Register" },
{ "IPU1_CSI0_SENS_CONF", 0x02630000, 0, 0xffffffff, 'x', "IPU1 (#0) CSI0 Sensor Configuration Register" },
hooks/post-receive
--
armadeus
|