diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-05-08 16:29:09 +0200 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-05-10 15:35:51 -0400 |
commit | aefc6c8c3c2d49ef0338004ed90da987f7cf6101 (patch) | |
tree | 674cb3f45a3f907a7169912a389d487bfd2c1a91 /recipes-kernel/linux/linux-ti33x-psp_3.2.bb | |
parent | 12bf8f2f92dfdb7050e4cb92a9968cc94c733f7e (diff) | |
download | meta-ti-aefc6c8c3c2d49ef0338004ed90da987f7cf6101.tar.gz |
linux-ti33x-psp 3.2: rebase patches onto latest git
The psp tree added a patch to limit the beaglebone to 500MHz when powered by USB, which triggered conflicts in the patches. The 3.2.16 series has been rediffed as well, no functional changes.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp_3.2.bb')
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp_3.2.bb | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb index 593d6e7b..63c0532d 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb | |||
@@ -11,8 +11,8 @@ S = "${WORKDIR}/git" | |||
11 | MULTI_CONFIG_BASE_SUFFIX = "" | 11 | MULTI_CONFIG_BASE_SUFFIX = "" |
12 | 12 | ||
13 | BRANCH = "v3.2-staging" | 13 | BRANCH = "v3.2-staging" |
14 | SRCREV = "baaa0c0425528486efcc70b7696dd6359f10b5bd" | 14 | SRCREV = "720e07b4c1f687b61b147b31c698cb6816d72f01" |
15 | MACHINE_KERNEL_PR_append = "g+gitr${SRCREV}" | 15 | MACHINE_KERNEL_PR_append = "h+gitr${SRCREV}" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(ti33x)" | 17 | COMPATIBLE_MACHINE = "(ti33x)" |
18 | 18 | ||
@@ -878,52 +878,52 @@ PATCHES_OVER_PSP = " \ | |||
878 | file://3.2.16/0020-sparc64-Fix-bootup-crash-on-sun4v.patch \ | 878 | file://3.2.16/0020-sparc64-Fix-bootup-crash-on-sun4v.patch \ |
879 | file://3.2.16/0021-cciss-Initialize-scsi-host-max_sectors-for-tape-driv.patch \ | 879 | file://3.2.16/0021-cciss-Initialize-scsi-host-max_sectors-for-tape-driv.patch \ |
880 | file://3.2.16/0022-cciss-Fix-scsi-tape-io-with-more-than-255-scatter-ga.patch \ | 880 | file://3.2.16/0022-cciss-Fix-scsi-tape-io-with-more-than-255-scatter-ga.patch \ |
881 | file://3.2.16/0024-video-uvesafb-Fix-oops-that-uvesafb-try-to-execute-N.patch \ | 881 | file://3.2.16/0023-video-uvesafb-Fix-oops-that-uvesafb-try-to-execute-N.patch \ |
882 | file://3.2.16/0025-nohz-Fix-stale-jiffies-update-in-tick_nohz_restart.patch \ | 882 | file://3.2.16/0024-nohz-Fix-stale-jiffies-update-in-tick_nohz_restart.patch \ |
883 | file://3.2.16/0026-pch_uart-Fix-MSI-setting-issue.patch \ | 883 | file://3.2.16/0025-pch_uart-Fix-MSI-setting-issue.patch \ |
884 | file://3.2.16/0027-USB-serial-fix-race-between-probe-and-open.patch \ | 884 | file://3.2.16/0026-USB-serial-fix-race-between-probe-and-open.patch \ |
885 | file://3.2.16/0028-USB-pl2303-fix-DTR-RTS-being-raised-on-baud-rate-cha.patch \ | 885 | file://3.2.16/0027-USB-pl2303-fix-DTR-RTS-being-raised-on-baud-rate-cha.patch \ |
886 | file://3.2.16/0029-USB-option-re-add-NOVATELWIRELESS_PRODUCT_HSPA_HIGHS.patch \ | 886 | file://3.2.16/0028-USB-option-re-add-NOVATELWIRELESS_PRODUCT_HSPA_HIGHS.patch \ |
887 | file://3.2.16/0030-USB-ftdi_sio-fix-status-line-change-handling-for-TIO.patch \ | 887 | file://3.2.16/0029-USB-ftdi_sio-fix-status-line-change-handling-for-TIO.patch \ |
888 | file://3.2.16/0031-USB-ftdi_sio-fix-race-condition-in-TIOCMIWAIT-and-ab.patch \ | 888 | file://3.2.16/0030-USB-ftdi_sio-fix-race-condition-in-TIOCMIWAIT-and-ab.patch \ |
889 | file://3.2.16/0032-USB-sierra-add-support-for-Sierra-Wireless-MC7710.patch \ | 889 | file://3.2.16/0031-USB-sierra-add-support-for-Sierra-Wireless-MC7710.patch \ |
890 | file://3.2.16/0033-USB-don-t-clear-urb-dev-in-scatter-gather-library.patch \ | 890 | file://3.2.16/0032-USB-don-t-clear-urb-dev-in-scatter-gather-library.patch \ |
891 | file://3.2.16/0034-USB-don-t-ignore-suspend-errors-for-root-hubs.patch \ | 891 | file://3.2.16/0033-USB-don-t-ignore-suspend-errors-for-root-hubs.patch \ |
892 | file://3.2.16/0035-xhci-don-t-re-enable-IE-constantly.patch \ | 892 | file://3.2.16/0034-xhci-don-t-re-enable-IE-constantly.patch \ |
893 | file://3.2.16/0036-xhci-Don-t-write-zeroed-pointers-to-xHC-registers.patch \ | 893 | file://3.2.16/0035-xhci-Don-t-write-zeroed-pointers-to-xHC-registers.patch \ |
894 | file://3.2.16/0037-xhci-Restore-event-ring-dequeue-pointer-on-resume.patch \ | 894 | file://3.2.16/0036-xhci-Restore-event-ring-dequeue-pointer-on-resume.patch \ |
895 | file://3.2.16/0038-USB-fix-bug-of-device-descriptor-got-from-superspeed.patch \ | 895 | file://3.2.16/0037-USB-fix-bug-of-device-descriptor-got-from-superspeed.patch \ |
896 | file://3.2.16/0039-xHCI-add-XHCI_RESET_ON_RESUME-quirk-for-VIA-xHCI-hos.patch \ | 896 | file://3.2.16/0038-xHCI-add-XHCI_RESET_ON_RESUME-quirk-for-VIA-xHCI-hos.patch \ |
897 | file://3.2.16/0040-xHCI-Correct-the-define-XHCI_LEGACY_DISABLE_SMI.patch \ | 897 | file://3.2.16/0039-xHCI-Correct-the-define-XHCI_LEGACY_DISABLE_SMI.patch \ |
898 | file://3.2.16/0041-fix-tlb-flushing-for-page-table-pages.patch \ | 898 | file://3.2.16/0040-fix-tlb-flushing-for-page-table-pages.patch \ |
899 | file://3.2.16/0042-serial-PL011-clear-pending-interrupts.patch \ | 899 | file://3.2.16/0041-serial-PL011-clear-pending-interrupts.patch \ |
900 | file://3.2.16/0043-serial-PL011-move-interrupt-clearing.patch \ | 900 | file://3.2.16/0042-serial-PL011-move-interrupt-clearing.patch \ |
901 | file://3.2.16/0044-fcaps-clear-the-same-personality-flags-as-suid-when-.patch \ | 901 | file://3.2.16/0043-fcaps-clear-the-same-personality-flags-as-suid-when-.patch \ |
902 | file://3.2.16/0045-ath9k-fix-max-noise-floor-threshold.patch \ | 902 | file://3.2.16/0044-ath9k-fix-max-noise-floor-threshold.patch \ |
903 | file://3.2.16/0046-xhci-Fix-register-save-restore-order.patch \ | 903 | file://3.2.16/0045-xhci-Fix-register-save-restore-order.patch \ |
904 | file://3.2.16/0047-Bluetooth-hci_core-fix-NULL-pointer-dereference-at-u.patch \ | 904 | file://3.2.16/0046-Bluetooth-hci_core-fix-NULL-pointer-dereference-at-u.patch \ |
905 | file://3.2.16/0048-pch_gpio-Support-new-device-LAPIS-Semiconductor-ML78.patch \ | 905 | file://3.2.16/0047-pch_gpio-Support-new-device-LAPIS-Semiconductor-ML78.patch \ |
906 | file://3.2.16/0049-gpio-Add-missing-spin_lock_init-in-gpio-pch-driver.patch \ | 906 | file://3.2.16/0048-gpio-Add-missing-spin_lock_init-in-gpio-pch-driver.patch \ |
907 | file://3.2.16/0050-usb-gadget-pch_udc-Fix-disconnect-issue.patch \ | 907 | file://3.2.16/0049-usb-gadget-pch_udc-Fix-disconnect-issue.patch \ |
908 | file://3.2.16/0051-usb-gadget-pch_udc-Fix-wrong-return-value.patch \ | 908 | file://3.2.16/0050-usb-gadget-pch_udc-Fix-wrong-return-value.patch \ |
909 | file://3.2.16/0052-usb-gadget-pch_udc-Fix-USB-suspend-issue.patch \ | 909 | file://3.2.16/0051-usb-gadget-pch_udc-Fix-USB-suspend-issue.patch \ |
910 | file://3.2.16/0053-usb-gadget-pch_udc-Fix-usb-gadget-pch_udc-Fix-ether-.patch \ | 910 | file://3.2.16/0052-usb-gadget-pch_udc-Fix-usb-gadget-pch_udc-Fix-ether-.patch \ |
911 | file://3.2.16/0054-usb-gadget-pch_udc-Reduce-redundant-interrupt.patch \ | 911 | file://3.2.16/0053-usb-gadget-pch_udc-Reduce-redundant-interrupt.patch \ |
912 | file://3.2.16/0055-ACPICA-Fix-to-allow-region-arguments-to-reference-ot.patch \ | 912 | file://3.2.16/0054-ACPICA-Fix-to-allow-region-arguments-to-reference-ot.patch \ |
913 | file://3.2.16/0056-security-fix-compile-error-in-commoncap.c.patch \ | 913 | file://3.2.16/0055-security-fix-compile-error-in-commoncap.c.patch \ |
914 | file://3.2.16/0057-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch \ | 914 | file://3.2.16/0056-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch \ |
915 | file://3.2.16/0058-pch_gbe-memory-corruption-calling-pch_gbe_validate_o.patch \ | 915 | file://3.2.16/0057-pch_gbe-memory-corruption-calling-pch_gbe_validate_o.patch \ |
916 | file://3.2.16/0059-pch_dma-Support-new-device-LAPIS-Semiconductor-ML783.patch \ | 916 | file://3.2.16/0058-pch_dma-Support-new-device-LAPIS-Semiconductor-ML783.patch \ |
917 | file://3.2.16/0060-spi-topcliff-pch-fix-Wuninitialized-warning.patch \ | 917 | file://3.2.16/0059-spi-topcliff-pch-fix-Wuninitialized-warning.patch \ |
918 | file://3.2.16/0061-spi-topcliff-pch-Support-new-device-LAPIS-Semiconduc.patch \ | 918 | file://3.2.16/0060-spi-topcliff-pch-Support-new-device-LAPIS-Semiconduc.patch \ |
919 | file://3.2.16/0062-Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch \ | 919 | file://3.2.16/0061-Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch \ |
920 | file://3.2.16/0063-Bluetooth-Add-Atheros-maryann-PIDVID-support.patch \ | 920 | file://3.2.16/0062-Bluetooth-Add-Atheros-maryann-PIDVID-support.patch \ |
921 | file://3.2.16/0064-Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch \ | 921 | file://3.2.16/0063-Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch \ |
922 | file://3.2.16/0065-futex-Do-not-leak-robust-list-to-unprivileged-proces.patch \ | 922 | file://3.2.16/0064-futex-Do-not-leak-robust-list-to-unprivileged-proces.patch \ |
923 | file://3.2.16/0066-drm-radeon-kms-fix-the-regression-of-DVI-connector-c.patch \ | 923 | file://3.2.16/0065-drm-radeon-kms-fix-the-regression-of-DVI-connector-c.patch \ |
924 | file://3.2.16/0067-drm-radeon-disable-MSI-on-RV515.patch \ | 924 | file://3.2.16/0066-drm-radeon-disable-MSI-on-RV515.patch \ |
925 | file://3.2.16/0068-drm-radeon-fix-load-detect-on-rn50-with-hardcoded-ED.patch \ | 925 | file://3.2.16/0067-drm-radeon-fix-load-detect-on-rn50-with-hardcoded-ED.patch \ |
926 | file://3.2.16/0069-Linux-3.2.16.patch \ | 926 | file://3.2.16/0068-Linux-3.2.16.patch \ |
927 | file://led/0001-leds-heartbeat-stop-on-shutdown-reboot-or-panic.patch \ | 927 | file://led/0001-leds-heartbeat-stop-on-shutdown-reboot-or-panic.patch \ |
928 | file://beaglebone/0001-f_rndis-HACK-around-undefined-variables.patch \ | 928 | file://beaglebone/0001-f_rndis-HACK-around-undefined-variables.patch \ |
929 | file://beaglebone/0002-da8xx-fb-add-DVI-support-for-beaglebone.patch \ | 929 | file://beaglebone/0002-da8xx-fb-add-DVI-support-for-beaglebone.patch \ |
@@ -955,7 +955,7 @@ PATCHES_OVER_PSP = " \ | |||
955 | file://beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch \ | 955 | file://beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch \ |
956 | file://beaglebone/0029-beaglebone-also-report-cape-revision.patch \ | 956 | file://beaglebone/0029-beaglebone-also-report-cape-revision.patch \ |
957 | file://beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch \ | 957 | file://beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch \ |
958 | file://beaglebone/0033-beaglebone-fix-3.5-cape-support.patch \ | 958 | file://beaglebone/0031-beaglebone-fix-3.5-cape-support.patch \ |
959 | file://beaglebone/0034-beaglebone-connect-batterycape-GPIO-to-gpio-charger.patch \ | 959 | file://beaglebone/0032-beaglebone-connect-batterycape-GPIO-to-gpio-charger.patch \ |
960 | file://beaglebone/0035-beaglebone-add-support-for-CAN-and-RS232-cape.patch \ | 960 | file://beaglebone/0033-beaglebone-add-support-for-CAN-and-RS232-cape.patch \ |
961 | " | 961 | " |