From 8107abbdeeb588fbf4f1fec598faa08d778197d4 Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Tue, 16 Jun 2015 16:33:52 +0200 Subject: [PATCH] kernel: fix missing device tree, switch to mainline - Add back missing device tree definitions in machine files - Switch to mainline kernel by default - Add description to switch back to sunxi versions in README Signed-off-by: Jens Lucius --- README.md | 13 +++++++++++++ conf/machine/bananapi.conf | 1 + conf/machine/cubieboard.conf | 1 + conf/machine/cubieboard2.conf | 1 + conf/machine/cubietruck.conf | 1 + conf/machine/mele.conf | 1 + conf/machine/olinuxino-a10.conf | 9 --------- conf/machine/olinuxino-a10lime.conf | 1 + conf/machine/olinuxino-a10s.conf | 1 + conf/machine/olinuxino-a13.conf | 1 + conf/machine/olinuxino-a20.conf | 1 + conf/machine/olinuxino-a20lime.conf | 1 + conf/machine/olinuxino-a20lime2.conf | 1 + .../linux/{linux => linux-sunxi}/bananapi/defconfig | 0 .../{linux => linux-sunxi}/cubieboard/defconfig | 0 .../{linux => linux-sunxi}/cubieboard2/defconfig | 0 .../{linux => linux-sunxi}/cubietruck/defconfig | 0 .../{linux => linux-sunxi}/forfun-q88db/defconfig | 0 .../linux/{linux => linux-sunxi}/mele/defconfig | 0 .../linux/{linux => linux-sunxi}/meleg/defconfig | 0 .../{linux => linux-sunxi}/olinuxino-a10/defconfig | 0 .../olinuxino-a10lime/defconfig | 0 .../{linux => linux-sunxi}/olinuxino-a10s/defconfig | 0 .../{linux => linux-sunxi}/olinuxino-a13/defconfig | 0 .../olinuxino-a13som/defconfig | 0 .../{linux => linux-sunxi}/olinuxino-a20/defconfig | 0 .../olinuxino-a20lime/defconfig | 0 .../olinuxino-a20lime2/defconfig | 0 .../olinuxino-a20som/defconfig | 0 .../linux/{linux_3.4.bb => linux-sunxi_3.4.bb} | 0 .../linux/{linux-mainline => linux}/defconfig | 0 .../linux/{linux-mainline_4.0.bb => linux_4.0.bb} | 0 32 files changed, 24 insertions(+), 9 deletions(-) delete mode 100644 conf/machine/olinuxino-a10.conf rename recipes-kernel/linux/{linux => linux-sunxi}/bananapi/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/cubieboard/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/cubieboard2/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/cubietruck/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/forfun-q88db/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/mele/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/meleg/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/olinuxino-a10/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/olinuxino-a10lime/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/olinuxino-a10s/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/olinuxino-a13/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/olinuxino-a13som/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/olinuxino-a20/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/olinuxino-a20lime/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/olinuxino-a20lime2/defconfig (100%) rename recipes-kernel/linux/{linux => linux-sunxi}/olinuxino-a20som/defconfig (100%) rename recipes-kernel/linux/{linux_3.4.bb => linux-sunxi_3.4.bb} (100%) rename recipes-kernel/linux/{linux-mainline => linux}/defconfig (100%) rename recipes-kernel/linux/{linux-mainline_4.0.bb => linux_4.0.bb} (100%) diff --git a/README.md b/README.md index 574c32e..3d5edcd 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,19 @@ Maintainers: * Enrico Butera * Sergey Lapin +Kernel / U-Boot Version +=========== +Most Allwinner devices and hardware are supported in mainline kernel and U-Boot, so this layer builds mainline by default. +There is a custom U-Boot and Kernel version for sunxi devices which includes some special drivers not mainlined. +These versions are rather old (3.4 for kernel and 2014.04 for U-Boot), but may support more functions and devices than current mainline + +If you want to switch back to sunxi versions for some reasons (no device tree available, unsupported hardware), change the file +/conf/machine/include/sunxi.inc +and set "PREFERRED_PROVIDER_u-boot" and "PREFERRED_PROVIDER_virtual/bootloader" to "u-boot-sunxi" and PREFERRED_PROVIDER_virtual/kernel to "linux-sunxi". + +If you already have built the mainline versions it might be necessary to reset the build directories with: +bitbake -c clean linux +bitbake -c clean u-boot Performance diff --git a/conf/machine/bananapi.conf b/conf/machine/bananapi.conf index 6af0a59..581efd0 100644 --- a/conf/machine/bananapi.conf +++ b/conf/machine/bananapi.conf @@ -4,5 +4,6 @@ require conf/machine/include/sun7i.inc +KERNEL_DEVICETREE = "sun7i-a20-bananapi.dtb" UBOOT_MACHINE = "Bananapi_config" SUNXI_FEX_FILE = "sys_config/a20/Bananapi.fex" \ No newline at end of file diff --git a/conf/machine/cubieboard.conf b/conf/machine/cubieboard.conf index 1bf20a1..0862823 100644 --- a/conf/machine/cubieboard.conf +++ b/conf/machine/cubieboard.conf @@ -4,5 +4,6 @@ require conf/machine/include/sun4i.inc +KERNEL_DEVICETREE = "sun4i-a10-cubieboard.dtb" UBOOT_MACHINE = "Cubieboard_config" SUNXI_FEX_FILE = "sys_config/a10/cubieboard.fex" diff --git a/conf/machine/cubieboard2.conf b/conf/machine/cubieboard2.conf index 5aa31f5..9bc04f0 100644 --- a/conf/machine/cubieboard2.conf +++ b/conf/machine/cubieboard2.conf @@ -4,5 +4,6 @@ require conf/machine/include/sun7i.inc +KERNEL_DEVICETREE = "sun7i-a20-cubieboard2.dtb UBOOT_MACHINE = "Cubieboard_config" SUNXI_FEX_FILE = "sys_config/a20/cubieboard2.fex" \ No newline at end of file diff --git a/conf/machine/cubietruck.conf b/conf/machine/cubietruck.conf index 610390c..4e16a10 100644 --- a/conf/machine/cubietruck.conf +++ b/conf/machine/cubietruck.conf @@ -4,5 +4,6 @@ require conf/machine/include/sun7i.inc +KERNEL_DEVICETREE = "sun7i-a20-cubietruck.dtb" UBOOT_MACHINE = "Cubietruck_config" SUNXI_FEX_FILE = "sys_config/a20/cubietruck.fex" \ No newline at end of file diff --git a/conf/machine/mele.conf b/conf/machine/mele.conf index ab81276..6f31c51 100644 --- a/conf/machine/mele.conf +++ b/conf/machine/mele.conf @@ -4,5 +4,6 @@ require conf/machine/include/sun4i.inc +KERNEL_DEVICETREE = "sun4i-a10-a1000.dtb" UBOOT_MACHINE = "Mele_A1000_config" SUNXI_FEX_FILE = "sys_config/a10/mele_a1000.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a10.conf b/conf/machine/olinuxino-a10.conf deleted file mode 100644 index f2d3ff7..0000000 --- a/conf/machine/olinuxino-a10.conf +++ /dev/null @@ -1,9 +0,0 @@ -#@TYPE: Machine -#@NAME: Olimex A10-OLinuXino-LIME Board -#@DESCRIPTION: Machine configuration for Olimex A10-OLinuXino-LIME Board, based on Allwinner A10 CPU -#https://github.com/OLIMEX/OLINUXINO - -require conf/machine/include/sun4i.inc - -UBOOT_MACHINE = "A10-OLinuXino-Lime_config" -SUNXI_FEX_FILE = "sys_config/a10/a10-olinuxino-lime.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a10lime.conf b/conf/machine/olinuxino-a10lime.conf index 16ffcf6..6827e17 100644 --- a/conf/machine/olinuxino-a10lime.conf +++ b/conf/machine/olinuxino-a10lime.conf @@ -5,5 +5,6 @@ require conf/machine/include/sun4i.inc +KERNEL_DEVICETREE = "sun4i-a10-olinuxino-lime.dtb" UBOOT_MACHINE = "A10-OLinuXino-Lime_config" SUNXI_FEX_FILE = "sys_config/a10/a10-olinuxino-lime.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a10s.conf b/conf/machine/olinuxino-a10s.conf index 89e72d7..645e9aa 100644 --- a/conf/machine/olinuxino-a10s.conf +++ b/conf/machine/olinuxino-a10s.conf @@ -5,5 +5,6 @@ require conf/machine/include/sun5i.inc +KERNEL_DEVICETREE = "sun5i-a10s-olinuxino-micro.dtb" UBOOT_MACHINE = "A10s-OLinuXino-Micro_config" SUNXI_FEX_FILE = "sys_config/a10s/a10s-olinuxino-m.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a13.conf b/conf/machine/olinuxino-a13.conf index 34b3016..d73f622 100644 --- a/conf/machine/olinuxino-a13.conf +++ b/conf/machine/olinuxino-a13.conf @@ -5,5 +5,6 @@ require conf/machine/include/sun5i.inc +KERNEL_DEVICETREE = "sun5i-a13-olinuxino.dtb" UBOOT_MACHINE = "A13-OLinuXino_config" SUNXI_FEX_FILE = "sys_config/a13/a13-olinuxino.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a20.conf b/conf/machine/olinuxino-a20.conf index 01c4336..4674b73 100644 --- a/conf/machine/olinuxino-a20.conf +++ b/conf/machine/olinuxino-a20.conf @@ -5,5 +5,6 @@ require conf/machine/include/sun7i.inc +KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime.dtb" UBOOT_MACHINE = "A20-OLinuXino-Micro_config" SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_micro.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a20lime.conf b/conf/machine/olinuxino-a20lime.conf index 2c13243..aaa6dac 100644 --- a/conf/machine/olinuxino-a20lime.conf +++ b/conf/machine/olinuxino-a20lime.conf @@ -5,5 +5,6 @@ require conf/machine/include/sun7i.inc +KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime.dtb" UBOOT_MACHINE = "A20-OLinuXino-Lime_config" SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a20lime2.conf b/conf/machine/olinuxino-a20lime2.conf index e55149b..b40ebaf 100644 --- a/conf/machine/olinuxino-a20lime2.conf +++ b/conf/machine/olinuxino-a20lime2.conf @@ -5,5 +5,6 @@ require conf/machine/include/sun7i.inc +KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime2.dtb" UBOOT_MACHINE = "A20-OLinuXino_Lime2_config" SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime2.fex" \ No newline at end of file diff --git a/recipes-kernel/linux/linux/bananapi/defconfig b/recipes-kernel/linux/linux-sunxi/bananapi/defconfig similarity index 100% rename from recipes-kernel/linux/linux/bananapi/defconfig rename to recipes-kernel/linux/linux-sunxi/bananapi/defconfig diff --git a/recipes-kernel/linux/linux/cubieboard/defconfig b/recipes-kernel/linux/linux-sunxi/cubieboard/defconfig similarity index 100% rename from recipes-kernel/linux/linux/cubieboard/defconfig rename to recipes-kernel/linux/linux-sunxi/cubieboard/defconfig diff --git a/recipes-kernel/linux/linux/cubieboard2/defconfig b/recipes-kernel/linux/linux-sunxi/cubieboard2/defconfig similarity index 100% rename from recipes-kernel/linux/linux/cubieboard2/defconfig rename to recipes-kernel/linux/linux-sunxi/cubieboard2/defconfig diff --git a/recipes-kernel/linux/linux/cubietruck/defconfig b/recipes-kernel/linux/linux-sunxi/cubietruck/defconfig similarity index 100% rename from recipes-kernel/linux/linux/cubietruck/defconfig rename to recipes-kernel/linux/linux-sunxi/cubietruck/defconfig diff --git a/recipes-kernel/linux/linux/forfun-q88db/defconfig b/recipes-kernel/linux/linux-sunxi/forfun-q88db/defconfig similarity index 100% rename from recipes-kernel/linux/linux/forfun-q88db/defconfig rename to recipes-kernel/linux/linux-sunxi/forfun-q88db/defconfig diff --git a/recipes-kernel/linux/linux/mele/defconfig b/recipes-kernel/linux/linux-sunxi/mele/defconfig similarity index 100% rename from recipes-kernel/linux/linux/mele/defconfig rename to recipes-kernel/linux/linux-sunxi/mele/defconfig diff --git a/recipes-kernel/linux/linux/meleg/defconfig b/recipes-kernel/linux/linux-sunxi/meleg/defconfig similarity index 100% rename from recipes-kernel/linux/linux/meleg/defconfig rename to recipes-kernel/linux/linux-sunxi/meleg/defconfig diff --git a/recipes-kernel/linux/linux/olinuxino-a10/defconfig b/recipes-kernel/linux/linux-sunxi/olinuxino-a10/defconfig similarity index 100% rename from recipes-kernel/linux/linux/olinuxino-a10/defconfig rename to recipes-kernel/linux/linux-sunxi/olinuxino-a10/defconfig diff --git a/recipes-kernel/linux/linux/olinuxino-a10lime/defconfig b/recipes-kernel/linux/linux-sunxi/olinuxino-a10lime/defconfig similarity index 100% rename from recipes-kernel/linux/linux/olinuxino-a10lime/defconfig rename to recipes-kernel/linux/linux-sunxi/olinuxino-a10lime/defconfig diff --git a/recipes-kernel/linux/linux/olinuxino-a10s/defconfig b/recipes-kernel/linux/linux-sunxi/olinuxino-a10s/defconfig similarity index 100% rename from recipes-kernel/linux/linux/olinuxino-a10s/defconfig rename to recipes-kernel/linux/linux-sunxi/olinuxino-a10s/defconfig diff --git a/recipes-kernel/linux/linux/olinuxino-a13/defconfig b/recipes-kernel/linux/linux-sunxi/olinuxino-a13/defconfig similarity index 100% rename from recipes-kernel/linux/linux/olinuxino-a13/defconfig rename to recipes-kernel/linux/linux-sunxi/olinuxino-a13/defconfig diff --git a/recipes-kernel/linux/linux/olinuxino-a13som/defconfig b/recipes-kernel/linux/linux-sunxi/olinuxino-a13som/defconfig similarity index 100% rename from recipes-kernel/linux/linux/olinuxino-a13som/defconfig rename to recipes-kernel/linux/linux-sunxi/olinuxino-a13som/defconfig diff --git a/recipes-kernel/linux/linux/olinuxino-a20/defconfig b/recipes-kernel/linux/linux-sunxi/olinuxino-a20/defconfig similarity index 100% rename from recipes-kernel/linux/linux/olinuxino-a20/defconfig rename to recipes-kernel/linux/linux-sunxi/olinuxino-a20/defconfig diff --git a/recipes-kernel/linux/linux/olinuxino-a20lime/defconfig b/recipes-kernel/linux/linux-sunxi/olinuxino-a20lime/defconfig similarity index 100% rename from recipes-kernel/linux/linux/olinuxino-a20lime/defconfig rename to recipes-kernel/linux/linux-sunxi/olinuxino-a20lime/defconfig diff --git a/recipes-kernel/linux/linux/olinuxino-a20lime2/defconfig b/recipes-kernel/linux/linux-sunxi/olinuxino-a20lime2/defconfig similarity index 100% rename from recipes-kernel/linux/linux/olinuxino-a20lime2/defconfig rename to recipes-kernel/linux/linux-sunxi/olinuxino-a20lime2/defconfig diff --git a/recipes-kernel/linux/linux/olinuxino-a20som/defconfig b/recipes-kernel/linux/linux-sunxi/olinuxino-a20som/defconfig similarity index 100% rename from recipes-kernel/linux/linux/olinuxino-a20som/defconfig rename to recipes-kernel/linux/linux-sunxi/olinuxino-a20som/defconfig diff --git a/recipes-kernel/linux/linux_3.4.bb b/recipes-kernel/linux/linux-sunxi_3.4.bb similarity index 100% rename from recipes-kernel/linux/linux_3.4.bb rename to recipes-kernel/linux/linux-sunxi_3.4.bb diff --git a/recipes-kernel/linux/linux-mainline/defconfig b/recipes-kernel/linux/linux/defconfig similarity index 100% rename from recipes-kernel/linux/linux-mainline/defconfig rename to recipes-kernel/linux/linux/defconfig diff --git a/recipes-kernel/linux/linux-mainline_4.0.bb b/recipes-kernel/linux/linux_4.0.bb similarity index 100% rename from recipes-kernel/linux/linux-mainline_4.0.bb rename to recipes-kernel/linux/linux_4.0.bb