This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, kernel-update has been updated via 5fe5aedd2a809f1eac79eacd7b138e487a53b60c (commit) via 89a010793874c5143882fb49002a0abc6f2f3be2 (commit) via e98279ed71cf31ab778f19e156ef14db671c21fa (commit) from 31850b463b468567e324cfa6bf6f6e3e642a2925 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 5fe5aedd2a809f1eac79eacd7b138e487a53b60c Merge: 89a0107 31850b4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Aug 28 08:30:12 2012 -0400
Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into kernel-update
commit 89a010793874c5143882fb49002a0abc6f2f3be2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Aug 22 11:29:07 2012 -0400
kernel: updated rpi patches to 091073b.
commit e98279ed71cf31ab778f19e156ef14db671c21fa Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Aug 21 09:33:12 2012 -0400
rpi-firmware: update to b2200cd.
set default start.elf to the new 240MB version.
-----------------------------------------------------------------------
Summary of changes: config/kernel/kernel.config.armv5tel-ipfire-rpi | 10 ++--- config/rootfiles/common/armv5tel/rpi-firmware | 1 + lfs/linux | 7 +-- lfs/rpi-firmware | 5 +- src/patches/linux-3.2-bcm2835-alsamixer.patch | 48 -------------------- src/patches/linux-3.2-bcm2835-limit_volume.patch | 12 ----- .../linux-3.2.27-rpi_fix_dwc_common_build.patch | 38 +++++++++++++++ 7 files changed, 48 insertions(+), 73 deletions(-) delete mode 100644 src/patches/linux-3.2-bcm2835-alsamixer.patch delete mode 100644 src/patches/linux-3.2-bcm2835-limit_volume.patch create mode 100644 src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch
Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index 4d434e0..45bd742 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.2.21 Kernel Configuration +# Linux/arm 3.2.28 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -122,10 +122,9 @@ CONFIG_PERF_USE_VMALLOC=y # CONFIG_PERF_EVENTS is not set # CONFIG_PERF_COUNTERS is not set CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y @@ -3183,8 +3182,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set diff --git a/config/rootfiles/common/armv5tel/rpi-firmware b/config/rootfiles/common/armv5tel/rpi-firmware index e8b99d7..4d5d270 100644 --- a/config/rootfiles/common/armv5tel/rpi-firmware +++ b/config/rootfiles/common/armv5tel/rpi-firmware @@ -2,6 +2,7 @@ boot/arm128_start.elf boot/arm192_start.elf boot/arm224_start.elf +boot/arm240_start.elf boot/bootcode.bin boot/cmdline.txt #boot/first32k.bin diff --git a/lfs/linux b/lfs/linux index 4161ae0..d51c6df 100644 --- a/lfs/linux +++ b/lfs/linux @@ -26,7 +26,7 @@ include Config
VER = 3.2.28
-RPI_PATCHES = linux-3.2-bootc-f23da7f +RPI_PATCHES = linux-3.2.27-091073b
THISAPP = linux-$(VER) 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
$(DL_FILE)_MD5 = d387130f084f48fae7b2d1756f6c9257 -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 5651c6411bb1cbdbfe4b2908c117aaf3 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 9daec752fba403a488818df6dd57a714
install : $(TARGET)
@@ -152,8 +152,7 @@ endif ifeq "$(KCFG)" "-rpi" # Apply Raspberry Pi kernel patches. 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-bcm2835-limit_volume.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch endif
ifeq "$(HEADERS)" "1" diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware index 4daec2f..b2afde2 100644 --- a/lfs/rpi-firmware +++ b/lfs/rpi-firmware @@ -24,8 +24,7 @@
include Config
-VER = 1309b3d - +VER = b2200cd THISAPP = rpi-firmware-$(VER) DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) @@ -41,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 90978c567f9bcd2aad2c1c138acb3518 +$(DL_FILE)_MD5 = d4b0a5b5fe8cdbe5df17aadd5ec60ff0
install : $(TARGET)
diff --git a/src/patches/linux-3.2-bcm2835-alsamixer.patch b/src/patches/linux-3.2-bcm2835-alsamixer.patch deleted file mode 100644 index bfe3d02..0000000 --- a/src/patches/linux-3.2-bcm2835-alsamixer.patch +++ /dev/null @@ -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) { diff --git a/src/patches/linux-3.2-bcm2835-limit_volume.patch b/src/patches/linux-3.2-bcm2835-limit_volume.patch deleted file mode 100644 index 930033b..0000000 --- a/src/patches/linux-3.2-bcm2835-limit_volume.patch +++ /dev/null @@ -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; diff --git a/src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch b/src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch new file mode 100644 index 0000000..f46c57c --- /dev/null +++ b/src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch @@ -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
hooks/post-receive -- IPFire 2.x development tree