From: Victor Martinez <pitillo@ono.com>
Date: Wed, 24 Jul 2013 08:23:52 +0000 (+0200)
Subject: Updated sources to 2.6.31.14.27-efikamx_20130723
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=ad939e05d301b4721e9c321b272f38a69073f934;p=kernel%2Fefikamx.git

Updated sources to 2.6.31.14.27-efikamx_20130723
Fixed some problems from last kernel package.
    - VPU/GPU code
    - Fixed unaligned access with gcc 4.6
For references: https://github.com/genesi/linux-legacy/commits/master
---

diff --git a/Makefile b/Makefile
index 451630b..b9e1587 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ PWD = $(shell pwd)
 WORK = $(PWD)/work
 CROSSTOOLS = $(PWD)/../../toolchain/crosstools
 
-KERNEL_VERSION = 2.6.31.14.27-efikamx_20111026
+KERNEL_VERSION = 2.6.31.14.27-efikamx_20130723
 
 .PHONY: all clean image modules map config
 
@@ -18,14 +18,14 @@ clean: image-clean modules-clean map-clean
 
 distclean: clean image-distclean modules-distclean map-distclean
 
-$(WORK)/linux-$(KERNEL_VERSION).tar.bz2:
-	wget -P $(WORK) http://crux-arm.nu/files/distfiles/efikamx/linux-$(KERNEL_VERSION).tar.bz2
+$(WORK)/linux-$(KERNEL_VERSION).tar.xz:
+	wget -P $(WORK) http://crux-arm.nu/files/distfiles/efikamx/linux-$(KERNEL_VERSION).tar.xz
 
-$(WORK)/linux-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION).tar.bz2 $(PWD)/config-$(KERNEL_VERSION)
-	tar -C $(WORK) -xvjf $(WORK)/linux-$(KERNEL_VERSION).tar.bz2
+$(WORK)/linux-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION).tar.xz $(PWD)/config-$(KERNEL_VERSION)
+	tar -C $(WORK) -xvf $(WORK)/linux-$(KERNEL_VERSION).tar.xz
 	cd $(WORK) && \
-		patch -p1 -i $(WORK)/Makefile_arm_unaligned.diff && \
-		sed -e 's|`whoami`|devel|' -e 's|`hostname .*`|crux-arm.nu|' -i linux-$(KERNEL_VERSION)/scripts/mkcompile_h
+		sed -e 's|`whoami`|devel|' -e 's|`hostname .*`|crux-arm.nu|' -i linux-$(KERNEL_VERSION)/scripts/mkcompile_h && \
+		sed 's|rt3070.bin rt2870.bin||g' -i linux-$(KERNEL_VERSION)/firmware/Makefile
 	cp -v $(PWD)/config-$(KERNEL_VERSION) $(WORK)/linux-$(KERNEL_VERSION)/.config
 	touch $(WORK)/linux-$(KERNEL_VERSION)
 
@@ -44,7 +44,7 @@ image-clean:
 	rm -vf $(WORK)/zImage-$(KERNEL_VERSION)
 
 image-distclean: image-clean
-	rm -vrf $(WORK)/linux-$(KERNEL_VERSION) $(WORK)/linux-$(KERNEL_VERSION).tar.bz2
+	rm -vrf $(WORK)/linux-$(KERNEL_VERSION) $(WORK)/linux-$(KERNEL_VERSION).tar.xz
 
 $(WORK)/modules-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION)
 	cd $(WORK)/linux-$(KERNEL_VERSION) && \
diff --git a/config-2.6.31.14.27-efikamx_20111026 b/config-2.6.31.14.27-efikamx_20130723
similarity index 99%
rename from config-2.6.31.14.27-efikamx_20111026
rename to config-2.6.31.14.27-efikamx_20130723
index 508de57..fae4857 100644
--- a/config-2.6.31.14.27-efikamx_20111026
+++ b/config-2.6.31.14.27-efikamx_20130723
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.31.14.27
-# Wed Oct 17 16:45:12 2012
+# Tue Jul 23 13:33:08 2013
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -30,7 +30,6 @@ CONFIG_CONSTRUCTORS=y
 #
 # General setup
 #
-CONFIG_SCHED_BFS=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOCK_KERNEL=y
@@ -59,6 +58,7 @@ CONFIG_RCU_FANOUT=32
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
+# CONFIG_GROUP_SCHED is not set
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_NS=y
@@ -66,6 +66,7 @@ CONFIG_CGROUP_FREEZER=y
 # CONFIG_CGROUP_DEVICE is not set
 CONFIG_CPUSETS=y
 # CONFIG_PROC_PID_CPUSET is not set
+# CONFIG_CGROUP_CPUACCT is not set
 CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_CGROUP_MEM_RES_CTLR is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
@@ -804,9 +805,9 @@ CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set