From ae5447facec8a420335d24274c427be37adb5468 Mon Sep 17 00:00:00 2001 From: Ycarus Date: Wed, 23 May 2018 10:53:59 +0200 Subject: [PATCH] Update RPI files --- root/target/linux/brcm2708/Makefile | 5 ++- .../base-files/etc/board.d/02_network | 30 --------------- root/target/linux/brcm2708/modules.mk | 37 ++++++++++++++++--- 3 files changed, 35 insertions(+), 37 deletions(-) delete mode 100755 root/target/linux/brcm2708/base-files/etc/board.d/02_network diff --git a/root/target/linux/brcm2708/Makefile b/root/target/linux/brcm2708/Makefile index 55b9a1ee..f4a15810 100644 --- a/root/target/linux/brcm2708/Makefile +++ b/root/target/linux/brcm2708/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=brcm2708 BOARDNAME:=Broadcom BCM27xx -FEATURES:=ext4 audio usb usbgadget display gpio fpu +FEATURES:=ext4 audio usb usbgadget display gpio fpu squashfs MAINTAINER:=Álvaro Fernández Rojas SUBTARGETS:=bcm2708 bcm2709 bcm2710 @@ -27,7 +27,8 @@ DEFAULT_PACKAGES += \ kmod-usb-hid \ kmod-sound-core kmod-sound-arm-bcm2835 \ kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \ - brcmfmac-firmware-43430-sdio brcmfmac-firmware-43455-sdio kmod-brcmfmac wpad-mini + brcmfmac-firmware-43430-sdio brcmfmac-firmware-43455-sdio kmod-brcmfmac wpad-mini \ + partx-utils mkf2fs e2fsprogs KERNELNAME:=Image dtbs diff --git a/root/target/linux/brcm2708/base-files/etc/board.d/02_network b/root/target/linux/brcm2708/base-files/etc/board.d/02_network deleted file mode 100755 index c8449bb7..00000000 --- a/root/target/linux/brcm2708/base-files/etc/board.d/02_network +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Copyright (C) 2014-2016 OpenWrt.org -# Copyright (C) 2017 LEDE project - -. /lib/functions/uci-defaults.sh -. /lib/functions.sh -. /lib/functions/system.sh - -board_config_update - -board=$(board_name) - -case "$board" in -raspberrypi,model-b |\ -raspberrypi,model-b-plus |\ -raspberrypi,model-b-rev2 |\ -raspberrypi,2-model-b |\ -raspberrypi,3-model-b |\ -raspberrypi,3-model-b-plus) - ucidef_set_interface_lan "eth0" - ;; - -raspberrypi,model-zero-w) - ucidef_set_interface_lan "wlan0" - ;; -esac - -board_config_flush - -exit 0 diff --git a/root/target/linux/brcm2708/modules.mk b/root/target/linux/brcm2708/modules.mk index 00163818..ac47d706 100644 --- a/root/target/linux/brcm2708/modules.mk +++ b/root/target/linux/brcm2708/modules.mk @@ -8,7 +8,7 @@ define KernelPackage/drm-vc4 SUBMENU:=$(VIDEO_MENU) TITLE:=Broadcom VC4 Graphics - DEPENDS:=@TARGET_brcm2708 +kmod-pcm +kmod-sound-soc-core +kmod-drm + DEPENDS:=@TARGET_brcm2708 +kmod-drm KCONFIG:=CONFIG_DRM_VC4 FILES:= \ $(LINUX_DIR)/drivers/gpu/drm/vc4/vc4.ko \ @@ -30,8 +30,8 @@ define KernelPackage/sound-arm-bcm2835 CONFIG_SND_BCM2835 \ CONFIG_SND_ARMAACI=n FILES:= \ - $(LINUX_DIR)/sound/arm/snd-bcm2835.ko@lt4.12 \ - $(LINUX_DIR)/drivers/staging/vc04_services/bcm2835-audio/snd-bcm2835.ko@ge4.12 + $(LINUX_DIR)/sound/arm/snd-bcm2835.ko@lt4.14 \ + $(LINUX_DIR)/drivers/staging/vc04_services/bcm2835-audio/snd-bcm2835.ko@ge4.14 AUTOLOAD:=$(call AutoLoad,68,snd-bcm2835) DEPENDS:=@TARGET_brcm2708 $(call AddDepends/sound) @@ -421,6 +421,33 @@ endef $(eval $(call KernelPackage,sound-soc-pisound)) +define KernelPackage/sound-soc-raspidac3 + TITLE:=Support for RaspiDAC Rev.3x + KCONFIG:= \ + CONFIG_SND_BCM2708_SOC_RASPIDAC3 \ + CONFIG_SND_SOC_PCM512x \ + CONFIG_SND_SOC_PCM512x_I2C \ + CONFIG_SND_SOC_TPA6130A2 + FILES:= \ + $(LINUX_DIR)/sound/soc/bcm/snd-soc-raspidac3.ko \ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x.ko \ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-pcm512x-i2c.ko \ + $(LINUX_DIR)/sound/soc/codecs/snd-soc-tpa6130a2.ko + AUTOLOAD:=$(call AutoLoad,68,snd-soc-pcm512x snd-soc-pcm512x-i2c \ + snd-soc-tpa6130a2 snd-soc-raspidac3) + DEPENDS:= \ + @ge4.14 \ + kmod-sound-soc-bcm2835-i2s \ + +kmod-i2c-bcm2708 + $(call AddDepends/sound) +endef + +define KernelPackage/sound-soc-raspidac3/description + This package contains support for RaspiDAC Rev.3x +endef + +$(eval $(call KernelPackage,sound-soc-raspidac3)) + define KernelPackage/sound-soc-rpi-dac TITLE:=Support for RPi-DAC KCONFIG:= \ @@ -604,8 +631,8 @@ define KernelPackage/video-bcm2835 KCONFIG:= \ CONFIG_VIDEO_BCM2835=y \ CONFIG_VIDEO_BCM2835_MMAL - FILES:= $(LINUX_DIR)/drivers/media/platform/bcm2835/bcm2835-v4l2.ko@lt4.12 \ - $(LINUX_DIR)/drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko@ge4.12 + FILES:= $(LINUX_DIR)/drivers/media/platform/bcm2835/bcm2835-v4l2.ko@lt4.14 \ + $(LINUX_DIR)/drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko@ge4.14 AUTOLOAD:=$(call AutoLoad,65,bcm2835-v4l2) $(call AddDepends/video,@TARGET_brcm2708 +kmod-video-videobuf2) endef