瀏覽代碼

sync patch set and config

Remove some old kernel symbols. Use 8 MB as default for CMA.
Waldemar Brodkorb 9 年之前
父節點
當前提交
05a0357d01

+ 8 - 0
package/bcm28xx-vc/Makefile

@@ -41,6 +41,10 @@ bcm28xx-vc-libs-install:
 		$(IDIR_BCM28XX_VC_LIBS)/opt/vc/lib 
 	$(CP) $(WRKINST)/opt/vc/lib/libvchiq_arm.so \
 		$(IDIR_BCM28XX_VC_LIBS)/opt/vc/lib
+	$(CP) $(WRKINST)/opt/vc/lib/libbcm_host.so \
+		$(IDIR_BCM28XX_VC_LIBS)/opt/vc/lib
+	$(CP) $(WRKINST)/opt/vc/lib/libcontainers.so \
+		$(IDIR_BCM28XX_VC_LIBS)/opt/vc/lib
 	-rm -rf $(STAGING_TARGET_DIR)/opt/vc
 	mkdir -p $(STAGING_TARGET_DIR)/opt/vc
 	$(CP) $(WRKINST)/opt/vc/lib $(STAGING_TARGET_DIR)/opt/vc
@@ -48,6 +52,10 @@ bcm28xx-vc-libs-install:
 
 bcm28xx-vc-gl-libs-install:
 	$(INSTALL_DIR) $(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
+	$(CP) $(WRKINST)/opt/vc/lib/libmmal*.so \
+		$(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
+	$(CP) $(WRKINST)/opt/vc/lib/libopenmaxil.so \
+		$(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
 	$(CP) $(WRKINST)/opt/vc/lib/libEGL.so \
 		$(IDIR_BCM28XX_VC_GL_LIBS)/opt/vc/lib
 	$(CP) $(WRKINST)/opt/vc/lib/libGLESv2.so \

+ 2 - 2
package/kodi/Makefile

@@ -73,9 +73,9 @@ PKGFD_WITH_WEBSERVER:=	enable internal webserver support
 # libiconv missing, freescale GL libraries linked against glibc
 PKG_LIBC_DEPENDS:=	glibc
 
-PKG_DEPENDS_RASPBERRY_PI:=	bcm28xx-vc
+PKG_DEPENDS_RASPBERRY_PI:=	bcm28xx-vc bcm28xx-vc-gl-libs bcm28xx-vc-libs
 PKG_BUILDDEP_RASPBERRY_PI:=	bcm28xx-vc
-PKG_DEPENDS_RASPBERRY_PI2:=	bcm28xx-vc
+PKG_DEPENDS_RASPBERRY_PI2:=	bcm28xx-vc bcm28xx-vc-gl-libs bcm28xx-vc-libs
 PKG_BUILDDEP_RASPBERRY_PI2:=	bcm28xx-vc
 PKG_DEPENDS_SOLIDRUN_IMX6:=	libfslvpuwrap gpu-viv-bin-mx6q
 PKG_BUILDDEP_SOLIDRUN_IMX6:=	libfslvpuwrap gpu-viv-bin-mx6q

+ 1 - 1
target/appliances/kodi.appliance

@@ -8,7 +8,7 @@ config ADK_APPLIANCE_KODI
 	select ADK_PACKAGE_KODI_WITH_SMB
 	select ADK_PACKAGE_KODI_WITH_NFS
 	select ADK_PACKAGE_KODI_WITH_SSH
-	select ADK_PACKAGE_KODI_WITH_CEC
+	select ADK_PACKAGE_KODI_WITH_CEC if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_PACKAGE_KODI_WITH_RTMP
 	select ADK_PACKAGE_KODI_WITH_BLURAY
 	select ADK_PACKAGE_KODI_WITH_WEBSERVER

File diff suppressed because it is too large
+ 234 - 234
target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch


+ 0 - 16
target/linux/config/Config.in.audio

@@ -13,12 +13,6 @@ config ADK_KERNEL_SND_SOC
 config ADK_KERNEL_SND_ARM
 	bool
 
-config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
-	bool
-
-config ADK_KERNEL_SND_DMAENGINE_PCM
-	bool
-
 config ADK_KERNEL_SND_SOC_SPDIF
 	bool
 
@@ -55,8 +49,6 @@ config ADK_KERNEL_SND_TIMER
 config ADK_KERNEL_SND_PCM
 	bool
 	select ADK_KERNEL_SND_TIMER
-	select ADK_KERNEL_SND_DMAENGINE_PCM
-	select ADK_KERNEL_SND_PCM_DMAENGINE
 
 config ADK_KERNEL_SND_HWDEP
 	bool
@@ -99,9 +91,6 @@ config ADK_KERNEL_SND_SOC_PCM512x_SPI
 	select ADK_KERNEL_SND_SOC_PCM512x
 	select ADK_KERNEL_SND_SOC_I2C_AND_SPI
 
-config ADK_KERNEL_SND_PCM_DMAENGINE
-	bool
-
 config ADK_KERNEL_SND
 	bool
 	select ADK_KERNEL_SOUND
@@ -172,8 +161,6 @@ config ADK_KERNEL_SND_BCM2708_SOC_I2S
 	select ADK_KERNEL_SND_SOC
 	select ADK_KERNEL_SND_BCM2835
 	select ADK_KERNEL_DMA_BCM2835
-	select ADK_KERNEL_SND_DMAENGINE_PCM
-	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
 	select ADK_KERNEL_REGMAP_MMIO
 	depends on ADK_TARGET_BOARD_BCM28XX
 	default n
@@ -217,8 +204,6 @@ config ADK_KERNEL_SND_IMX_SOC
 	bool "IMX6 SoC sound chip"
 	select ADK_KERNEL_SND
 	select ADK_KERNEL_SND_SOC
-	select ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
-	select ADK_KERNEL_SND_DMAENGINE_PCM
 	select ADK_KERNEL_SND_SOC_IMX_PCM_DMA
 	select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
 	select ADK_KERNEL_SND_SOC_IMX_HDMI
@@ -228,7 +213,6 @@ config ADK_KERNEL_SND_IMX_SOC
 	select ADK_KERNEL_SND_SOC_FSL_SPDIF
 	select ADK_KERNEL_REGMAP_SPI
 	select ADK_KERNEL_REGMAP_I2C
-	select ADK_KERNEL_SND_PCM_DMAENGINE
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on ADK_KERNEL_VERSION_3_14
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6

+ 1 - 7
target/linux/config/Config.in.block

@@ -96,9 +96,6 @@ config ADK_KERNEL_MMC_BCM2835
 config ADK_KERNEL_MMC_BCM2835_DMA
 	bool
 
-config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA
-	bool
-
 menu "SATA/PATA devices support"
 depends on ADK_TARGET_WITH_PATA || ADK_TARGET_WITH_SATA || ADK_TARGET_QEMU || ADK_TARGET_VBOX
 
@@ -298,7 +295,7 @@ config ADK_KERNEL_MMC_AT91
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default n
 
-config ADK_KERNEL_MMC_SDHCI_BCM2708
+config ADK_KERNEL_MMC_BCM2835
 	bool "SD card support for BCM2835 boards"
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_MMC
@@ -306,10 +303,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
 	select ADK_KERNEL_MMC_SDHCI
-	select ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS
 	select ADK_KERNEL_MMC_SDHCI_PLTFM
-	select ADK_KERNEL_MMC_SDHCI_BCM2708_DMA
-	select ADK_KERNEL_MMC_BCM2835
 	select ADK_KERNEL_MMC_BCM2835_DMA
 	depends on ADK_TARGET_BOARD_BCM28XX
 	default y if ADK_TARGET_BOARD_BCM28XX

+ 1 - 1
target/linux/config/Config.in.dma

@@ -24,7 +24,7 @@ config ADK_KERNEL_CMA
 
 config ADK_KERNEL_CMA_SIZE_MBYTES
 	int
-	default 64
+	default 8
 
 config ADK_KERNEL_DMA_CMA
 	bool

Some files were not shown because too many files changed in this diff