mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-05-07 11:59:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git.angstrom-distribution.org:meta-texasinstruments

Browse Source
This commit is contained in:
Koen Kooi
2011-12-29 15:44:19 +01:00
parent 58ea76fd64 226db03f4c
commit 97dc8eee97
52 changed files with 596 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/machine/include/omap3.inc
+1 -1
View File
@@ -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"
conf/machine/include/omap4.inc
+25
View File
@@ -0,0 +1,25 @@
SOC_FAMILY = "omap4"
require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-omap4"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
XSERVER = "xserver-xorg \
xserver-xorg-extension-dri \
xserver-xorg-extension-dri2 \
xserver-xorg-extension-glx \
xf86-input-evdev \
xf86-video-fbdev"
# Increase this everytime you change something in the kernel
MACHINE_KERNEL_PR = "r0"
KERNEL_IMAGETYPE = "uImage"
UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
EXTRA_IMAGEDEPENDS += "u-boot"
conf/machine/include/ti814x.inc
+1 -1
View File
@@ -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"
conf/machine/pandaboard.conf
+18
View File
@@ -0,0 +1,18 @@
#@TYPE: Machine
#@NAME: Pandaboard
#@DESCRIPTION: Machine configuration for the OMAP4430 Panda
require conf/machine/include/omap4.inc
UBOOT_MACHINE = "omap4_panda_config"
GUI_MACHINE_CLASS = "bigscreen"
IMAGE_FSTYPES += "tar.bz2"
SERIAL_CONSOLE = "115200 ttyO2"
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen touchscreen usbgadget usbhost vfat"
recipes-bsp/u-boot/u-boot-sakoman_git.bb
+2
View File
@@ -1,5 +1,7 @@
require u-boot.inc
COMPATIBLE_MACHINE = "omap4430-panda"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-sakoman-git/"
SRCREV = "261733408a27d14590cf3ec6b596461808050e32"
recipes-bsp/u-boot/u-boot/2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch
+26
View File
@@ -0,0 +1,26 @@
From d0556964b6bd443e8b60d5c0b3326795a02cc8a7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sun, 27 Nov 2011 14:43:58 +0100
Subject: [PATCH 1/5] beagleboard: mount rootfs RO instead of RW at boot
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
include/configs/omap3_beagle.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 91af8a0..d4f33d0 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -220,7 +220,7 @@
"dvimode=640x480MR-16@60\0" \
"defaultdisplay=dvi\0" \
"mmcdev=0\0" \
- "mmcroot=/dev/mmcblk0p2 rw\0" \
+ "mmcroot=/dev/mmcblk0p2 ro\0" \
"mmcrootfstype=ext3 rootwait\0" \
"nandroot=ubi0:rootfs ubi.mtd=4\0" \
"nandrootfstype=ubifs\0" \
--
1.7.2.5
recipes-bsp/u-boot/u-boot/2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch
+65
View File
@@ -0,0 +1,65 @@
From 28e5cc1f13d817f75638c72eae853e53510a1ab2 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sat, 8 Oct 2011 21:56:35 +0200
Subject: [PATCH 2/5] beagleboard: add support for TCT Beacon board
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
board/ti/beagle/beagle.c | 10 ++++++++++
board/ti/beagle/beagle.h | 7 +++++++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 6a457cb..9c2e6d0 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -59,11 +59,14 @@ extern volatile struct ehci_hcor *hcor;
#define TWL4030_I2C_BUS 0
#define EXPANSION_EEPROM_I2C_BUS 1
#define EXPANSION_EEPROM_I2C_ADDRESS 0x50
+#define DVI_EDID_I2C_BUS 2
+#define DVI_EDID_I2C_ADDRESS 0x50
#define TINCANTOOLS_ZIPPY 0x01000100
#define TINCANTOOLS_ZIPPY2 0x02000100
#define TINCANTOOLS_TRAINER 0x04000100
#define TINCANTOOLS_SHOWDOG 0x03000100
+#define TINCANTOOLS_BEACON 0x05000100
#define KBADC_BEAGLEFPGA 0x01000600
#define LW_BEAGLETOUCH 0x01000700
#define BRAINMUX_LCDOG 0x01000800
@@ -351,6 +354,13 @@ int misc_init_r(void)
setenv("defaultdisplay", "showdoglcd");
setenv("buddy", "showdog");
break;
+ case TINCANTOOLS_BEACON:
+ printf("Recognized Tincantools Beacon board (rev %d %s)\n",
+ expansion_config.revision,
+ expansion_config.fab_revision);
+ MUX_TINCANTOOLS_BEACON();
+ setenv("buddy", "beacon");
+ break;
case KBADC_BEAGLEFPGA:
printf("Recognized KBADC Beagle FPGA board\n");
MUX_KBADC_BEAGLEFPGA();
diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
index 18bfaa8..6a9ad73 100644
--- a/board/ti/beagle/beagle.h
+++ b/board/ti/beagle/beagle.h
@@ -456,6 +456,13 @@ const omap3_sysinfo sysinfo = {
MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTU | EN | M4)) /*GPIO_141*/\
MUX_VAL(CP(MCBSP1_CLKX), (IEN | PTU | EN | M4)) /*GPIO_162*/
+#define MUX_TINCANTOOLS_BEACON() \
+ MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M4)) /*GPIO_135*/\
+ MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M4)) /*GPIO_136*/\
+ MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M4)) /*GPIO_137*/\
+ MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | EN | M4)) /*GPIO_138*/\
+ MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M4)) /*GPIO_139*/\
+
#define MUX_KBADC_BEAGLEFPGA() \
MUX_VAL(CP(MCBSP1_CLKR), (IEN | PTU | DIS | M1)) /*MCSPI4_CLK*/\
MUX_VAL(CP(MCBSP1_DX), (IDIS | PTU | DIS | M1)) /*MCSPI4_SIMO*/\
--
1.7.2.5
recipes-bsp/u-boot/u-boot/2011.12/0003-beagleboard-add-support-for-scanning-loop-through-ex.patch
+121
View File
@@ -0,0 +1,121 @@
From fe9c653a0b0a3fa49d269b697c2058a6a55aa42b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sun, 27 Nov 2011 14:53:56 +0100
Subject: [PATCH 3/5] beagleboard: add support for scanning loop-through expansionboards like the uLCD-lite
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
board/ti/beagle/beagle.c | 30 ++++++++++++++++++++++++++----
include/configs/omap3_beagle.h | 4 ++++
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 9c2e6d0..5ea50d1 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -74,6 +74,7 @@ extern volatile struct ehci_hcor *hcor;
#define BBTOYS_WIFI 0x01000B00
#define BBTOYS_VGA 0x02000B00
#define BBTOYS_LCD 0x03000B00
+#define BBTOYS_ULCD 0x04000B00
#define BEAGLE_NO_EEPROM 0xffffffff
DECLARE_GLOBAL_DATA_PTR;
@@ -209,18 +210,18 @@ void get_board_mem_timings(u32 *mcfg, u32 *ctrla, u32 *ctrlb, u32 *rfr_ctrl,
* bus 1 for the availability of an AT24C01B serial EEPROM.
* returns the device_vendor field from the EEPROM
*/
-unsigned int get_expansion_id(void)
+unsigned int get_expansion_id(int eeprom_address)
{
i2c_set_bus_num(EXPANSION_EEPROM_I2C_BUS);
/* return BEAGLE_NO_EEPROM if eeprom doesn't respond */
- if (i2c_probe(EXPANSION_EEPROM_I2C_ADDRESS) == 1) {
+ if (i2c_probe(eeprom_address) == 1) {
i2c_set_bus_num(TWL4030_I2C_BUS);
return BEAGLE_NO_EEPROM;
}
/* read configuration data */
- i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, (u8 *)&expansion_config,
+ i2c_read(eeprom_address, 0, 1, (u8 *)&expansion_config,
sizeof(expansion_config));
i2c_set_bus_num(TWL4030_I2C_BUS);
@@ -323,7 +324,7 @@ int misc_init_r(void)
TWL4030_PM_RECEIVER_DEV_GRP_P1);
}
- switch (get_expansion_id()) {
+ switch (get_expansion_id(EXPANSION_EEPROM_I2C_ADDRESS)) {
case TINCANTOOLS_ZIPPY:
printf("Recognized Tincantools Zippy board (rev %d %s)\n",
expansion_config.revision,
@@ -402,6 +403,27 @@ int misc_init_r(void)
if (expansion_config.content == 1)
setenv(expansion_config.env_var, expansion_config.env_setting);
+ /* Scan 0x51 as well for loop-thru boards */
+ switch (get_expansion_id(EXPANSION_EEPROM_I2C_ADDRESS + 1)) {
+ case BBTOYS_ULCD:
+ printf("Recognized BeagleBoardToys uLCD-lite board\n");
+ setenv("buddy2", "bbtoys-ulcd");
+ setenv("defaultdisplay", "lcd");
+ setenv("uenvcmd", "i2c dev 1 ; i2c mw 40 00 00; i2c mw 40 04 80; i2c mw 40 0d 05; i2c mw 40 0d 15");
+ break;
+ case BEAGLE_NO_EEPROM:
+ printf("No EEPROM on expansion board\n");
+ setenv("buddy2", "none");
+ break;
+ default:
+ printf("Unrecognized expansion board: %x\n",
+ expansion_config.device_vendor);
+ setenv("buddy2", "unknown");
+ }
+
+ if (expansion_config.content == 1)
+ setenv(expansion_config.env_var, expansion_config.env_setting);
+
twl4030_power_init();
switch (get_board_revision()) {
case REVISION_XM_A:
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index d4f33d0..65ab8ee 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -214,6 +214,7 @@
"console=ttyO2,115200n8\0" \
"mpurate=auto\0" \
"buddy=none "\
+ "buddy2=none "\
"optargs=\0" \
"camera=none\0" \
"vram=12M\0" \
@@ -230,6 +231,7 @@
"${optargs} " \
"mpurate=${mpurate} " \
"buddy=${buddy} "\
+ "buddy2=${buddy2} "\
"camera=${camera} "\
"vram=${vram} " \
"omapfb.mode=dvi:${dvimode} " \
@@ -240,6 +242,7 @@
"${optargs} " \
"mpurate=${mpurate} " \
"buddy=${buddy} "\
+ "buddy2=${buddy2} "\
"camera=${camera} "\
"vram=${vram} " \
"omapfb.mode=dvi:${dvimode} " \
@@ -254,6 +257,7 @@
"${optargs} " \
"mpurate=${mpurate} " \
"buddy=${buddy} "\
+ "buddy2=${buddy2} "\
"vram=${vram} " \
"omapfb.mode=dvi:${dvimode} " \
"omapdss.def_disp=${defaultdisplay} " \
--
1.7.2.5
recipes-bsp/u-boot/u-boot/2011.12/0004-omap4-common-mount-root-RO.patch
+26
View File
@@ -0,0 +1,26 @@
From 90dfb660575f15ba736884139f35bfd4ba927468 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Thu, 8 Dec 2011 17:22:59 +0100
Subject: [PATCH 4/5] omap4-common: mount root RO
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
include/configs/omap4_common.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index a989721..54760e9 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -154,7 +154,7 @@
"usbtty=cdc_acm\0" \
"vram=16M\0" \
"mmcdev=0\0" \
- "mmcroot=/dev/mmcblk0p2 rw\0" \
+ "mmcroot=/dev/mmcblk0p2 ro\0" \
"mmcrootfstype=ext3 rootwait\0" \
"mmcargs=setenv bootargs console=${console} " \
"vram=${vram} " \
--
1.7.2.5
recipes-bsp/u-boot/u-boot/2011.12/0005-omap4-common-use-ext4-by-default.patch
+26
View File
@@ -0,0 +1,26 @@
From a1f9453f2450762249aa35bd5ae97150acc53eb2 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Thu, 8 Dec 2011 17:23:24 +0100
Subject: [PATCH 5/5] omap4-common: use ext4 by default
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
include/configs/omap4_common.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 54760e9..7637688 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -155,7 +155,7 @@
"vram=16M\0" \
"mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 ro\0" \
- "mmcrootfstype=ext3 rootwait\0" \
+ "mmcrootfstype=ext4 rootwait\0" \
"mmcargs=setenv bootargs console=${console} " \
"vram=${vram} " \
"root=${mmcroot} " \
--
1.7.2.5
recipes-bsp/u-boot/u-boot_2011.10rc.bb
+2
View File
@@ -2,7 +2,9 @@ require u-boot.inc
# No patches for other machines yet
COMPATIBLE_MACHINE = "(ti33x)"
DEFAULT_PREFERENCE_ti33x = "99"
PV = "2011.09+git"
PR = "r25"
recipes-bsp/u-boot/u-boot_2011.12.bb
+27
View File
@@ -0,0 +1,27 @@
require u-boot.inc
# SPL build
UBOOT_BINARY = "u-boot.img"
UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img"
UBOOT_SYMLINK = "u-boot-${MACHINE}.img"
PV = "2011.12"
PR = "r0"
# No patches for other machines yet
COMPATIBLE_MACHINE = "(beagleboard|pandaboard|hawkboard|am3517-evm|am37x-evm|omap3evm)"
SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git \
file://2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch \
file://2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch \
file://2011.12/0003-beagleboard-add-support-for-scanning-loop-through-ex.patch \
file://2011.12/0004-omap4-common-mount-root-RO.patch \
file://2011.12/0005-omap4-common-use-ext4-by-default.patch \
"
# v2011.12 tag
SRCREV = "cba9a894fdb1cb49b60fcd1d1d6919cbd7995dd5"
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
S = "${WORKDIR}/git"
recipes-bsp/u-boot/u-boot_git.bb
+1 -24
View File
@@ -1,35 +1,12 @@
require u-boot.inc
PR ="r67"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_ti814x = "-1"
DEFAULT_PREFERENCE_ti816x = "-1"
FILESPATHPKG =. "u-boot-git:"
SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \
file://0001-OMAP3-Beagle-Pin-Mux-initialization-glitch-fix.patch \
file://0002-OMAP-Remove-omapfb.debug-y-from-Beagle-and-Overo-env.patch \
file://0003-omap3_beagle-enable-the-use-of-a-plain-text-file-nam.patch \
file://0004-OMAP3-BeagleBoard-Enable-pullups-on-i2c2.patch \
file://0005-ARMV7-OMAP3-BeagleBoard-add-xM-rev-B-to-ID-table.patch \
file://0006-OMAP3-BeagleBoard-add-more-expansionboard-IDs.patch \
file://0007-OMAP3-Add-DSS-driver-for-OMAP3.patch \
file://0008-BeagleBoard-Added-userbutton-command.patch \
file://0009-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch \
file://0010-Enable-DSS-driver-for-Beagle.patch \
file://0011-Add-led-command.patch \
file://0012-BeagleBoard-Added-LED-driver.patch \
file://0013-OMAP3-BeagleBoard-updated-default-configuration.patch \
file://0014-Corrected-LED-name-match-finding-avoiding-extraneous.patch \
file://0015-omap3_beagle-Switch-default-console-from-ttyS2-to-tt.patch \
file://0016-BeagleBoard-Load-kernel-via-MMC-ext2-not-fat.patch \
file://fw_env.config \
"
SRCREV_pn-${PN}_beagleboard = "c7977858dcf1f656cbe91ea0dc3cb9139c6a8cc8"
PV_pn-${PN}_beagleboard = "2011.02+${PR}+gitr${SRCREV}"
LIC_FILES_CHKSUM_pn-${PN}_beagleboard = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
# ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits)
SRC_URI_omap3evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git \
file://0001-omap3evm-Change-default-console-serial-port-from.patch \
recipes-kernel/linux/linux-3.0/beagleboard/defconfig
+2 -2
View File
@@ -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
recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig
+1 -1
View File
@@ -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
recipes-kernel/linux/linux-ti33x-psp_3.1.bb
+1 -1
View File
@@ -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)"
recipes-kernel/linux/linux-ti81xx-psp-2.6.37/0001-ti814x-added-code-for-disabling-the-least-significan.patch
+45
View File
@@ -0,0 +1,45 @@
From 1d43359e415cada4607d0d21b7de07c740616386 Mon Sep 17 00:00:00 2001
From: Amarinder Bindra <a-bindra@ti.com>
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 <a-bindra@ti.com>
---
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
recipes-kernel/linux/linux-ti81xx-psp_2.6.37.bb
+4 -5
View File
@@ -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"
recipes-kernel/linux/linux_3.0.bb
+4 -5
View File
@@ -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 \
\
recipes-kernel/linux/linux_3.1.bb
+1 -1
View File
@@ -1,6 +1,6 @@
require linux.inc
COMPATIBLE_MACHINE = "omap3"
COMPATIBLE_MACHINE = "beagleboard"
DESCRIPTION = "Linux kernel for TI processors"
KERNEL_IMAGETYPE = "uImage"
recipes-ti/bios/ti-dspbios.inc
+2 -3
View File
@@ -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"
recipes-ti/bios/ti-dspbios_5.41.07.24.bb
-8
View File
@@ -1,8 +0,0 @@
require ti-dspbios.inc
PV = "5_41_07_24"
SRC_URI[biosbin.md5sum] = "18301d0e1d351bcece9ce97255b8ff1b"
SRC_URI[biosbin.sha256sum] = "1531dca674154fbe179ad5017555e963bcf3d74a47a0fbf10e8a7009639d6c34"
recipes-ti/bios/ti-dspbios_5.41.11.38.bb
+7
View File
@@ -0,0 +1,7 @@
require ti-dspbios.inc
PV = "5_41_11_38"
SRC_URI[biosbin.md5sum] = "7fab13740c25f5b34b331bcdc759536e"
SRC_URI[biosbin.sha256sum] = "96b8e090f79420a4c11d9c0c10d182d1d3b4afb48f11ec375c97b4c91970d0a0"
recipes-ti/bios/ti-sysbios_6.31.04.27.bb
-8
View File
@@ -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"
recipes-ti/bios/ti-sysbios_6.33.00.19.bb
+9
View File
@@ -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}"
recipes-ti/codec-engine/ti-codec-engine.inc
-3
View File
@@ -3,8 +3,6 @@ HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/c
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://codec_engine_2_26_02_11_manifest.html;md5=912535f1b02ecf329a3979bf313f91e0"
# TODO :: Add Codec Engine Library Rebuild
# TODO :: Add Examples APP_LOCAL build as well?
# TODO :: Check DEPENDS - are the DSP side packages required for ARM-only products?
@@ -15,7 +13,6 @@ require recipes-ti/includes/ti-staging.inc
PROVIDES += "ti-codec-engine-examples"
PR = "${MACHINE_KERNEL_PR}"
PR_append = "a"
S = "${WORKDIR}/codec_engine_${PV}"
recipes-ti/codec-engine/ti-codec-engine/bypass-GCArmv5T-used-is-sealed.patch
+22
View File
@@ -0,0 +1,22 @@
do_compile produces:
js: "/prj/oe/bb/build/tmp-eglibc/work/beagleboard-angstrom-linux-gnueabi/ti-codec-engine-2_26_02_11-r114a/codec_engine_2_26_02_11/packages/ti/sdo/ce/osal/linux/package.xs", line 50: XDC runtime error: gnu.targets.arm.GCArmv5T: '$used' is sealed
Fix per suggestion in http://e2e.ti.com/support/dsp/omap_applications_processors/f/447/t/110920.aspx
--- ./packages/ti/sdo/ce/osal/linux/package.xs.orig 2010-12-01 23:24:48.000000000 -0600
+++ ./packages/ti/sdo/ce/osal/linux/package.xs 2011-12-27 14:59:39.382423341 -0600
@@ -47,10 +47,10 @@
}
/* Conditionally load CMEM here */
- var targetMod = xdc.useModule(prog.build.target.$name);
- if ((":"+targetMod.getISAChain().join(":")+":").match(/:v5T:/i)) {
+ //var targetMod = xdc.useModule(prog.build.target.$name);
+ //if ((":"+targetMod.getISAChain().join(":")+":").match(/:v5T:/i)) {
xdc.useModule('ti.sdo.linuxutils.cmem.CMEM');
- }
+ //}
var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global');
recipes-ti/codec-engine/ti-codec-engine_2.26.02.11.bb
+4
View File
@@ -1,6 +1,10 @@
require ti-codec-engine.inc
LIC_FILES_CHKSUM = "file://codec_engine_${PV}_manifest.html;md5=912535f1b02ecf329a3979bf313f91e0"
PV = "2_26_02_11"
PR_append = "b"
SRC_URI += "file://bypass-GCArmv5T-used-is-sealed.patch"
SRC_URI[cetarball.md5sum] = "4f755f77119e4da19ab5cc7ae7ccfdb4"
SRC_URI[cetarball.sha256sum] = "17fa053719265e0901fe3c3f90c9204957c6d0f5351d6b3ba4900df58cb7300f"
recipes-ti/devtools/ti-cgt6x_6.1.17.bb
-11
View File
@@ -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"
recipes-ti/devtools/ti-cgt6x_6.1.20.bb
+11
View File
@@ -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"
recipes-ti/devtools/ti-cgt6x_7.2.7.bb
+11
View File
@@ -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"
recipes-ti/devtools/ti-xdctools.inc
+1 -5
View File
@@ -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
recipes-ti/devtools/ti-xdctools_3.20.06.81.bb
-14
View File
@@ -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"
recipes-ti/devtools/ti-xdctools_3.23.00.32.bb
+11
View File
@@ -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}"
recipes-ti/dmai/ti-dmai.inc
+2 -2
View File
@@ -47,12 +47,12 @@ DMAIPLATFORM_dm355 = "dm355_al"
DMAIPLATFORM_dm365 = "dm365_al"
DMAIPLATFORM_omapl137 = "ol137_al"
DMAIPLATFORM_omapl138 = "ol138_al"
DMAIPLATFORM ?= "<UNDEFINED_DMAIPLATFORM>"
DMAIPLATFORM ?= "UNDEFINED_DMAIPLATFORM"
# Need to set this for other platforms as well
#GPPOS_dm355 = "LINUX_GCC"
#GPPOS_dm365 = "LINUX_GCC"
#GPPOS ?= "<UNDEFINEDGPPOS>"
#GPPOS ?= "UNDEFINEDGPPOS"
# Need to re-define this for OMAP-L137/L138
DSPSUFFIX_omapl137 = "x64P"
recipes-ti/dmai/ti-dmai/0001-Correct-DMAI-s-Resize-module-for-DM365.patch
-34
View File
@@ -1,34 +0,0 @@
From 9d9326c26ea990fa49842e0c57d520a5acb4d887 Mon Sep 17 00:00:00 2001
From: Don Darling <ddarling@ti.com>
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
recipes-ti/dmai/ti-dmai/dmai-built-with-angstrom.patch
-48
View File
@@ -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
recipes-ti/dmai/ti-dmai/dmai-do-not-panic-on-mixer-failure.patch
-31
View File
@@ -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;
}
recipes-ti/dmai/ti-dmai/dmai-r423-add-omapl137-support.patch
-12
View File
@@ -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 <linux/omapfb.h>
-#elif defined Dmai_Device_omapl138
+#elif defined (Dmai_Device_omapl137) || defined (Dmai_Device_omapl138)
#include <video/davincifb.h>
#else
#include <video/davincifb_ioctl.h>
recipes-ti/dmai/ti-dmai/dmai-support-32bit-align.patch
-17
View File
@@ -1,17 +0,0 @@
Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/omap3530/Resize.c
===================================================================
--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/omap3530/Resize.c 2009-02-11 19:20:45.000000000 -0600
+++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/omap3530/Resize.c 2009-02-11 19:21:09.000000000 -0600
@@ -557,9 +557,9 @@
srcOffset = srcDim.y * srcDim.lineLength + srcDim.x * 2;
dstOffset = dstDim.y * dstDim.lineLength + dstDim.x * 2;
- /* Input and output buffers must be 4096 bytes aligned */
- assert(((Buffer_getPhysicalPtr(hDstBuf) + srcOffset) & 0xFFF) == 0);
- assert(((Buffer_getPhysicalPtr(hSrcBuf) + dstOffset) & 0xFFF) == 0);
+ /* Pointers must be a multiple of 32 bytes */
+ assert((Buffer_getPhysicalPtr(hDstBuf) & 0x1F) == 0);
+ assert((Buffer_getPhysicalPtr(hSrcBuf) & 0x1F) == 0);
/* Queue the resizer buffers */
for (i=0; i < 2; i++) {
recipes-ti/dmai/ti-dmai/dmai-update-cpu-name.patch
-16
View File
@@ -1,16 +0,0 @@
Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Cpu.c
===================================================================
--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Cpu.c 2009-02-12 09:34:22.000000000 -0600
+++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Cpu.c 2009-02-12 09:34:51.000000000 -0600
@@ -103,7 +103,10 @@
else if (strcmp(valBuf, "DM357 EVM") == 0) {
*device = Cpu_Device_DM6446;
}
- else if (strcmp(valBuf, "OMAP3EVM Board") == 0) {
+ else if ((strcmp(valBuf, "OMAP3EVM Board") == 0) ||
+ (strcmp(valBuf, "OMAP3 EVM") == 0) ||
+ (strcmp(valBuf, "OMAP3 Beagle Board") == 0)
+ ){
*device = Cpu_Device_OMAP3530;
}
else {
recipes-ti/dmai/ti-dmai/dmai-update-fb-display.patch
-77
View File
@@ -1,77 +0,0 @@
Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Display_fbdev.c
===================================================================
--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Display_fbdev.c 2009-02-11 19:59:57.000000000 -0600
+++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Display_fbdev.c 2009-02-11 20:02:46.000000000 -0600
@@ -41,10 +41,7 @@
#include <sys/ioctl.h>
#include <linux/fb.h>
-#ifdef Dmai_Device_omap3530
-/* OMAP specific kernel headers */
-#include <video/omapfbdev.h>
-#else
+#ifndef Dmai_Device_omap3530
/* Davinci specific kernel headers */
#include <video/davincifb_ioctl.h>
#endif
@@ -184,11 +181,13 @@
}
#endif
+#if 0
/* Set up the sysfs variables before opening the display device */
if (_Display_sysfsSetup(attrs, channel) < 0) {
cleanup(hDisplay);
return NULL;
}
+#endif
/* Open video display device */
hDisplay->fd = open(attrs->displayDevice, O_RDWR);
@@ -423,6 +422,7 @@
******************************************************************************/
Int Display_fbdev_get(Display_Handle hDisplay, Buffer_Handle *hBufPtr)
{
+#if defined (FBIO_WAITFORVSYNC)
BufTab_Handle hBufTab = hDisplay->hBufTab;
int dummy;
@@ -436,7 +436,8 @@
}
*hBufPtr = BufTab_getBuf(hBufTab, hDisplay->workingIdx);
-
+
+#endif
return Dmai_EOK;
}
Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Display.c
===================================================================
--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Display.c 2009-02-11 20:00:10.000000000 -0600
+++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Display.c 2009-02-11 20:02:07.000000000 -0600
@@ -80,18 +80,18 @@
const Display_Attrs Display_Attrs_O3530_VID_DEFAULT = {
3,
- Display_Std_V4L2,
- VideoStd_VGA,
- Display_Output_LCD,
- "/dev/video1",
+ Display_Std_FBDEV,
+ VideoStd_D1_NTSC,
+ Display_Output_DVI,
+ "/dev/fb2",
0
};
const Display_Attrs Display_Attrs_O3530_OSD_DEFAULT = {
1,
Display_Std_FBDEV,
- VideoStd_VGA,
- Display_Output_LCD,
+ VideoStd_D1_NTSC,
+ Display_Output_DVI,
"/dev/fb0",
0
};
recipes-ti/dmai/ti-dmai/dmai-update-v4l2-display.patch
-127
View File
@@ -1,127 +0,0 @@
Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Display_v4l2.c
===================================================================
--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Display_v4l2.c 2009-02-11 19:22:51.000000000 -0600
+++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Display_v4l2.c 2009-02-11 19:27:02.000000000 -0600
@@ -120,7 +120,9 @@
struct v4l2_format fmt;
enum v4l2_buf_type type;
Display_Handle hDisplay;
- Int channel;
+#if defined(Dmai_Device_omap3530) && defined(V4L2_CID_ROTATION)
+ struct v4l2_control control;
+#endif
assert(attrs);
@@ -134,44 +136,6 @@
hDisplay->userAlloc = TRUE;
-#ifdef Dmai_Device_omap3530
- /* channel = 0 - digital video path
- * channel = 1 - analog video path
- */
- switch (attrs->videoOutput) {
- case Display_Output_SVIDEO:
- case Display_Output_COMPOSITE:
- channel = 1;
- break;
- case Display_Output_DVI:
- case Display_Output_LCD:
- case Display_Output_SYSTEM:
- channel = 0;
- break;
- default:
- /* do nothing */
- break;
- }
-#else
- if (strcmp(attrs->displayDevice, "/dev/video2") == 0) {
- channel = 0;
- }
- else if (strcmp(attrs->displayDevice, "/dev/video3") == 0) {
- channel = 1;
- }
- else {
- Dmai_err1("%s not a display device\n", attrs->displayDevice);
- cleanup(hDisplay);
- return NULL;
- }
-#endif
-
- /* Set up the sysfs variables before opening the display device */
- if (_Display_sysfsSetup(attrs, channel) < 0) {
- cleanup(hDisplay);
- return NULL;
- }
-
/* Open video capture device */
hDisplay->fd = open(attrs->displayDevice, O_RDWR, 0);
@@ -182,9 +146,8 @@
return NULL;
}
-#ifdef Dmai_Device_omap3530
-#define VIDIOC_S_OMAP2_ROTATION _IOW ('V', 3, int)
-
+
+#if defined(Dmai_Device_omap3530) && defined(V4L2_CID_ROTATION)
if (attrs->rotation != 0 && attrs->rotation != 90 &&
attrs->rotation != 180 && attrs->rotation != 270) {
@@ -193,49 +156,16 @@
return NULL;
}
- if (ioctl(hDisplay->fd, VIDIOC_S_OMAP2_ROTATION, &attrs->rotation) < 0) {
- Dmai_err2("Failed VIDIOC_S_OMAP2_ROTATION on %s (%s)\n",
+ control.id = V4L2_CID_ROTATION;
+ control.value = attrs->rotation;
+
+ if (ioctl(hDisplay->fd, VIDIOC_S_CTRL, &control) < 0) {
+ Dmai_err2("Failed VIDIOC_S_CTRL on %s (%s)\n",
attrs->displayDevice, strerror(errno));
cleanup(hDisplay);
return NULL;
}
- switch (attrs->videoStd) {
- case VideoStd_D1_NTSC:
- fmt.fmt.pix.width = VideoStd_D1_WIDTH;
- fmt.fmt.pix.height = VideoStd_D1_NTSC_HEIGHT;
- break;
- case VideoStd_D1_PAL:
- fmt.fmt.pix.width = VideoStd_D1_WIDTH;
- fmt.fmt.pix.height = VideoStd_D1_PAL_HEIGHT;
- break;
- case VideoStd_VGA:
- fmt.fmt.pix.width = VideoStd_VGA_WIDTH;
- fmt.fmt.pix.height = VideoStd_VGA_HEIGHT;
- break;
- case VideoStd_480P:
- fmt.fmt.pix.width = VideoStd_480P_WIDTH;
- fmt.fmt.pix.height = VideoStd_480P_HEIGHT;
- break;
- case VideoStd_720P_60:
- fmt.fmt.pix.width = VideoStd_480P_WIDTH;
- fmt.fmt.pix.height = VideoStd_480P_HEIGHT;
- break;
- default:
- Dmai_err1("Unknown video standard %d\n", attrs->videoStd);
- cleanup(hDisplay);
- return NULL;
- }
-
- fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_UYVY;
- fmt.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
-
- if (ioctl(hDisplay->fd, VIDIOC_S_FMT, &fmt) == -1) {
- Dmai_err2("Failed VIDIOC_S_FMT on %s (%s)\n", attrs->displayDevice,
- strerror(errno));
- cleanup(hDisplay);
- return NULL;
- }
#endif /* Dmai_Device_omap3530 */
/* Determine the video image dimensions */
recipes-ti/dmai/ti-dmai/omap3530-r642-remove-include-videodev.diff
+48 -32
View File
@@ -1,31 +1,20 @@
Index: dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h
===================================================================
--- dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h (revisione 642)
+++ dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h (copia locale)
@@ -34,7 +34,6 @@
#ifndef ti_sdo_dai_linux_priv__VideoBuf_h_
#define ti_sdo_dai_linux_priv__VideoBuf_h_
-#include <linux/videodev.h>
#include <linux/videodev2.h>
#include <ti/sdo/dmai/BufferGfx.h>
Index: dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c
===================================================================
--- dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c (revisione 642)
+++ dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c (copia locale)
@@ -38,7 +38,6 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <errno.h>
-#include <linux/videodev.h>
#include <linux/videodev2.h>
#include <xdc/std.h>
Index: dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c
===================================================================
--- dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c (revisione 642)
+++ dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c (copia locale)
From 06c4cfeec98f4f1e31543878ceb74c5fff1907e4 Mon Sep 17 00:00:00 2001
From: Enrico Butera <ebutera@users.berlios.de>
Date: Thu, 22 Dec 2011 11:01:58 +0100
Subject: [PATCH 1/2] adjust videdev headers for recent kernels
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../packages/ti/sdo/dmai/linux/omap3530/Capture.c | 1 -
.../ti/sdo/dmai/linux/omap3530/Display_v4l2.c | 1 -
.../ti/sdo/dmai/linux/omap3530/_VideoBuf.c | 1 -
.../ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h | 1 -
4 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c
index a924169..c2b45d2 100644
--- a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c
+++ b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c
@@ -40,7 +40,6 @@
#include <sys/mman.h>
#include <sys/ioctl.h>
@@ -34,10 +23,10 @@ Index: dmai/packages/ti/sdo/dmai/linux/omap3530/Capture.c
#include <linux/videodev2.h>
#include <xdc/std.h>
Index: dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c
===================================================================
--- dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c (revisione 642)
+++ dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c (copia locale)
diff --git a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c
index 0d01b39..0c35efe 100644
--- a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c
+++ b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c
@@ -38,7 +38,6 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
@@ -46,3 +35,30 @@ Index: dmai/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c
#include <linux/videodev2.h>
#include <xdc/std.h>
diff --git a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c
index 5615e2f..5cb712d 100644
--- a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c
+++ b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/_VideoBuf.c
@@ -38,7 +38,6 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <errno.h>
-#include <linux/videodev.h>
#include <linux/videodev2.h>
#include <xdc/std.h>
diff --git a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h
index b2128a3..dbaa4eb 100644
--- a/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h
+++ b/davinci_multimedia_application_interface/dmai/packages/ti/sdo/dmai/linux/omap3530/priv/_VideoBuf.h
@@ -34,7 +34,6 @@
#ifndef ti_sdo_dai_linux_priv__VideoBuf_h_
#define ti_sdo_dai_linux_priv__VideoBuf_h_
-#include <linux/videodev.h>
#include <linux/videodev2.h>
#include <ti/sdo/dmai/BufferGfx.h>
--
1.7.2.5
recipes-ti/dmai/ti-dmai/r642-fix-config-bld.diff
+22 -10
View File
@@ -1,8 +1,18 @@
Index: dmai/packages/config.bld
===================================================================
--- dmai/packages/config.bld (revisione 642)
+++ dmai/packages/config.bld (copia locale)
@@ -44,29 +44,9 @@
From 86e89bb160cfe67c173f1260b93066b12dd73580 Mon Sep 17 00:00:00 2001
From: Enrico Butera <ebutera@users.berlios.de>
Date: Thu, 22 Dec 2011 11:03:58 +0100
Subject: [PATCH 2/2] fix toolchain names in config.bld
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
.../dmai/packages/config.bld | 24 +------------------
1 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/davinci_multimedia_application_interface/dmai/packages/config.bld b/davinci_multimedia_application_interface/dmai/packages/config.bld
index 8c2e96e..566f907 100644
--- a/davinci_multimedia_application_interface/dmai/packages/config.bld
+++ b/davinci_multimedia_application_interface/dmai/packages/config.bld
@@ -44,28 +44,8 @@ var C6X = xdc.useModule('ti.targets.C64P');
C6X.rootDir = codegen;
C6X.platform = xdcplat;
@@ -10,9 +20,7 @@ Index: dmai/packages/config.bld
- Then the TOOLDIR and LONGNAME are derived based on a regex of CROSS_COMPILE
-*/
-var crosscompile = "" + java.lang.System.getenv("CROSS_COMPILE");
+var tooldir = "" + java.lang.System.getenv("CSTOOL_DIR");
+var longName = "" + java.lang.System.getenv("MVTOOL_PREFIX") + "gcc";
-
-var tooldir = "";
-var longName = "";
-
@@ -30,7 +38,11 @@ Index: dmai/packages/config.bld
-} else {
- longName = crosscompile + "gcc";
-}
-
+var tooldir = "" + java.lang.System.getenv("CSTOOL_DIR");
+var longName = "" + java.lang.System.getenv("MVTOOL_PREFIX") + "gcc";
/* location of the GCC Arm9 tools */
var GCArmv5T = xdc.useModule('gnu.targets.arm.GCArmv5T');
GCArmv5T.LONGNAME = longName;
--
1.7.2.5
recipes-ti/dmai/ti-dmai_svn.bb
+5 -7
View File
@@ -3,15 +3,13 @@ require ti-dmai.inc
# Hack to be able to use recent kernel headers from userspace
TARGET_CC_ARCH += " -D__EXPORTED_HEADERS__"
DEFAULT_PREFERENCE = "-1"
PV = "2_10_00_01+svnr${SRCPV}"
LIC_FILES_CHKSUM = "file://dmai_${PV}_License.html;md5=3302f728a5a42f97cabc26a54d7fa607"
# This package has high dependence on kernel, use kernel PR as base and append a local version
PR = "${MACHINE_KERNEL_PR}"
PR_append = "n"
PR_append = "o"
DMAIBRANCH_dm6446 = "trunk"
DMAIBRANCH_dm6467 = "branches/GITPSP_INT_101009"
@@ -20,7 +18,7 @@ DMAIBRANCH_dm355 = "branches/GITPSP_INT_101009"
DMAIBRANCH_dm365 = "trunk"
DMAIBRANCH_omapl137 = "trunk"
DMAIBRANCH_omapl138 = "trunk"
DMAIBRANCH ?= "<UNDEFINED_DMAIBRANCH>"
DMAIBRANCH ?= "UNDEFINED_DMAIBRANCH"
SRCREV_dm6446 = "482"
SRCREV_dm6467 = "441"
@@ -29,9 +27,9 @@ SRCREV_dm355 = "424"
SRCREV_dm365 = "570"
SRCREV_omapl137 = "482"
SRCREV_omapl138 = "570"
SRCREV ?= "<UNDEFINED_SRCREV>"
SRCREV ?= "UNDEFINED_SRCREV"
SRC_URI_append = " file://omap3530-r642-remove-include-videodev.diff \
file://r642-fix-config-bld.diff \
SRC_URI_append = " file://omap3530-r642-remove-include-videodev.diff;striplevel=2 \
file://r642-fix-config-bld.diff;striplevel=2 \
"
recipes-ti/dsplink/ti-dsplink.inc
+1 -1
View File
@@ -21,7 +21,7 @@ PROVIDES += "ti-dsplink-examples"
# This package builds a kernel module, use kernel PR as base and append a local version
PR = "${MACHINE_KERNEL_PR}"
PR_append = "i"
PR_append = "j"
S = "${WORKDIR}/dsplink_linux_${PV}"
recipes-ti/dsplink/ti-dsplink/0001-remove-check-for-make-version-3.85-works-fine.patch
+28
View File
@@ -0,0 +1,28 @@
From a96aa25518f306138c71b3fc074381f102092a13 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Fri, 23 Dec 2011 10:58:47 +0100
Subject: [PATCH] remove check for make version, 3.85 works fine
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
dsplink/make/start.mk | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/dsplink/make/start.mk b/dsplink/make/start.mk
index 0589f3c..a8f5740 100644
--- a/dsplink/make/start.mk
+++ b/dsplink/make/start.mk
@@ -39,10 +39,6 @@
# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# ============================================================================
-
-# Check for MAKE version
-$(if $(filter $(MAKE_VERSION), 3.81 3.81beta1 3.90 3.92),,\
-$(error This makefile requires one of GNU make version 3.81 3.81beta1 3.90 3.92))
# ============================================================================
# Export the directory separator
# ============================================================================
--
1.7.7.4
recipes-ti/dsplink/ti-dsplink_1.65.00.03.bb
+3 -1
View File
@@ -7,7 +7,9 @@ PV_major = "1_65"
PV_DL_PATH = "DSPLink/${PV_major}/${PV}/${PV_dot}"
SRC_URI += "file://dsplink-BKL-fix.patch"
SRC_URI += "file://dsplink-BKL-fix.patch \
file://0001-remove-check-for-make-version-3.85-works-fine.patch \
"
SRC_URI[dsplinktarball.md5sum] = "1bda596b631bd2f517edc70f6be4f2ca"
SRC_URI[dsplinktarball.sha256sum] = "4b1bda89bd8465b887f5bcdf7b95018bc1d1f8968c0c44f8cbad2a9e1c52bcb7"
recipes-ti/ipc/ti-ipc_1.23.02.27.bb
-9
View File
@@ -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"
recipes-ti/ipc/ti-ipc_1.24.00.16.bb
+8
View File
@@ -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"
recipes-ti/linuxutils/ti-linuxutils.inc
+2 -2
View File
@@ -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