Commit 08fbb3b3ae3793223d1ed4d089994f5892412804
1 parent
544adb2dcf
Exists in
master
Fix the correct commit head
Showing 2 changed files with 63 additions and 16 deletions Side-by-side Diff
recipes-kernel/linux/linux-smarct335x-staging-4.1/defconfig
| 1 | 1 | # |
| 2 | 2 | # Automatically generated file; DO NOT EDIT. |
| 3 | -# Linux/arm 4.1.10 Kernel Configuration | |
| 3 | +# Linux/arm 4.1.13 Kernel Configuration | |
| 4 | 4 | # |
| 5 | 5 | CONFIG_ARM=y |
| 6 | 6 | CONFIG_ARM_HAS_SG_CHAIN=y |
| ... | ... | @@ -1800,6 +1800,7 @@ |
| 1800 | 1800 | # CONFIG_STE10XP is not set |
| 1801 | 1801 | # CONFIG_LSI_ET1011C_PHY is not set |
| 1802 | 1802 | # CONFIG_MICREL_PHY is not set |
| 1803 | +# CONFIG_DP83867_PHY is not set | |
| 1803 | 1804 | # CONFIG_FIXED_PHY is not set |
| 1804 | 1805 | # CONFIG_MDIO_BITBANG is not set |
| 1805 | 1806 | # CONFIG_MDIO_BUS_MUX_GPIO is not set |
| ... | ... | @@ -1808,10 +1809,6 @@ |
| 1808 | 1809 | # CONFIG_MICREL_KS8995MA is not set |
| 1809 | 1810 | # CONFIG_PPP is not set |
| 1810 | 1811 | # CONFIG_SLIP is not set |
| 1811 | - | |
| 1812 | -# | |
| 1813 | -# Host-side USB support is needed for USB Network Adapter support | |
| 1814 | -# | |
| 1815 | 1812 | CONFIG_USB_NET_DRIVERS=m |
| 1816 | 1813 | # CONFIG_USB_CATC is not set |
| 1817 | 1814 | # CONFIG_USB_KAWETH is not set |
| ... | ... | @@ -3117,6 +3114,7 @@ |
| 3117 | 3114 | # CONFIG_FB_AUO_K190X is not set |
| 3118 | 3115 | # CONFIG_FB_SIMPLE is not set |
| 3119 | 3116 | CONFIG_OMAP2_DSS_INIT=y |
| 3117 | +CONFIG_OMAP_DSS_BASE=y | |
| 3120 | 3118 | CONFIG_OMAP2_DSS=y |
| 3121 | 3119 | # CONFIG_OMAP2_DSS_DEBUG is not set |
| 3122 | 3120 | # CONFIG_OMAP2_DSS_DEBUGFS is not set |
| ... | ... | @@ -3440,7 +3438,7 @@ |
| 3440 | 3438 | CONFIG_USB_SUPPORT=y |
| 3441 | 3439 | CONFIG_USB_COMMON=y |
| 3442 | 3440 | CONFIG_USB_ARCH_HAS_HCD=y |
| 3443 | -CONFIG_USB=m | |
| 3441 | +CONFIG_USB=y | |
| 3444 | 3442 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y |
| 3445 | 3443 | |
| 3446 | 3444 | # |
| ... | ... | @@ -3451,7 +3449,7 @@ |
| 3451 | 3449 | CONFIG_USB_OTG=y |
| 3452 | 3450 | # CONFIG_USB_OTG_WHITELIST is not set |
| 3453 | 3451 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 3454 | -CONFIG_USB_MON=m | |
| 3452 | +CONFIG_USB_MON=y | |
| 3455 | 3453 | # CONFIG_USB_WUSB_CBAF is not set |
| 3456 | 3454 | |
| 3457 | 3455 | # |
| ... | ... | @@ -3496,7 +3494,7 @@ |
| 3496 | 3494 | # |
| 3497 | 3495 | # also be needed; see USB_STORAGE Help for more info |
| 3498 | 3496 | # |
| 3499 | -CONFIG_USB_STORAGE=m | |
| 3497 | +CONFIG_USB_STORAGE=y | |
| 3500 | 3498 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 3501 | 3499 | # CONFIG_USB_STORAGE_REALTEK is not set |
| 3502 | 3500 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 3503 | 3501 | |
| 3504 | 3502 | |
| ... | ... | @@ -3519,18 +3517,17 @@ |
| 3519 | 3517 | # CONFIG_USB_MDC800 is not set |
| 3520 | 3518 | # CONFIG_USB_MICROTEK is not set |
| 3521 | 3519 | # CONFIG_USBIP_CORE is not set |
| 3522 | -CONFIG_USB_MUSB_HDRC=m | |
| 3523 | -# CONFIG_USB_MUSB_HOST is not set | |
| 3524 | -# CONFIG_USB_MUSB_GADGET is not set | |
| 3525 | -CONFIG_USB_MUSB_DUAL_ROLE=y | |
| 3520 | +CONFIG_USB_MUSB_HDRC=y | |
| 3521 | +CONFIG_USB_MUSB_HOST=y | |
| 3526 | 3522 | |
| 3527 | 3523 | # |
| 3528 | 3524 | # Platform Glue Layer |
| 3529 | 3525 | # |
| 3526 | +# CONFIG_USB_MUSB_TUSB6010 is not set | |
| 3530 | 3527 | CONFIG_USB_MUSB_OMAP2PLUS=m |
| 3531 | 3528 | CONFIG_USB_MUSB_AM35X=m |
| 3532 | -CONFIG_USB_MUSB_DSPS=m | |
| 3533 | -CONFIG_USB_MUSB_AM335X_CHILD=m | |
| 3529 | +CONFIG_USB_MUSB_DSPS=y | |
| 3530 | +CONFIG_USB_MUSB_AM335X_CHILD=y | |
| 3534 | 3531 | # CONFIG_USB_INVENTRA_DMA is not set |
| 3535 | 3532 | CONFIG_USB_TI_CPPI41_DMA=y |
| 3536 | 3533 | # CONFIG_MUSB_PIO_ONLY is not set |
| ... | ... | @@ -3556,7 +3553,57 @@ |
| 3556 | 3553 | # |
| 3557 | 3554 | # USB port drivers |
| 3558 | 3555 | # |
| 3559 | -# CONFIG_USB_SERIAL is not set | |
| 3556 | +CONFIG_USB_SERIAL=m | |
| 3557 | +CONFIG_USB_SERIAL_GENERIC=y | |
| 3558 | +CONFIG_USB_SERIAL_SIMPLE=m | |
| 3559 | +# CONFIG_USB_SERIAL_AIRCABLE is not set | |
| 3560 | +# CONFIG_USB_SERIAL_ARK3116 is not set | |
| 3561 | +# CONFIG_USB_SERIAL_BELKIN is not set | |
| 3562 | +# CONFIG_USB_SERIAL_CH341 is not set | |
| 3563 | +# CONFIG_USB_SERIAL_WHITEHEAT is not set | |
| 3564 | +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set | |
| 3565 | +CONFIG_USB_SERIAL_CP210X=m | |
| 3566 | +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set | |
| 3567 | +# CONFIG_USB_SERIAL_EMPEG is not set | |
| 3568 | +CONFIG_USB_SERIAL_FTDI_SIO=m | |
| 3569 | +# CONFIG_USB_SERIAL_VISOR is not set | |
| 3570 | +# CONFIG_USB_SERIAL_IPAQ is not set | |
| 3571 | +# CONFIG_USB_SERIAL_IR is not set | |
| 3572 | +# CONFIG_USB_SERIAL_EDGEPORT is not set | |
| 3573 | +# CONFIG_USB_SERIAL_EDGEPORT_TI is not set | |
| 3574 | +# CONFIG_USB_SERIAL_F81232 is not set | |
| 3575 | +# CONFIG_USB_SERIAL_GARMIN is not set | |
| 3576 | +# CONFIG_USB_SERIAL_IPW is not set | |
| 3577 | +# CONFIG_USB_SERIAL_IUU is not set | |
| 3578 | +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set | |
| 3579 | +# CONFIG_USB_SERIAL_KEYSPAN is not set | |
| 3580 | +# CONFIG_USB_SERIAL_KLSI is not set | |
| 3581 | +# CONFIG_USB_SERIAL_KOBIL_SCT is not set | |
| 3582 | +# CONFIG_USB_SERIAL_MCT_U232 is not set | |
| 3583 | +# CONFIG_USB_SERIAL_METRO is not set | |
| 3584 | +# CONFIG_USB_SERIAL_MOS7720 is not set | |
| 3585 | +# CONFIG_USB_SERIAL_MOS7840 is not set | |
| 3586 | +# CONFIG_USB_SERIAL_MXUPORT is not set | |
| 3587 | +# CONFIG_USB_SERIAL_NAVMAN is not set | |
| 3588 | +CONFIG_USB_SERIAL_PL2303=m | |
| 3589 | +# CONFIG_USB_SERIAL_OTI6858 is not set | |
| 3590 | +# CONFIG_USB_SERIAL_QCAUX is not set | |
| 3591 | +# CONFIG_USB_SERIAL_QUALCOMM is not set | |
| 3592 | +# CONFIG_USB_SERIAL_SPCP8X5 is not set | |
| 3593 | +# CONFIG_USB_SERIAL_SAFE is not set | |
| 3594 | +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | |
| 3595 | +# CONFIG_USB_SERIAL_SYMBOL is not set | |
| 3596 | +# CONFIG_USB_SERIAL_TI is not set | |
| 3597 | +# CONFIG_USB_SERIAL_CYBERJACK is not set | |
| 3598 | +# CONFIG_USB_SERIAL_XIRCOM is not set | |
| 3599 | +# CONFIG_USB_SERIAL_OPTION is not set | |
| 3600 | +# CONFIG_USB_SERIAL_OMNINET is not set | |
| 3601 | +# CONFIG_USB_SERIAL_OPTICON is not set | |
| 3602 | +# CONFIG_USB_SERIAL_XSENS_MT is not set | |
| 3603 | +# CONFIG_USB_SERIAL_WISHBONE is not set | |
| 3604 | +# CONFIG_USB_SERIAL_SSU100 is not set | |
| 3605 | +# CONFIG_USB_SERIAL_QT2 is not set | |
| 3606 | +# CONFIG_USB_SERIAL_DEBUG is not set | |
| 3560 | 3607 | |
| 3561 | 3608 | # |
| 3562 | 3609 | # USB Miscellaneous drivers |
recipes-kernel/linux/linux-smarct335x-staging_4.1.bb
| ... | ... | @@ -52,7 +52,7 @@ |
| 52 | 52 | BRANCH = "smarct3x-processor-sdk-linux-02.00.01" |
| 53 | 53 | |
| 54 | 54 | # Corresponds to tag smarct3x-processor-sdk-linux-02.00.01 |
| 55 | -SRCREV = "8aa9e85adac609588eeec356e5a85059b3b819ba" | |
| 55 | +SRCREV = "d636ef68f9101b77e68e8718d325f443d6cea310" | |
| 56 | 56 | PV = "4.1.13" |
| 57 | 57 | |
| 58 | 58 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild |