MLK-14475 soc: imx: fix build error after enable rpmsg

- fix the wrong path of header file
- select MU/RPMSG when iMX8 is configured

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>

diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
index e6e90e8..ecd8619 100644 (file)
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@ -3,6 +3,7 @@ menu "SOC (System On Chip) specific Drivers"
 source "drivers/soc/bcm/Kconfig"
 source "drivers/soc/fsl/qbman/Kconfig"
 source "drivers/soc/fsl/qe/Kconfig"
+source "drivers/soc/imx/Kconfig"
 source "drivers/soc/mediatek/Kconfig"
 source "drivers/soc/qcom/Kconfig"
 source "drivers/soc/rockchip/Kconfig"

diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig
new file mode 100644 (file)
index 0000000..390e599
--- /dev/null
+++ b/drivers/soc/imx/Kconfig
@@ -0,0 +1,28 @@
+#
+# IMX Soc drivers
+#
+menu "NXP IMX SoC drivers"
+
+config ARCH_FSL_IMX8QM
+       bool "i.MX8QM"
+       select HAVE_IMX_MU
+       select HAVE_IMX_RPMSG
+
+config ARCH_FSL_IMX8QXP
+       bool "i.MX8QXP"
+       select HAVE_IMX_MU
+       select HAVE_IMX_RPMSG
+
+config ARCH_FSL_IMX8MQ
+       bool "i.MX8MQ"
+       select HAVE_IMX_MU
+       select HAVE_IMX_RPMSG
+
+config HAVE_IMX_MU
+       bool
+
+config HAVE_IMX_RPMSG
+       select RPMSG_VIRTIO
+       select RPMSG
+       bool
+endmenu

diff --git a/drivers/soc/imx/sc/main/ipc.c b/drivers/soc/imx/sc/main/ipc.c
index bec3fc8..d6b4478 100644 (file)
--- a/drivers/soc/imx/sc/main/ipc.c
+++ b/drivers/soc/imx/sc/main/ipc.c
@@ -15,12 +15,12 @@
 #include <linux/of_fdt.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/mx8_mu.h>
 
 #include <soc/imx8/sc/svc/irq/api.h>
 #include <soc/imx8/sc/ipc.h>
 #include <soc/imx8/sc/sci.h>
 
-#include "../../mu/mx8_mu.h"
 #include "rpc.h"
 
 /* Local Defines */