From 59d8ed7275d8393e44893500ffda104b56e8c4ee Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 17 Feb 2014 10:12:18 +0100 Subject: [PATCH 1/4] linux: update to latest git/3.4.79 Also update defconfigs with upstream changes to enable CMA. Runtime tested on Olinuxino-a13/Angstrom Signed-off-by: Koen Kooi --- recipes-kernel/linux/linux/cubieboard/defconfig | 5 +++++ recipes-kernel/linux/linux/cubieboard2/defconfig | 5 +++++ recipes-kernel/linux/linux/cubietruck/defconfig | 5 +++++ recipes-kernel/linux/linux/mele/defconfig | 5 +++++ recipes-kernel/linux/linux/meleg/defconfig | 5 +++++ recipes-kernel/linux/linux/olinuxino-a10s/defconfig | 5 +++++ recipes-kernel/linux/linux/olinuxino-a13/defconfig | 5 +++++ recipes-kernel/linux/linux/olinuxino-a20/defconfig | 5 +++++ recipes-kernel/linux/linux_3.4.bb | 6 ++---- 9 files changed, 42 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux/cubieboard/defconfig b/recipes-kernel/linux/linux/cubieboard/defconfig index 01fa1e2..648b13d 100644 --- a/recipes-kernel/linux/linux/cubieboard/defconfig +++ b/recipes-kernel/linux/linux/cubieboard/defconfig @@ -319,3 +319,8 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_HW is not set CONFIG_LIBCRC32C=y CONFIG_AVERAGE=y +CONFIG_CMA=y +CONFIG_CMA_SIZE_MBYTES=192 +CONFIG_W1=m +CONFIG_W1_SUNXI=m +CONFIG_W1_MASTER_GPIO=m diff --git a/recipes-kernel/linux/linux/cubieboard2/defconfig b/recipes-kernel/linux/linux/cubieboard2/defconfig index 2bdad9d..a4850bf 100644 --- a/recipes-kernel/linux/linux/cubieboard2/defconfig +++ b/recipes-kernel/linux/linux/cubieboard2/defconfig @@ -4048,3 +4048,8 @@ CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y # CONFIG_CORDIC is not set +CONFIG_CMA=y +CONFIG_CMA_SIZE_MBYTES=192 +CONFIG_W1=m +CONFIG_W1_SUNXI=m +CONFIG_W1_MASTER_GPIO=m diff --git a/recipes-kernel/linux/linux/cubietruck/defconfig b/recipes-kernel/linux/linux/cubietruck/defconfig index 73ec075..22b9815 100644 --- a/recipes-kernel/linux/linux/cubietruck/defconfig +++ b/recipes-kernel/linux/linux/cubietruck/defconfig @@ -1216,3 +1216,8 @@ CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_LIBCRC32C=y +CONFIG_CMA=y +CONFIG_CMA_SIZE_MBYTES=192 +CONFIG_W1=m +CONFIG_W1_SUNXI=m +CONFIG_W1_MASTER_GPIO=m diff --git a/recipes-kernel/linux/linux/mele/defconfig b/recipes-kernel/linux/linux/mele/defconfig index a24d8f8..2372e88 100644 --- a/recipes-kernel/linux/linux/mele/defconfig +++ b/recipes-kernel/linux/linux/mele/defconfig @@ -2505,3 +2505,8 @@ CONFIG_DQL=y CONFIG_NLATTR=y CONFIG_AVERAGE=y # CONFIG_CORDIC is not set +CONFIG_CMA=y +CONFIG_CMA_SIZE_MBYTES=192 +CONFIG_W1=m +CONFIG_W1_SUNXI=m +CONFIG_W1_MASTER_GPIO=m diff --git a/recipes-kernel/linux/linux/meleg/defconfig b/recipes-kernel/linux/linux/meleg/defconfig index a24d8f8..2372e88 100644 --- a/recipes-kernel/linux/linux/meleg/defconfig +++ b/recipes-kernel/linux/linux/meleg/defconfig @@ -2505,3 +2505,8 @@ CONFIG_DQL=y CONFIG_NLATTR=y CONFIG_AVERAGE=y # CONFIG_CORDIC is not set +CONFIG_CMA=y +CONFIG_CMA_SIZE_MBYTES=192 +CONFIG_W1=m +CONFIG_W1_SUNXI=m +CONFIG_W1_MASTER_GPIO=m diff --git a/recipes-kernel/linux/linux/olinuxino-a10s/defconfig b/recipes-kernel/linux/linux/olinuxino-a10s/defconfig index afd8f3a..a6cede6 100644 --- a/recipes-kernel/linux/linux/olinuxino-a10s/defconfig +++ b/recipes-kernel/linux/linux/olinuxino-a10s/defconfig @@ -269,3 +269,8 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_HW is not set CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y +CONFIG_CMA=y +CONFIG_CMA_SIZE_MBYTES=192 +CONFIG_W1=m +CONFIG_W1_SUNXI=m +CONFIG_W1_MASTER_GPIO=m diff --git a/recipes-kernel/linux/linux/olinuxino-a13/defconfig b/recipes-kernel/linux/linux/olinuxino-a13/defconfig index 52907ce..198e99d 100644 --- a/recipes-kernel/linux/linux/olinuxino-a13/defconfig +++ b/recipes-kernel/linux/linux/olinuxino-a13/defconfig @@ -313,3 +313,8 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_HW is not set CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y +CONFIG_CMA=y +CONFIG_CMA_SIZE_MBYTES=192 +CONFIG_W1=m +CONFIG_W1_SUNXI=m +CONFIG_W1_MASTER_GPIO=m diff --git a/recipes-kernel/linux/linux/olinuxino-a20/defconfig b/recipes-kernel/linux/linux/olinuxino-a20/defconfig index 73ec075..22b9815 100644 --- a/recipes-kernel/linux/linux/olinuxino-a20/defconfig +++ b/recipes-kernel/linux/linux/olinuxino-a20/defconfig @@ -1216,3 +1216,8 @@ CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_LIBCRC32C=y +CONFIG_CMA=y +CONFIG_CMA_SIZE_MBYTES=192 +CONFIG_W1=m +CONFIG_W1_SUNXI=m +CONFIG_W1_MASTER_GPIO=m diff --git a/recipes-kernel/linux/linux_3.4.bb b/recipes-kernel/linux/linux_3.4.bb index fae5990..b39885a 100644 --- a/recipes-kernel/linux/linux_3.4.bb +++ b/recipes-kernel/linux/linux_3.4.bb @@ -6,11 +6,9 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "(mele|meleg|olinuxino-a13|olinuxino-a10s|olinuxino-a20|cubieboard|cubieboard2|cubietruck)" -PR = "15" - -PV = "3.4.67" +PV = "3.4.79" # Last tested version by myself" -SRCREV_pn-${PN} = "a7350cb6a9ec1aae510e26cdc730f05f12e13f9f" +SRCREV_pn-${PN} = "8ea347bcb4b4a5e50ec0343afac579e933ce8402" MACHINE_KERNEL_PR_append = "a" From c8e0d443073a8692a0fbe1d4bd11286bafb641fa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 18 Feb 2014 09:16:05 +0100 Subject: [PATCH 2/4] linux: disable TI and Whiteheat serial drivers The firmware for these drivers breaks parallel make install with recent versions of make: | make[1]: *** No rule to make target `/build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/work/olinuxino_a20-angstrom-linux-gnueabi/linux/3.4.79-r0/image/lib/firmware/./', needed by `/build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/work/olinuxino_a20-angstrom-linux-gnueabi/linux/3.4.79-r0/image/lib/firmware/ti_3410.fw'. Stop. Since both of them are rarely used and virtually never on ARM systems just disable them. Signed-off-by: Koen Kooi --- recipes-kernel/linux/linux/cubietruck/defconfig | 4 ++-- recipes-kernel/linux/linux/olinuxino-a20/defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux/cubietruck/defconfig b/recipes-kernel/linux/linux/cubietruck/defconfig index 22b9815..750b333 100644 --- a/recipes-kernel/linux/linux/cubietruck/defconfig +++ b/recipes-kernel/linux/linux/cubietruck/defconfig @@ -970,7 +970,7 @@ CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_WHITEHEAT=n CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_CP210X=m CONFIG_USB_SERIAL_CYPRESS_M8=m @@ -1006,7 +1006,7 @@ CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SIEMENS_MPI=m CONFIG_USB_SERIAL_SIERRAWIRELESS=m CONFIG_USB_SERIAL_SYMBOL=m -CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_TI=n CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_OPTION=m diff --git a/recipes-kernel/linux/linux/olinuxino-a20/defconfig b/recipes-kernel/linux/linux/olinuxino-a20/defconfig index 22b9815..750b333 100644 --- a/recipes-kernel/linux/linux/olinuxino-a20/defconfig +++ b/recipes-kernel/linux/linux/olinuxino-a20/defconfig @@ -970,7 +970,7 @@ CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_WHITEHEAT=n CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_CP210X=m CONFIG_USB_SERIAL_CYPRESS_M8=m @@ -1006,7 +1006,7 @@ CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SIEMENS_MPI=m CONFIG_USB_SERIAL_SIERRAWIRELESS=m CONFIG_USB_SERIAL_SYMBOL=m -CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_TI=n CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_OPTION=m From a992bf3a0686f644e9705ac4a395b48194d87d24 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 18 Feb 2014 10:43:05 +0100 Subject: [PATCH 3/4] linux: enable cpufreq for olinuxino-a13 Signed-off-by: Koen Kooi --- recipes-kernel/linux/linux/olinuxino-a13/defconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/recipes-kernel/linux/linux/olinuxino-a13/defconfig b/recipes-kernel/linux/linux/olinuxino-a13/defconfig index 198e99d..f6fe181 100644 --- a/recipes-kernel/linux/linux/olinuxino-a13/defconfig +++ b/recipes-kernel/linux/linux/olinuxino-a13/defconfig @@ -318,3 +318,13 @@ CONFIG_CMA_SIZE_MBYTES=192 CONFIG_W1=m CONFIG_W1_SUNXI=m CONFIG_W1_MASTER_GPIO=m +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_INTERACTIVE=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_USR_EVNT_NOTIFY=y +CONFIG_CPU_FREQ_DVFS=y +CONFIG_CPU_IDLE=y From 4c40f31901cbc4b7194da69d197a77a4e12064c3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 18 Feb 2014 10:44:36 +0100 Subject: [PATCH 4/4] linux: import EHCI defconfig changes from upstream for olinuxino-a20 Signed-off-by: Koen Kooi --- recipes-kernel/linux/linux/olinuxino-a20/defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-kernel/linux/linux/olinuxino-a20/defconfig b/recipes-kernel/linux/linux/olinuxino-a20/defconfig index 750b333..c6b5bfc 100644 --- a/recipes-kernel/linux/linux/olinuxino-a20/defconfig +++ b/recipes-kernel/linux/linux/olinuxino-a20/defconfig @@ -1221,3 +1221,6 @@ CONFIG_CMA_SIZE_MBYTES=192 CONFIG_W1=m CONFIG_W1_SUNXI=m CONFIG_W1_MASTER_GPIO=m +CONFIG_USB_SW_SUNXI_USB=y +CONFIG_USB_SW_SUNXI_USB_MANAGER=y +CONFIG_USB_SW_SUNXI_USB_DEBUG=y