mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
kernel: updated rpi patches to 091073b.
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm 3.2.21 Kernel Configuration
|
# Linux/arm 3.2.28 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||||
@@ -122,10 +122,9 @@ CONFIG_PERF_USE_VMALLOC=y
|
|||||||
# CONFIG_PERF_EVENTS is not set
|
# CONFIG_PERF_EVENTS is not set
|
||||||
# CONFIG_PERF_COUNTERS is not set
|
# CONFIG_PERF_COUNTERS is not set
|
||||||
CONFIG_VM_EVENT_COUNTERS=y
|
CONFIG_VM_EVENT_COUNTERS=y
|
||||||
CONFIG_SLUB_DEBUG=y
|
|
||||||
# CONFIG_COMPAT_BRK is not set
|
# CONFIG_COMPAT_BRK is not set
|
||||||
# CONFIG_SLAB is not set
|
CONFIG_SLAB=y
|
||||||
CONFIG_SLUB=y
|
# CONFIG_SLUB is not set
|
||||||
# CONFIG_SLOB is not set
|
# CONFIG_SLOB is not set
|
||||||
# CONFIG_PROFILING is not set
|
# CONFIG_PROFILING is not set
|
||||||
CONFIG_HAVE_OPROFILE=y
|
CONFIG_HAVE_OPROFILE=y
|
||||||
@@ -3183,8 +3182,7 @@ CONFIG_SCHED_DEBUG=y
|
|||||||
# CONFIG_SCHEDSTATS is not set
|
# CONFIG_SCHEDSTATS is not set
|
||||||
CONFIG_TIMER_STATS=y
|
CONFIG_TIMER_STATS=y
|
||||||
# CONFIG_DEBUG_OBJECTS is not set
|
# CONFIG_DEBUG_OBJECTS is not set
|
||||||
# CONFIG_SLUB_DEBUG_ON is not set
|
# CONFIG_DEBUG_SLAB is not set
|
||||||
# CONFIG_SLUB_STATS is not set
|
|
||||||
# CONFIG_DEBUG_KMEMLEAK is not set
|
# CONFIG_DEBUG_KMEMLEAK is not set
|
||||||
# CONFIG_DEBUG_RT_MUTEXES is not set
|
# CONFIG_DEBUG_RT_MUTEXES is not set
|
||||||
# CONFIG_RT_MUTEX_TESTER is not set
|
# CONFIG_RT_MUTEX_TESTER is not set
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ include Config
|
|||||||
|
|
||||||
VER = 3.2.28
|
VER = 3.2.28
|
||||||
|
|
||||||
RPI_PATCHES = linux-3.2-bootc-f23da7f
|
RPI_PATCHES = linux-3.2.27-091073b
|
||||||
|
|
||||||
THISAPP = linux-$(VER)
|
THISAPP = linux-$(VER)
|
||||||
DL_FILE = linux-$(VER).tar.bz2
|
DL_FILE = linux-$(VER).tar.bz2
|
||||||
@@ -76,7 +76,7 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
|
|||||||
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
|
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
|
||||||
|
|
||||||
$(DL_FILE)_MD5 = d387130f084f48fae7b2d1756f6c9257
|
$(DL_FILE)_MD5 = d387130f084f48fae7b2d1756f6c9257
|
||||||
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 5651c6411bb1cbdbfe4b2908c117aaf3
|
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 9daec752fba403a488818df6dd57a714
|
||||||
|
|
||||||
install : $(TARGET)
|
install : $(TARGET)
|
||||||
|
|
||||||
@@ -152,8 +152,7 @@ endif
|
|||||||
ifeq "$(KCFG)" "-rpi"
|
ifeq "$(KCFG)" "-rpi"
|
||||||
# Apply Raspberry Pi kernel patches.
|
# Apply Raspberry Pi kernel patches.
|
||||||
cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
|
cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
|
||||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-alsamixer.patch
|
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch
|
||||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-limit_volume.patch
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq "$(HEADERS)" "1"
|
ifeq "$(HEADERS)" "1"
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
diff -Naur linux-3.2.19.org/sound/arm/bcm2835-ctl.c linux-3.2.19/sound/arm/bcm2835-ctl.c
|
|
||||||
--- linux-3.2.19.org/sound/arm/bcm2835-ctl.c 2012-06-04 21:11:15.000000000 +0200
|
|
||||||
+++ linux-3.2.19/sound/arm/bcm2835-ctl.c 2012-06-04 21:32:37.969298501 +0200
|
|
||||||
@@ -33,6 +33,19 @@
|
|
||||||
|
|
||||||
#include "bcm2835.h"
|
|
||||||
|
|
||||||
+
|
|
||||||
+/* functions to convert alsa to chip volume and back. */
|
|
||||||
+int alsa2chip(int vol)
|
|
||||||
+{
|
|
||||||
+ return -((vol << 8) / 100);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int chip2alsa(int vol)
|
|
||||||
+{
|
|
||||||
+ return -((vol * 100) >> 8);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
static int snd_bcm2835_ctl_info(struct snd_kcontrol *kcontrol,
|
|
||||||
struct snd_ctl_elem_info *uinfo)
|
|
||||||
{
|
|
||||||
@@ -64,7 +77,7 @@
|
|
||||||
BUG_ON(!chip && !(chip->avail_substreams & AVAIL_SUBSTREAMS_MASK));
|
|
||||||
|
|
||||||
if (kcontrol->private_value == PCM_PLAYBACK_VOLUME)
|
|
||||||
- ucontrol->value.integer.value[0] = chip->volume;
|
|
||||||
+ ucontrol->value.integer.value[0] = chip2alsa(chip->volume);
|
|
||||||
else if (kcontrol->private_value == PCM_PLAYBACK_MUTE)
|
|
||||||
ucontrol->value.integer.value[0] = chip->mute;
|
|
||||||
else if (kcontrol->private_value == PCM_PLAYBACK_DEVICE)
|
|
||||||
@@ -85,13 +98,10 @@
|
|
||||||
changed = 1;
|
|
||||||
}
|
|
||||||
if (changed
|
|
||||||
- || (ucontrol->value.integer.value[0] != chip->volume)) {
|
|
||||||
- int atten;
|
|
||||||
+ || (ucontrol->value.integer.value[0] != chip2alsa(chip->volume))) {
|
|
||||||
|
|
||||||
- chip->volume = ucontrol->value.integer.value[0];
|
|
||||||
+ chip->volume = alsa2chip(ucontrol->value.integer.value[0]);
|
|
||||||
changed = 1;
|
|
||||||
- atten = -((chip->volume << 8) / 100);
|
|
||||||
- chip->volume = atten;
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (kcontrol->private_value == PCM_PLAYBACK_MUTE) {
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
diff -Naur linux-3.2.19.org/sound/arm/bcm2835-ctl.c linux-3.2.19/sound/arm/bcm2835-ctl.c
|
|
||||||
--- linux-3.2.19.org/sound/arm/bcm2835-ctl.c 2012-06-04 22:38:54.000000000 +0200
|
|
||||||
+++ linux-3.2.19/sound/arm/bcm2835-ctl.c 2012-06-05 22:37:46.343725845 +0200
|
|
||||||
@@ -53,7 +53,7 @@
|
|
||||||
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
|
|
||||||
uinfo->count = 1;
|
|
||||||
uinfo->value.integer.min = -10240;
|
|
||||||
- uinfo->value.integer.max = 2303;
|
|
||||||
+ uinfo->value.integer.max = 400; /* 2303 */
|
|
||||||
} else if (kcontrol->private_value == PCM_PLAYBACK_MUTE) {
|
|
||||||
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
|
|
||||||
uinfo->count = 1;
|
|
||||||
38
src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch
Normal file
38
src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
diff -Naur linux-3.2.27.org/drivers/usb/host/dwc_common_port/Makefile linux-3.2.27/drivers/usb/host/dwc_common_port/Makefile
|
||||||
|
--- linux-3.2.27.org/drivers/usb/host/dwc_common_port/Makefile 2012-08-21 05:05:46.000000000 -0400
|
||||||
|
+++ linux-3.2.27/drivers/usb/host/dwc_common_port/Makefile 2012-08-21 06:32:23.501695852 -0400
|
||||||
|
@@ -30,15 +30,6 @@
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
-ifeq ($(KDIR),)
|
||||||
|
-$(error Must give "KDIR=/path/to/kernel/source" on command line or in environment)
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-ifeq ($(ARCH),)
|
||||||
|
-$(error Must give "ARCH=<arch>" on command line or in environment. Also, if \
|
||||||
|
- cross-compiling, must give "CROSS_COMPILE=/path/to/compiler/plus/tool-prefix-")
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
ifeq ($(DOXYGEN),)
|
||||||
|
DOXYGEN := doxygen
|
||||||
|
endif
|
||||||
|
diff -Naur linux-3.2.27.org/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.2.27/drivers/usb/host/dwc_common_port/Makefile.linux
|
||||||
|
--- linux-3.2.27.org/drivers/usb/host/dwc_common_port/Makefile.linux 2012-08-21 05:05:46.000000000 -0400
|
||||||
|
+++ linux-3.2.27/drivers/usb/host/dwc_common_port/Makefile.linux 2012-08-21 05:22:35.964969680 -0400
|
||||||
|
@@ -21,15 +21,6 @@
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
-ifeq ($(KDIR),)
|
||||||
|
-$(error Must give "KDIR=/path/to/kernel/source" on command line or in environment)
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-ifeq ($(ARCH),)
|
||||||
|
-$(error Must give "ARCH=<arch>" on command line or in environment. Also, if \
|
||||||
|
- cross-compiling, must give "CROSS_COMPILE=/path/to/compiler/plus/tool-prefix-")
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
ifeq ($(DOXYGEN),)
|
||||||
|
DOXYGEN := doxygen
|
||||||
|
endif
|
||||||
Reference in New Issue
Block a user