From 941e978370cc714089acda9bf9c0f5672a7182a6 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Tue, 17 May 2016 21:59:36 +0300 Subject: [PATCH 1/3] Add support for pcduino devices Add support for LinkSprite pcDuino1 device and its flavors including pcduino-lite and pcduino-lite-wifi: - add pcduino machine description - enable CONFIG_SPI_SPIDEV in upstream kernel defconfig to provide simple userspace access to SPI devices on Arduino shields Signed-off-by: Sergey Matyukevich --- conf/machine/pcduino.conf | 9 +++++++++ recipes-kernel/linux/linux/defconfig | 1 + 2 files changed, 10 insertions(+) create mode 100644 conf/machine/pcduino.conf diff --git a/conf/machine/pcduino.conf b/conf/machine/pcduino.conf new file mode 100644 index 0000000..8adb51e --- /dev/null +++ b/conf/machine/pcduino.conf @@ -0,0 +1,9 @@ +#@TYPE: Machine +#@NAME: pcduino-lite-wifi +#@DESCRIPTION: Machine configuration for the pcDuino-Lite-Wifi, base on allwinner a10 CPU + +require conf/machine/include/sun4i.inc + +KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb" +UBOOT_MACHINE = "Linksprite_pcDuino_defconfig" +SUNXI_FEX_FILE = "sys_config/a10/pcduino.fex" diff --git a/recipes-kernel/linux/linux/defconfig b/recipes-kernel/linux/linux/defconfig index c1737b9..73192d8 100644 --- a/recipes-kernel/linux/linux/defconfig +++ b/recipes-kernel/linux/linux/defconfig @@ -504,6 +504,7 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_MV64XXX=y CONFIG_I2C_SUN6I_P2WI=y CONFIG_SPI=y +CONFIG_SPI_SPIDEV=y CONFIG_SPI_SUN4I=y CONFIG_SPI_SUN6I=y CONFIG_GPIO_SYSFS=y From 3830f90aaa81c0a806448a28c8b839517b08c86b Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Sat, 4 Jun 2016 17:58:10 -0400 Subject: [PATCH 2/3] sunxi-mali_git: fix make args Previously ${EXTRA_OECONF} had been added to the 'make' invocations, but this doesn't work if, say, EXTRA_OECONF is set to '--disable-shared'. What was probably meant was to add ${EXTRA_OEMAKE}. Signed-off-by: Trevor Woerner --- recipes-graphics/libgles/sunxi-mali_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-graphics/libgles/sunxi-mali_git.bb b/recipes-graphics/libgles/sunxi-mali_git.bb index 511e5d0..91ead0d 100644 --- a/recipes-graphics/libgles/sunxi-mali_git.bb +++ b/recipes-graphics/libgles/sunxi-mali_git.bb @@ -33,7 +33,7 @@ INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" do_configure() { - DESTDIR=${D}/ VERSION=r3p0 ABI=armhf ${EXTRA_OECONF} make config + DESTDIR=${D}/ VERSION=r3p0 ABI=armhf make ${EXTRA_OEMAKE} config } do_install() { @@ -72,7 +72,7 @@ do_install() { ln -sf libMali.so.3 ${D}${libdir}/$flib done - DESTDIR=${D}/ VERSION=r3p0 ABI=armhf ${EXTRA_OECONF} make test + DESTDIR=${D}/ VERSION=r3p0 ABI=armhf make ${EXTRA_OEMAKE} test install -d ${D}${bindir} install -m 0755 ${S}/test/test ${D}${bindir}/sunximali-test } From 9b77af849d1deef2f52b1061a4758843d08073f0 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Sat, 4 Jun 2016 18:00:15 -0400 Subject: [PATCH 3/3] sunxi-mali_git: base_contains() -> bb.utils.contains() base_contains() is deprecated in favour of bb.utils.contains(). Signed-off-by: Trevor Woerner --- recipes-graphics/libgles/sunxi-mali_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-graphics/libgles/sunxi-mali_git.bb b/recipes-graphics/libgles/sunxi-mali_git.bb index 91ead0d..fd9cbb1 100644 --- a/recipes-graphics/libgles/sunxi-mali_git.bb +++ b/recipes-graphics/libgles/sunxi-mali_git.bb @@ -23,7 +23,7 @@ S = "${WORKDIR}/git" DEPENDS = "libdrm dri2proto libump" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" PACKAGECONFIG[wayland] = "EGL_TYPE=framebuffer,,," PACKAGECONFIG[x11] = "EGL_TYPE=x11,,virtual/libx11 libxau libxdmcp libdri2,"