From 93458a0ecf099f1fe74abebdc601923b02dcfff6 Mon Sep 17 00:00:00 2001 From: Denys Drozdov Date: Tue, 9 Nov 2021 09:14:49 +0200 Subject: ARM: configs: apalis-imx6: fix android config apalis_imx6_android_defconfig Update android config file to avoid the following build errors: arm-none-linux-gnueabihf-ld: drivers/built-in.o: in function `gckOS_CreateSyncTimeline': core.c:(.text+0x2736a8): undefined reference to `viv_sync_timeline_create' arm-none-linux-gnueabihf-ld: drivers/built-in.o: in function `gckOS_DestroySyncTimeline': core.c:(.text+0x2736d4): undefined reference to `viv_sync_timeline_destroy' arm-none-linux-gnueabihf-ld: drivers/built-in.o: in function `gckOS_CreateNativeFence': core.c:(.text+0x273720): undefined reference to `viv_fence_create' arm-none-linux-gnueabihf-ld: core.c:(.text+0x27372c): undefined reference to `sync_file_create' arm-none-linux-gnueabihf-ld: drivers/built-in.o: in function `gckOS_WaitNativeFence': core.c:(.text+0x273804): undefined reference to `sync_file_get_fence' arm-none-linux-gnueabihf-ld: arch/arm/mach-imx/built-in.o: in function `imx6sl_enter_wait': platform-imx-dma.c:(.text+0x380): undefined reference to `psci_ops' arm-none-linux-gnueabihf-ld: platform-imx-dma.c:(.text+0x384): undefined reference to `psci_ops' Makefile:1016: recipe for target 'vmlinux' failed make[1]: *** [vmlinux] Error 1 Makefile:536: recipe for target '__build_one_by_one' failed make: *** [__build_one_by_one] Error 2 Signed-off-by: Denys Drozdov --- arch/arm/configs/apalis_imx6_android_defconfig | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/arm/configs/apalis_imx6_android_defconfig b/arch/arm/configs/apalis_imx6_android_defconfig index a0769007aed2..74b32c18dd33 100644 --- a/arch/arm/configs/apalis_imx6_android_defconfig +++ b/arch/arm/configs/apalis_imx6_android_defconfig @@ -329,7 +329,7 @@ CONFIG_HAVE_IMX_SRC=y # # CONFIG_SOC_IMX53 is not set CONFIG_SOC_IMX6Q=y -CONFIG_SOC_IMX6SL=y +# CONFIG_SOC_IMX6SL is not set # CONFIG_SOC_VF610 is not set # CONFIG_ARCH_OMAP2PLUS is not set # CONFIG_ARCH_SOCFPGA is not set @@ -419,8 +419,8 @@ CONFIG_PCIE_DW=y CONFIG_PCI_IMX6=y CONFIG_PCI_FORCE_GEN1=y # CONFIG_EP_MODE_IN_EP_RC_SYS is not set -CONFIG_RC_MODE_IN_EP_RC_SYS=y -CONFIG_PCI_IMX_EP_DRV=y +# CONFIG_RC_MODE_IN_EP_RC_SYS is not set +# CONFIG_PCI_IMX_EP_DRV is not set # CONFIG_PCCARD is not set # @@ -2074,7 +2074,7 @@ CONFIG_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set CONFIG_PINCTRL_IMX=y CONFIG_PINCTRL_IMX6Q=y -CONFIG_PINCTRL_IMX6SL=y +# CONFIG_PINCTRL_IMX6SL is not set # CONFIG_PINCTRL_SINGLE is not set # CONFIG_PINCTRL_EXYNOS is not set # CONFIG_PINCTRL_EXYNOS5440 is not set @@ -3489,6 +3489,15 @@ CONFIG_DMA_OF=y # CONFIG_UIO is not set # CONFIG_VIRT_DRIVERS is not set +# +# DMABUF options +# +CONFIG_SYNC_FILE=y +# CONFIG_SW_SYNC is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set +# CONFIG_VIRT_DRIVERS is not set + # # Virtio drivers # -- cgit v1.2.3