From b72cb13fcf83b9d342808ea30379bfb6a1321b54 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Sat, 17 Dec 2011 16:36:07 +0100 Subject: [PATCH 01/22] linux.inc: If the kernel has CONFIG_KERNEL_LZO=y, it may well attempt to use the 'lzop' utility to do the lzo compression, but we should not be relying on that utility being installed on the build machine. This currently affects the linux-omap4 build for omap4430-panda. Signed-off-by: Christopher Larson Signed-off-by: Koen Kooi --- recipes-kernel/linux/linux.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc index 9650e686..e8a754f5 100644 --- a/recipes-kernel/linux/linux.inc +++ b/recipes-kernel/linux/linux.inc @@ -264,3 +264,14 @@ pkg_postrm_kernel-devicetree () { cd /${KERNEL_IMAGEDEST}; update-alternatives --remove devicetree devicetree-${KERNEL_VERSION} || true } +# Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled +python () { + try: + defconfig = bb.fetch2.localpath('file://defconfig', d) + except bb.fetch2.FetchError: + pass + else: + if 'CONFIG_KERNEL_LZO=y\n' in open(defconfig).readlines(): + depends = d.getVar('DEPENDS', False) + d.setVar('DEPENDS', depends + ' lzop-native') +} From dfc70fc8b5c97339504bf2bda0b3949091f1ffdc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 19 Dec 2011 11:44:36 +0100 Subject: [PATCH 02/22] ti-xdctools: update to 3.23.00.32 Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes-ti/devtools/ti-xdctools.inc | 6 +----- recipes-ti/devtools/ti-xdctools_3.20.06.81.bb | 14 -------------- recipes-ti/devtools/ti-xdctools_3.23.00.32.bb | 11 +++++++++++ 3 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 recipes-ti/devtools/ti-xdctools_3.20.06.81.bb create mode 100644 recipes-ti/devtools/ti-xdctools_3.23.00.32.bb diff --git a/recipes-ti/devtools/ti-xdctools.inc b/recipes-ti/devtools/ti-xdctools.inc index 120ebaad..c76ad80f 100644 --- a/recipes-ti/devtools/ti-xdctools.inc +++ b/recipes-ti/devtools/ti-xdctools.inc @@ -1,11 +1,7 @@ DESCRIPTION = "TI XDCtools (RTSC - Real Time Software Components - http://rtsc.eclipse.org)" HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc" SECTION = "devel" -LICENSE = "BSD, GPLv2" - -LIC_FILES_CHKSUM = "file://docs/license/xdc/shelf/package.html;md5=eace8fa313a140ef178ecfa0f53cc655" - -PR = "r2" +LICENSE = "BSD & GPLv2" require ../includes/ti-paths.inc require ../includes/ti-staging.inc diff --git a/recipes-ti/devtools/ti-xdctools_3.20.06.81.bb b/recipes-ti/devtools/ti-xdctools_3.20.06.81.bb deleted file mode 100644 index 45bedaab..00000000 --- a/recipes-ti/devtools/ti-xdctools_3.20.06.81.bb +++ /dev/null @@ -1,14 +0,0 @@ -require ti-xdctools.inc - -PV = "3_20_06_81" - -# This fixes c6accel, but breaks codec-engine and lpm -#SRC_URI += "file://arm-linker-hack.diff" - -SRC_URI += "file://fix-hardcoded-paths.diff" - -SRC_URI[xdcbin.md5sum] = "65151268d6be6ad6eb940ef7ed03af16" -SRC_URI[xdcbin.sha256sum] = "8ea6b851521ce41fe0b4a349b2d922af7e70f48c50ad9fd21f62627446a834f8" - - - diff --git a/recipes-ti/devtools/ti-xdctools_3.23.00.32.bb b/recipes-ti/devtools/ti-xdctools_3.23.00.32.bb new file mode 100644 index 00000000..b2db76c9 --- /dev/null +++ b/recipes-ti/devtools/ti-xdctools_3.23.00.32.bb @@ -0,0 +1,11 @@ +require ti-xdctools.inc + +PV = "3_23_00_32" +LIC_FILES_CHKSUM = "file://docs/license/xdc/shelf/package.html;md5=49b2dfbf48860a0da844709c3ce63a9c" + +SRC_URI += "file://fix-hardcoded-paths.diff" + +SRC_URI[xdcbin.md5sum] = "263aa11795670265551d36a8c77ad27d" +SRC_URI[xdcbin.sha256sum] = "880b4e263850f2a3c0ea7352c5b6e0a86692361e26634c3b70dddc42c71231a5" + +S = "${WORKDIR}/ti/xdctools_${PV}" From 975808de623c463e853369878f93c95817cd986f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 19 Dec 2011 14:52:01 +0100 Subject: [PATCH 03/22] ti-dspbios: update to 5.41.11.38 Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes-ti/bios/ti-dspbios.inc | 5 ++--- recipes-ti/bios/ti-dspbios_5.41.07.24.bb | 8 -------- recipes-ti/bios/ti-dspbios_5.41.11.38.bb | 7 +++++++ 3 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 recipes-ti/bios/ti-dspbios_5.41.07.24.bb create mode 100644 recipes-ti/bios/ti-dspbios_5.41.11.38.bb diff --git a/recipes-ti/bios/ti-dspbios.inc b/recipes-ti/bios/ti-dspbios.inc index 4bad8349..8519039f 100644 --- a/recipes-ti/bios/ti-dspbios.inc +++ b/recipes-ti/bios/ti-dspbios.inc @@ -3,14 +3,13 @@ HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/b SECTION = "devel" LICENSE = "TI" -LIC_FILES_CHKSUM = "file://docs/license/TSPA_License_Agreement_DSP_BIOS_bios_5_41_07_24.html;md5=86096a08e4088ef291c98313d82b8742" +# We can't depend on license files to be present, so just use the TI logo +LIC_FILES_CHKSUM = "file://docs/tilogo.gif;md5=f049a774c576a5cef3fca4932d707b39" require ../includes/ti-paths.inc require ../includes/ti-staging.inc require ../includes/ti-eula-unpack.inc -PR = "r1" - S = "${WORKDIR}/bios_${PV}" SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/dspbios/${PV}/exports/bios_setuplinux_${PV}.bin;name=biosbin" diff --git a/recipes-ti/bios/ti-dspbios_5.41.07.24.bb b/recipes-ti/bios/ti-dspbios_5.41.07.24.bb deleted file mode 100644 index 536939ed..00000000 --- a/recipes-ti/bios/ti-dspbios_5.41.07.24.bb +++ /dev/null @@ -1,8 +0,0 @@ -require ti-dspbios.inc - -PV = "5_41_07_24" - -SRC_URI[biosbin.md5sum] = "18301d0e1d351bcece9ce97255b8ff1b" -SRC_URI[biosbin.sha256sum] = "1531dca674154fbe179ad5017555e963bcf3d74a47a0fbf10e8a7009639d6c34" - - diff --git a/recipes-ti/bios/ti-dspbios_5.41.11.38.bb b/recipes-ti/bios/ti-dspbios_5.41.11.38.bb new file mode 100644 index 00000000..9e3b695a --- /dev/null +++ b/recipes-ti/bios/ti-dspbios_5.41.11.38.bb @@ -0,0 +1,7 @@ +require ti-dspbios.inc + +PV = "5_41_11_38" + +SRC_URI[biosbin.md5sum] = "7fab13740c25f5b34b331bcdc759536e" +SRC_URI[biosbin.sha256sum] = "96b8e090f79420a4c11d9c0c10d182d1d3b4afb48f11ec375c97b4c91970d0a0" + From 375bd39bca5b1564521351cbead5ad1d9d9347f4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 19 Dec 2011 15:53:36 +0100 Subject: [PATCH 04/22] ti-ipc: update to 1_24_00_16 Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes-ti/ipc/ti-ipc_1.23.02.27.bb | 9 --------- recipes-ti/ipc/ti-ipc_1.24.00.16.bb | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 recipes-ti/ipc/ti-ipc_1.23.02.27.bb create mode 100644 recipes-ti/ipc/ti-ipc_1.24.00.16.bb diff --git a/recipes-ti/ipc/ti-ipc_1.23.02.27.bb b/recipes-ti/ipc/ti-ipc_1.23.02.27.bb deleted file mode 100644 index 2176b136..00000000 --- a/recipes-ti/ipc/ti-ipc_1.23.02.27.bb +++ /dev/null @@ -1,9 +0,0 @@ -require ti-ipc.inc - -LIC_FILES_CHKSUM = "file://ipc_1_23_02_27_manifest.html;md5=74cbdd9a526809df81e080f19b36eec7" - -PV = "1_23_02_27" - -SRC_URI[ipcbin.md5sum] = "8c45f6a81cef62f9717335911ee1c9cd" -SRC_URI[ipcbin.sha256sum] = "b16f29ef016819fe0632468e2f756e05508143cbc732bcaabd269571163b568e" - diff --git a/recipes-ti/ipc/ti-ipc_1.24.00.16.bb b/recipes-ti/ipc/ti-ipc_1.24.00.16.bb new file mode 100644 index 00000000..e7ae7ef1 --- /dev/null +++ b/recipes-ti/ipc/ti-ipc_1.24.00.16.bb @@ -0,0 +1,8 @@ +require ti-ipc.inc + +PV = "1_24_00_16" + +LIC_FILES_CHKSUM = "file://ipc_${PV}_manifest.html;md5=573f5a5c0448d28bf8db35f438244d7f" + +SRC_URI[ipcbin.md5sum] = "d2f7cc82310d555ca039dcd353bd94c5" +SRC_URI[ipcbin.sha256sum] = "96df7835e920c7dabcd63d30ec8bc2aea7cd0c6197c9fb9ca0f8a9b681aa5396" From 7ffe55ce3f35bb58548ed10295bae858fed3c724 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 19 Dec 2011 16:28:37 +0100 Subject: [PATCH 05/22] ti-sysbios: add 6.33.00.19 Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes-ti/bios/ti-sysbios_6.31.04.27.bb | 8 -------- recipes-ti/bios/ti-sysbios_6.33.00.19.bb | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 recipes-ti/bios/ti-sysbios_6.31.04.27.bb create mode 100644 recipes-ti/bios/ti-sysbios_6.33.00.19.bb diff --git a/recipes-ti/bios/ti-sysbios_6.31.04.27.bb b/recipes-ti/bios/ti-sysbios_6.31.04.27.bb deleted file mode 100644 index 107affdc..00000000 --- a/recipes-ti/bios/ti-sysbios_6.31.04.27.bb +++ /dev/null @@ -1,8 +0,0 @@ -require ti-sysbios.inc - -PV = "6_31_04_27" -LIC_FILES_CHKSUM = "file://sysbios_6_31_04_27_manifest.html;md5=36efea2939274c46b73f5e170abaffcb" - -SRC_URI[sysbiosbin.md5sum] = "c82e1d3afc9e2d3e88b0e4137f152ed6" -SRC_URI[sysbiosbin.sha256sum] = "92337cf3197d2b7ffe2316f311cd163be7b470acbb032273894d7d39182f4227" - diff --git a/recipes-ti/bios/ti-sysbios_6.33.00.19.bb b/recipes-ti/bios/ti-sysbios_6.33.00.19.bb new file mode 100644 index 00000000..4e2b4456 --- /dev/null +++ b/recipes-ti/bios/ti-sysbios_6.33.00.19.bb @@ -0,0 +1,9 @@ +require ti-sysbios.inc + +PV = "6_33_00_19" +LIC_FILES_CHKSUM = "file://sysbios_${PV}_manifest.html;md5=94136ca9815f76603b7202a41f1d6f5e" + +SRC_URI[sysbiosbin.md5sum] = "e1a2f28a8b3087896bbd986696e1a908" +SRC_URI[sysbiosbin.sha256sum] = "b7e096662f5d928eb818bbb14474deb1e3e038fea34b516b248de637835121ec" + +S = "${WORKDIR}/ti/bios_${PV}" From bf3813c19b824e75f3fddd5f24d06c59339c5e17 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 20 Dec 2011 13:57:29 +0100 Subject: [PATCH 06/22] linux 3.1: set COMPATIBLE_MACHINE to beagleboard for the time being to work around linux.inc problems Signed-off-by: Koen Kooi --- recipes-kernel/linux/linux_3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux_3.1.bb b/recipes-kernel/linux/linux_3.1.bb index 591e811e..0ec0d268 100644 --- a/recipes-kernel/linux/linux_3.1.bb +++ b/recipes-kernel/linux/linux_3.1.bb @@ -1,6 +1,6 @@ require linux.inc -COMPATIBLE_MACHINE = "omap3" +COMPATIBLE_MACHINE = "beagleboard" DESCRIPTION = "Linux kernel for TI processors" KERNEL_IMAGETYPE = "uImage" From c84b0511b3a1278ce6ea8efd423ce032f715a639 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 20 Dec 2011 16:30:22 +0100 Subject: [PATCH 07/22] linux-ti81xx-psp 2.6.37: update to match latest *SDK Boot Tested on DM8148 EVM Acked-by: Roger Monk Signed-off-by: Koen Kooi --- conf/machine/include/ti814x.inc | 2 +- ...e-for-disabling-the-least-significan.patch | 45 +++++++++++++++++++ .../linux/linux-ti81xx-psp_2.6.37.bb | 9 ++-- 3 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 recipes-kernel/linux/linux-ti81xx-psp-2.6.37/0001-ti814x-added-code-for-disabling-the-least-significan.patch diff --git a/conf/machine/include/ti814x.inc b/conf/machine/include/ti814x.inc index 4f1c1dea..23b6a1d7 100644 --- a/conf/machine/include/ti814x.inc +++ b/conf/machine/include/ti814x.inc @@ -6,7 +6,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ti81xx-psp" PREFERRED_PROVIDER_virtual/bootloader = "u-boot" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r1" +MACHINE_KERNEL_PR = "r2" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes-kernel/linux/linux-ti81xx-psp-2.6.37/0001-ti814x-added-code-for-disabling-the-least-significan.patch b/recipes-kernel/linux/linux-ti81xx-psp-2.6.37/0001-ti814x-added-code-for-disabling-the-least-significan.patch new file mode 100644 index 00000000..c1f368d3 --- /dev/null +++ b/recipes-kernel/linux/linux-ti81xx-psp-2.6.37/0001-ti814x-added-code-for-disabling-the-least-significan.patch @@ -0,0 +1,45 @@ +From 1d43359e415cada4607d0d21b7de07c740616386 Mon Sep 17 00:00:00 2001 +From: Amarinder Bindra +Date: Wed, 7 Dec 2011 20:54:56 +0530 +Subject: [PATCH] ti814x: added code for disabling the least significant bit of TI814x_HDMI_MUX_ADDR before vps init + + +Signed-off-by: Amarinder Bindra +--- + drivers/video/ti81xx/vpss/core.c | 13 ++++++++++++- + 1 files changed, 12 insertions(+), 1 deletions(-) + +diff --git a/drivers/video/ti81xx/vpss/core.c b/drivers/video/ti81xx/vpss/core.c +index eb9c074..80008b9 100644 +--- a/drivers/video/ti81xx/vpss/core.c ++++ b/drivers/video/ti81xx/vpss/core.c +@@ -41,7 +41,7 @@ + + #define VPS_DRIVER_NAME "vpss" + +- ++#define TI814x_HDMI_MUX_ADDR (0x481C52C8) + + #ifdef DEBUG + unsigned int vpss_debug; +@@ -148,6 +148,17 @@ static int __init vps_init(void) + { + VPSSDBG("core init\n"); + ++ /* This mux is for configuring the pixel clock to Venc through HDMI or PLL*/ ++ u32 reg_value; ++ u32 reg_base; ++ ++ reg_base = (u32)ioremap(TI814x_HDMI_MUX_ADDR, 0x10); ++ reg_value = __raw_readl(reg_base); ++ reg_value &= 0xFFFFFFFE; ++ ++ __raw_writel(reg_value, reg_base); ++ iounmap((u32 *)TI814x_HDMI_MUX_ADDR); ++ + if (platform_driver_probe(&vps_driver, vps_probe)) { + VPSSERR("failed to register ti81xx-vpss driver\n"); + return -ENODEV; +-- +1.7.1 + diff --git a/recipes-kernel/linux/linux-ti81xx-psp_2.6.37.bb b/recipes-kernel/linux/linux-ti81xx-psp_2.6.37.bb index bae58b99..e5a38363 100644 --- a/recipes-kernel/linux/linux-ti81xx-psp_2.6.37.bb +++ b/recipes-kernel/linux/linux-ti81xx-psp_2.6.37.bb @@ -6,15 +6,14 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "am387x-evm|am389x-evm|c6a814x-evm|c6a816x-evm|dm814x-evm" # This is on the ti81xx-master branch -SRCREV = "a02ce6137c1647009a17ecac35d846fe9479dded" - -# requires .28 hdvpss: d686b2da5d2e7337c9759f910c3a665c27b0ec31 +SRCREV = "745a06cb913ad7a9ab44855aa36d8c012cd5793b" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "d+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" SRC_URI += "git://arago-project.org/git/projects/linux-omap3.git;protocol=git;branch=ti81xx-master \ - file://defconfig" + file://0001-ti814x-added-code-for-disabling-the-least-significan.patch \ + file://defconfig" S = "${WORKDIR}/git" From c00b5df3b85b3badbd268e376c0a19fab19cc4f3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 21 Dec 2011 15:33:36 +0100 Subject: [PATCH 08/22] linux-ti335x-psp 3.1: disable whiteheat firmware to unbreak build with make 3.85 Signed-off-by: Koen Kooi --- recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig | 2 +- recipes-kernel/linux/linux-ti33x-psp_3.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig b/recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig index a762e6f1..628f149b 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig +++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig @@ -2564,7 +2564,7 @@ CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m +# CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_CP210X=m CONFIG_USB_SERIAL_CYPRESS_M8=m diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.1.bb b/recipes-kernel/linux/linux-ti33x-psp_3.1.bb index 029b5c35..f7ec2f80 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.1.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.1.bb @@ -11,7 +11,7 @@ MULTI_CONFIG_BASE_SUFFIX = "" BRANCH = "v3.1-meta-ti-r1r+gitr1d84d8853fa30cf3db2571a5aec572accca4e29d" SRCREV = "1d84d8853fa30cf3db2571a5aec572accca4e29d" -MACHINE_KERNEL_PR_append = "f+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "g+gitr${SRCREV}" COMPATIBLE_MACHINE = "(ti33x)" From ff247a13f335e85af6254f7fc99d9b6602cf515b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 22 Dec 2011 09:40:03 +0100 Subject: [PATCH 09/22] ti-linuxutils: fix LICENSE syntax Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes-ti/linuxutils/ti-linuxutils.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-ti/linuxutils/ti-linuxutils.inc b/recipes-ti/linuxutils/ti-linuxutils.inc index 0c0ebe31..d6cd18c6 100644 --- a/recipes-ti/linuxutils/ti-linuxutils.inc +++ b/recipes-ti/linuxutils/ti-linuxutils.inc @@ -1,6 +1,6 @@ DESCRIPTION = "MFP Linux utils for TI ARM/DSP processors" SECTION = "devel" -LICENSE = "GPLv2,BSD" +LICENSE = "GPLv2 & BSD" BASE_SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/linuxutils/${PV}/exports" SRC_URI = "${BASE_SRC_URI}/linuxutils_${PV}.tar.gz " @@ -15,7 +15,7 @@ require recipes-ti/includes/ti-staging.inc PR = "${MACHINE_KERNEL_PR}" #This is a kernel module, don't set PR directly -MACHINE_KERNEL_PR_append = "d" +MACHINE_KERNEL_PR_append = "e" inherit module From 1294eebad39d7861a4b5090591c050be56dd5772 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 22 Dec 2011 16:03:27 +0100 Subject: [PATCH 10/22] ti-cgt6x: update to 6.1.20 Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes-ti/devtools/ti-cgt6x_6.1.17.bb | 11 ----------- recipes-ti/devtools/ti-cgt6x_6.1.20.bb | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 recipes-ti/devtools/ti-cgt6x_6.1.17.bb create mode 100644 recipes-ti/devtools/ti-cgt6x_6.1.20.bb diff --git a/recipes-ti/devtools/ti-cgt6x_6.1.17.bb b/recipes-ti/devtools/ti-cgt6x_6.1.17.bb deleted file mode 100644 index d47ad3ca..00000000 --- a/recipes-ti/devtools/ti-cgt6x_6.1.17.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ti-cgt6x.inc - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=712a8c64bb70c5ea5fa193faef3bed6f" - -PE = "1" -PV = "6_1_17" -PVwithdots = "6.1.17" - -SRC_URI[cgt6xbin.md5sum] = "41ee41cc74800b06705804f7ef901447" -SRC_URI[cgt6xbin.sha256sum] = "7e1c8b67420abf6f2f44786811d0a2b5692e76194743bed714ec9087cc1a75c7" - diff --git a/recipes-ti/devtools/ti-cgt6x_6.1.20.bb b/recipes-ti/devtools/ti-cgt6x_6.1.20.bb new file mode 100644 index 00000000..1d6609c8 --- /dev/null +++ b/recipes-ti/devtools/ti-cgt6x_6.1.20.bb @@ -0,0 +1,11 @@ +require ti-cgt6x.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62f46f1125a152a2e213b414db7ac600" + +PE = "1" +PV = "6_1_20" +PVwithdots = "6.1.20" + +SRC_URI[cgt6xbin.md5sum] = "39485ea8211960de0a958ab27106ab9b" +SRC_URI[cgt6xbin.sha256sum] = "a020142011c8160e24f6386f7696ecfbfe02dab2a6c83af74ce6b67eb1da9900" + From 6d60a3e0d2cff60b7b04aab3e51ea808fac61678 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 22 Dec 2011 16:25:30 +0100 Subject: [PATCH 11/22] ti-cgt6x: add 7.2.7 Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes-ti/devtools/ti-cgt6x_7.2.7.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 recipes-ti/devtools/ti-cgt6x_7.2.7.bb diff --git a/recipes-ti/devtools/ti-cgt6x_7.2.7.bb b/recipes-ti/devtools/ti-cgt6x_7.2.7.bb new file mode 100644 index 00000000..aab1b96c --- /dev/null +++ b/recipes-ti/devtools/ti-cgt6x_7.2.7.bb @@ -0,0 +1,11 @@ +require ti-cgt6x.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62f46f1125a152a2e213b414db7ac600" + +PE = "1" +PV = "7_2_7" +PVwithdots = "7.2.7" + +SRC_URI[cgt6xbin.md5sum] = "71a0768a541fdebd9c35d44301019d1d" +SRC_URI[cgt6xbin.sha256sum] = "211477f0142d603975544abe3c45cc3b77a3b38038158676c60812806378738b" + From e62a63e5ffd9ff6e8705b3658f6b6568bbf5e582 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 22 Dec 2011 09:17:28 +0100 Subject: [PATCH 12/22] linux 3.0: update to 3.0.14 Also make oprofile a module to workaround an oprofile bug highlighted in 3.0.13 Signed-off-by: Koen Kooi --- conf/machine/include/omap3.inc | 2 +- recipes-kernel/linux/linux-3.0/beagleboard/defconfig | 4 ++-- recipes-kernel/linux/linux_3.0.bb | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 4530ae1d..fc252bab 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -3,7 +3,7 @@ SOC_FAMILY = "omap3" require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r113" +MACHINE_KERNEL_PR = "r114" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes-kernel/linux/linux-3.0/beagleboard/defconfig b/recipes-kernel/linux/linux-3.0/beagleboard/defconfig index 0b150c5c..5f2a7eb2 100644 --- a/recipes-kernel/linux/linux-3.0/beagleboard/defconfig +++ b/recipes-kernel/linux/linux-3.0/beagleboard/defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 3.0.7 Kernel Configuration +# Linux/arm 3.0.14 Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -149,7 +149,7 @@ CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set CONFIG_PROFILING=y -CONFIG_OPROFILE=y +CONFIG_OPROFILE=m CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_KPROBES=y diff --git a/recipes-kernel/linux/linux_3.0.bb b/recipes-kernel/linux/linux_3.0.bb index 38b90e9f..d72826b8 100644 --- a/recipes-kernel/linux/linux_3.0.bb +++ b/recipes-kernel/linux/linux_3.0.bb @@ -5,12 +5,12 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "(beagleboard)" -PV = "3.0.12" -# v3.0.12 tag -SRCREV_pn-${PN} = "ac6766564c0305ca020fe747dfd7dbdf0881369d" +PV = "3.0.14" +# v3.0.14 tag +SRCREV_pn-${PN} = "6636552f1dd0d2e2be2f87605ea2cd3aa4d2e5b6" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "b" +MACHINE_KERNEL_PR_append = "a" FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:" @@ -194,7 +194,6 @@ SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gi file://beagle/0008-OMAP2-add-cpu-id-register-to-MAC-address-helper.patch \ file://beagle/0009-HACK-OMAP2-BeagleBoard-Fix-up-random-or-missing-MAC-.patch \ file://beagle/0010-ARM-OMAP2-beagleboard-fix-mmc-write-protect-pin-when.patch \ - file://beagle/0011-Revert-mfd-Fix-twl4030-dependencies-for-audio-codec.patch \ file://madc/0001-Enabling-Hwmon-driver-for-twl4030-madc.patch \ file://madc/0002-mfd-twl-core-enable-madc-clock.patch \ \ From 97ce30236667173b826d13af354104829484d5db Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 22 Dec 2011 11:19:55 +0100 Subject: [PATCH 13/22] ti-dmai: clean up recipe * remove DP = -1, there's only one recipe * remove unused files * add git patch header to remaining patches Signed-off-by: Koen Kooi --- recipes-ti/dmai/ti-dmai.inc | 4 +- ...rrect-DMAI-s-Resize-module-for-DM365.patch | 34 ----- .../ti-dmai/dmai-built-with-angstrom.patch | 48 ------- .../dmai-do-not-panic-on-mixer-failure.patch | 31 ----- .../dmai-r423-add-omapl137-support.patch | 12 -- .../ti-dmai/dmai-support-32bit-align.patch | 17 --- .../dmai/ti-dmai/dmai-update-cpu-name.patch | 16 --- .../dmai/ti-dmai/dmai-update-fb-display.patch | 77 ----------- .../ti-dmai/dmai-update-v4l2-display.patch | 127 ------------------ ...omap3530-r642-remove-include-videodev.diff | 80 ++++++----- .../dmai/ti-dmai/r642-fix-config-bld.diff | 32 +++-- recipes-ti/dmai/ti-dmai_svn.bb | 12 +- 12 files changed, 77 insertions(+), 413 deletions(-) delete mode 100644 recipes-ti/dmai/ti-dmai/0001-Correct-DMAI-s-Resize-module-for-DM365.patch delete mode 100644 recipes-ti/dmai/ti-dmai/dmai-built-with-angstrom.patch delete mode 100644 recipes-ti/dmai/ti-dmai/dmai-do-not-panic-on-mixer-failure.patch delete mode 100644 recipes-ti/dmai/ti-dmai/dmai-r423-add-omapl137-support.patch delete mode 100644 recipes-ti/dmai/ti-dmai/dmai-support-32bit-align.patch delete mode 100644 recipes-ti/dmai/ti-dmai/dmai-update-cpu-name.patch delete mode 100644 recipes-ti/dmai/ti-dmai/dmai-update-fb-display.patch delete mode 100644 recipes-ti/dmai/ti-dmai/dmai-update-v4l2-display.patch diff --git a/recipes-ti/dmai/ti-dmai.inc b/recipes-ti/dmai/ti-dmai.inc index 8b536fc8..8c20384a 100644 --- a/recipes-ti/dmai/ti-dmai.inc +++ b/recipes-ti/dmai/ti-dmai.inc @@ -47,12 +47,12 @@ DMAIPLATFORM_dm355 = "dm355_al" DMAIPLATFORM_dm365 = "dm365_al" DMAIPLATFORM_omapl137 = "ol137_al" DMAIPLATFORM_omapl138 = "ol138_al" -DMAIPLATFORM ?= "" +DMAIPLATFORM ?= "UNDEFINED_DMAIPLATFORM" # Need to set this for other platforms as well #GPPOS_dm355 = "LINUX_GCC" #GPPOS_dm365 = "LINUX_GCC" -#GPPOS ?= "" +#GPPOS ?= "UNDEFINEDGPPOS" # Need to re-define this for OMAP-L137/L138 DSPSUFFIX_omapl137 = "x64P" diff --git a/recipes-ti/dmai/ti-dmai/0001-Correct-DMAI-s-Resize-module-for-DM365.patch b/recipes-ti/dmai/ti-dmai/0001-Correct-DMAI-s-Resize-module-for-DM365.patch deleted file mode 100644 index 21e71dec..00000000 --- a/recipes-ti/dmai/ti-dmai/0001-Correct-DMAI-s-Resize-module-for-DM365.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9d9326c26ea990fa49842e0c57d520a5acb4d887 Mon Sep 17 00:00:00 2001 -From: Don Darling -Date: Fri, 16 Apr 2010 17:40:40 -0500 -Subject: [PATCH] Correct DMAI's Resize module for DM365. - -The PSP requires virtual addresses to be given for the resize buffers. This -differs from previous releases, which required physical addresses. This -change updates the Resize module to use virtual addresses. ---- - .../packages/ti/sdo/dmai/linux/dm365/Resize.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dmai/packages/ti/sdo/dmai/linux/dm365/Resize.c b/dmai/packages/ti/sdo/dmai/linux/dm365/Resize.c -index c1716c4..3e71e46 100644 ---- a/dmai/packages/ti/sdo/dmai/linux/dm365/Resize.c -+++ b/dmai/packages/ti/sdo/dmai/linux/dm365/Resize.c -@@ -313,12 +313,12 @@ Int Resize_execute(Resize_Handle hResize, - - rsz.in_buff.index = -1; - rsz.in_buff.buf_type = IMP_BUF_IN; -- rsz.in_buff.offset = Buffer_getPhysicalPtr(hSrcBuf) + srcOffset; -+ rsz.in_buff.offset = ((Int32)Buffer_getUserPtr(hSrcBuf)) + srcOffset; - rsz.in_buff.size = Buffer_getSize(hSrcBuf); - - rsz.out_buff1.index = -1; - rsz.out_buff1.buf_type = IMP_BUF_OUT1; -- rsz.out_buff1.offset = Buffer_getPhysicalPtr(hDstBuf) + dstOffset; -+ rsz.out_buff1.offset = ((Int32)Buffer_getUserPtr(hDstBuf)) + dstOffset; - rsz.out_buff1.size = Buffer_getSize(hDstBuf); - - /* --- -1.6.3.3 - diff --git a/recipes-ti/dmai/ti-dmai/dmai-built-with-angstrom.patch b/recipes-ti/dmai/ti-dmai/dmai-built-with-angstrom.patch deleted file mode 100644 index fc497897..00000000 --- a/recipes-ti/dmai/ti-dmai/dmai-built-with-angstrom.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: dmai_1_20_00_06/packages/config.bld -=================================================================== ---- dmai_1_20_00_06.orig/packages/config.bld 2009-02-11 19:38:51.000000000 -0600 -+++ dmai_1_20_00_06/packages/config.bld 2009-02-11 19:39:23.000000000 -0600 -@@ -42,7 +42,7 @@ - - /* location of the Codec Sourcery Arm9 tools */ - var GCArmv5T = xdc.useModule('gnu.targets.arm.GCArmv5T'); --GCArmv5T.LONGNAME = 'bin/arm-none-linux-gnueabi-gcc'; -+GCArmv5T.LONGNAME = 'bin/arm-angstrom-linux-gnueabi-gcc'; - GCArmv5T.platform = "ti.platforms.evm3530"; - GCArmv5T.rootDir = java.lang.System.getenv("CSTOOL_DIR"); - -Index: dmai_1_20_00_06/packages/ti/sdo/dmai/Makefile -=================================================================== ---- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/Makefile 2009-02-11 19:39:57.000000000 -0600 -+++ dmai_1_20_00_06/packages/ti/sdo/dmai/Makefile 2009-02-11 19:58:05.000000000 -0600 -@@ -33,7 +33,7 @@ - DMAI_INSTALL_DIR = ../../../.. - TARGET = dmai - --include $(DMAI_INSTALL_DIR)/Rules.make -+#include $(DMAI_INSTALL_DIR)/Rules.make - - # Should the full command be echoed to the console during build? - VERBOSE=false -@@ -64,7 +64,7 @@ - MVL_CPP_FLAGS = $(GNU_CPP_FLAGS) -Dxdc_target_name__=MVArm9 - CS_CPP_FLAGS = $(GNU_CPP_FLAGS) -Dxdc_target_name__=codesourcery/GCArmv5T - --GNU_C_FLAGS = $(C_FLAGS) -Wall -Werror -+GNU_C_FLAGS = $(C_FLAGS) -Wall - C64P_C_FLAGS = $(C_FLAGS) - - GNU_AR_FLAGS = $(AR_FLAGS) -Index: dmai_1_20_00_06/packages/ti/sdo/dmai/apps/Makefile.app -=================================================================== ---- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/apps/Makefile.app 2009-02-11 19:58:44.000000000 -0600 -+++ dmai_1_20_00_06/packages/ti/sdo/dmai/apps/Makefile.app 2009-02-11 19:59:01.000000000 -0600 -@@ -34,7 +34,7 @@ - ifndef DMAI_INSTALL_DIR - DMAI_INSTALL_DIR = ../../../../../.. - endif --include $(DMAI_INSTALL_DIR)/Rules.make -+#include $(DMAI_INSTALL_DIR)/Rules.make - - # Should the full command be echoed to the console during build? - VERBOSE=false diff --git a/recipes-ti/dmai/ti-dmai/dmai-do-not-panic-on-mixer-failure.patch b/recipes-ti/dmai/ti-dmai/dmai-do-not-panic-on-mixer-failure.patch deleted file mode 100644 index 20e1aece..00000000 --- a/recipes-ti/dmai/ti-dmai/dmai-do-not-panic-on-mixer-failure.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Sound_alsa.c -=================================================================== ---- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Sound_alsa.c 2009-02-11 19:19:23.000000000 -0600 -+++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Sound_alsa.c 2009-02-11 19:19:25.000000000 -0600 -@@ -139,7 +139,7 @@ - - snd_mixer_selem_id_free (sid); - snd_mixer_close (rcMixer); -- -+ - return Dmai_EOK; - } - -@@ -431,14 +431,13 @@ - Sound_alsa_delete(hSound); - return NULL; - } -- -+ - if (setMixerVolume (attrs) <0) { -- Sound_alsa_delete (hSound); -- return NULL; -+ Dmai_dbg2("Failed to set the mixer volume on %s (%s)\n", -+ AUDIO_DEVICE, snd_strerror(status)); - } - } - -- - return hSound; - } - diff --git a/recipes-ti/dmai/ti-dmai/dmai-r423-add-omapl137-support.patch b/recipes-ti/dmai/ti-dmai/dmai-r423-add-omapl137-support.patch deleted file mode 100644 index 8f9e8b9f..00000000 --- a/recipes-ti/dmai/ti-dmai/dmai-r423-add-omapl137-support.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/Display_fbdev.c davinci_multimedia_application_interfaceb/dmai/packages/ti/sdo/dmai/linux/Display_fbdev.c ---- davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/Display_fbdev.c 2010-03-14 22:43:20.000000000 +0000 -+++ davinci_multimedia_application_interfaceb/dmai/packages/ti/sdo/dmai/linux/Display_fbdev.c 2010-03-14 23:19:41.000000000 +0000 -@@ -43,7 +43,7 @@ - - #ifdef Dmai_Device_omap3530 - #include --#elif defined Dmai_Device_omapl138 -+#elif defined (Dmai_Device_omapl137) || defined (Dmai_Device_omapl138) - #include