diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/kernel/raspberry-pi | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.audio | 4 | ||||
| -rw-r--r-- | target/linux/kernel.config | 2 | ||||
| -rw-r--r-- | target/linux/patches/3.12.6/xargs.patch | 12 |
4 files changed, 15 insertions, 6 deletions
diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi index debb98417..2a1450ca3 100644 --- a/target/arm/kernel/raspberry-pi +++ b/target/arm/kernel/raspberry-pi @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_FIQ=y CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_KUSER_HELPERS=y -CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y CONFIG_ARCH_BCM2708=y @@ -10,7 +10,6 @@ CONFIG_MACH_BCM2708=y CONFIG_BCM2708_GPIO=y CONFIG_BCM2708_VCMEM=y CONFIG_BCM2708_DMAER=y -CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_VFP=y CONFIG_DTC=y diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 8c4d7d751..dc2ff100f 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -31,9 +31,6 @@ config ADK_KERNEL_SND_MIXER_OSS config ADK_KERNEL_SND_PCM_OSS boolean -config ADK_KERNEL_SND_HRTIMER - boolean - config ADK_KPACKAGE_KMOD_SOUND tristate @@ -132,7 +129,6 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835 tristate select ADK_KPACKAGE_KMOD_SND select ADK_KERNEL_SND_ARM - select ADK_KERNEL_SND_HRTIMER depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 491b04c92..97237b382 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -13,6 +13,8 @@ CONFIG_XFRM=y CONFIG_INET=y CONFIG_PROC_FS=y CONFIG_PROC_SYSCTL=y +CONFIG_BLOCK=y +CONFIG_FILE_LOCKING=y CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_NLS=y diff --git a/target/linux/patches/3.12.6/xargs.patch b/target/linux/patches/3.12.6/xargs.patch new file mode 100644 index 000000000..2c7b3df59 --- /dev/null +++ b/target/linux/patches/3.12.6/xargs.patch @@ -0,0 +1,12 @@ +diff -Nur linux-3.12.6.orig/scripts/Makefile.modpost linux-3.12.6/scripts/Makefile.modpost +--- linux-3.12.6.orig/scripts/Makefile.modpost 2013-12-20 16:51:33.000000000 +0100 ++++ linux-3.12.6/scripts/Makefile.modpost 2014-01-25 14:55:33.000000000 +0100 +@@ -60,7 +60,7 @@ + modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers + + # Step 1), find all modules listed in $(MODVERDIR)/ +-MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort -u ++MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs grep -h '\.ko$$' | sort -u + __modules := $(shell $(MODLISTCMD)) + modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o))) + |