From 45fcc89894e071c8b11771cbcea5543f44c9e584 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 20 Oct 2011 11:19:56 +0200 Subject: linux-ti33x-psp 3.1rc8: only use one config for beaglebone Signed-off-by: Koen Kooi --- .../beaglebone/configs/empty | 0 .../beaglebone/configs/stock | 1 - .../linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig | 29 ++++++++++++---------- recipes-kernel/linux/linux-ti33x-psp_3.0+3.1rc.bb | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/configs/empty delete mode 120000 recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/configs/stock diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/configs/empty b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/configs/empty new file mode 100644 index 00000000..e69de29b diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/configs/stock b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/configs/stock deleted file mode 120000 index 9874fecd..00000000 --- a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/configs/stock +++ /dev/null @@ -1 +0,0 @@ -../../am335x-evm/defconfig \ No newline at end of file diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig index 18f5bc59..dcb4e8cf 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig +++ b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig @@ -1084,8 +1084,7 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_OSD_INITIATOR is not set # CONFIG_ATA is not set CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -CONFIG_MD_AUTODETECT=y +CONFIG_BLK_DEV_MD=m CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m @@ -1093,7 +1092,7 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=y +CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m @@ -1145,6 +1144,7 @@ CONFIG_SMC91X=y CONFIG_TI_DAVINCI_MDIO=y CONFIG_TI_DAVINCI_CPDMA=y CONFIG_TI_CPSW=y +# CONFIG_TLK110_WORKAROUND is not set # CONFIG_DM9000 is not set # CONFIG_ENC28J60 is not set # CONFIG_ETHOC is not set @@ -1491,6 +1491,7 @@ CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=y # CONFIG_I2C_MUX is not set CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=m # # I2C Hardware Bus support @@ -2235,23 +2236,24 @@ CONFIG_DVB_IX2505V=m # # Graphics support # -# CONFIG_DRM is not set +CONFIG_DRM=m # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set -CONFIG_FB_CFB_FILLRECT=m -CONFIG_FB_CFB_COPYAREA=m -CONFIG_FB_CFB_IMAGEBLIT=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -# CONFIG_FB_SYS_FILLRECT is not set -# CONFIG_FB_SYS_COPYAREA is not set -# CONFIG_FB_SYS_IMAGEBLIT is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_SYS_FOPS=m # CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -2263,8 +2265,9 @@ CONFIG_FB_TILEBLITTING=y # # CONFIG_FB_UVESA is not set # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_UDL is not set -# CONFIG_FB_DA8XX is not set +CONFIG_FB_UDL=m +CONFIG_FB_DA8XX=y +CONFIG_FB_DA8XX_CONSISTENT_DMA_SIZE=4 # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_BROADSHEET is not set diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.0+3.1rc.bb b/recipes-kernel/linux/linux-ti33x-psp_3.0+3.1rc.bb index ba40bdbb..6fcfd8b1 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.0+3.1rc.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.0+3.1rc.bb @@ -11,7 +11,7 @@ MULTI_CONFIG_BASE_SUFFIX = "" BRANCH = "master" SRCREV = "a95ceb11b5858feae89895d14d7f7bc41cca9fd6" -MACHINE_KERNEL_PR_append = "e+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "g+gitr${SRCREV}" COMPATIBLE_MACHINE = "(ti33x)" -- cgit v1.2.3-54-g00ecf