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/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc new file mode 100644 index 00000000..51e4a84b --- /dev/null +++ b/conf/machine/include/omap4.inc @@ -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" + 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/conf/machine/pandaboard.conf b/conf/machine/pandaboard.conf new file mode 100644 index 00000000..2c37b4fa --- /dev/null +++ b/conf/machine/pandaboard.conf @@ -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" + + diff --git a/recipes-bsp/u-boot/u-boot-sakoman_git.bb b/recipes-bsp/u-boot/u-boot-sakoman_git.bb index 5b9ff111..fab269a3 100644 --- a/recipes-bsp/u-boot/u-boot-sakoman_git.bb +++ b/recipes-bsp/u-boot/u-boot-sakoman_git.bb @@ -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" diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch b/recipes-bsp/u-boot/u-boot/2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch new file mode 100644 index 00000000..07ab75b1 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch @@ -0,0 +1,26 @@ +From d0556964b6bd443e8b60d5c0b3326795a02cc8a7 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +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 +--- + 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 + diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch b/recipes-bsp/u-boot/u-boot/2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch new file mode 100644 index 00000000..5af34a15 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch @@ -0,0 +1,65 @@ +From 28e5cc1f13d817f75638c72eae853e53510a1ab2 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +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 +--- + 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 + diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0003-beagleboard-add-support-for-scanning-loop-through-ex.patch b/recipes-bsp/u-boot/u-boot/2011.12/0003-beagleboard-add-support-for-scanning-loop-through-ex.patch new file mode 100644 index 00000000..31c40639 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.12/0003-beagleboard-add-support-for-scanning-loop-through-ex.patch @@ -0,0 +1,121 @@ +From fe9c653a0b0a3fa49d269b697c2058a6a55aa42b Mon Sep 17 00:00:00 2001 +From: Koen Kooi +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 +--- + 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 + diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0004-omap4-common-mount-root-RO.patch b/recipes-bsp/u-boot/u-boot/2011.12/0004-omap4-common-mount-root-RO.patch new file mode 100644 index 00000000..0d3655d3 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.12/0004-omap4-common-mount-root-RO.patch @@ -0,0 +1,26 @@ +From 90dfb660575f15ba736884139f35bfd4ba927468 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Thu, 8 Dec 2011 17:22:59 +0100 +Subject: [PATCH 4/5] omap4-common: mount root RO + +Signed-off-by: Koen Kooi +--- + 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 + diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0005-omap4-common-use-ext4-by-default.patch b/recipes-bsp/u-boot/u-boot/2011.12/0005-omap4-common-use-ext4-by-default.patch new file mode 100644 index 00000000..e28eae57 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.12/0005-omap4-common-use-ext4-by-default.patch @@ -0,0 +1,26 @@ +From a1f9453f2450762249aa35bd5ae97150acc53eb2 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Thu, 8 Dec 2011 17:23:24 +0100 +Subject: [PATCH 5/5] omap4-common: use ext4 by default + +Signed-off-by: Koen Kooi +--- + 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 + diff --git a/recipes-bsp/u-boot/u-boot_2011.10rc.bb b/recipes-bsp/u-boot/u-boot_2011.10rc.bb index ebcb3530..74597f62 100644 --- a/recipes-bsp/u-boot/u-boot_2011.10rc.bb +++ b/recipes-bsp/u-boot/u-boot_2011.10rc.bb @@ -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" diff --git a/recipes-bsp/u-boot/u-boot_2011.12.bb b/recipes-bsp/u-boot/u-boot_2011.12.bb new file mode 100644 index 00000000..5a19066f --- /dev/null +++ b/recipes-bsp/u-boot/u-boot_2011.12.bb @@ -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" diff --git a/recipes-bsp/u-boot/u-boot_git.bb b/recipes-bsp/u-boot/u-boot_git.bb index 022d7fca..5abb6f5e 100644 --- a/recipes-bsp/u-boot/u-boot_git.bb +++ b/recipes-bsp/u-boot/u-boot_git.bb @@ -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 \ 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-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)" 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" 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 \ \ 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" 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" + 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}" diff --git a/recipes-ti/codec-engine/ti-codec-engine.inc b/recipes-ti/codec-engine/ti-codec-engine.inc index fde181e7..4fb5575a 100644 --- a/recipes-ti/codec-engine/ti-codec-engine.inc +++ b/recipes-ti/codec-engine/ti-codec-engine.inc @@ -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}" diff --git a/recipes-ti/codec-engine/ti-codec-engine/bypass-GCArmv5T-used-is-sealed.patch b/recipes-ti/codec-engine/ti-codec-engine/bypass-GCArmv5T-used-is-sealed.patch new file mode 100644 index 00000000..b93161f4 --- /dev/null +++ b/recipes-ti/codec-engine/ti-codec-engine/bypass-GCArmv5T-used-is-sealed.patch @@ -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'); + diff --git a/recipes-ti/codec-engine/ti-codec-engine_2.26.02.11.bb b/recipes-ti/codec-engine/ti-codec-engine_2.26.02.11.bb index ad064294..bcb89b77 100644 --- a/recipes-ti/codec-engine/ti-codec-engine_2.26.02.11.bb +++ b/recipes-ti/codec-engine/ti-codec-engine_2.26.02.11.bb @@ -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" 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" + 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" + 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}" 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