diff options
| -rw-r--r-- | mk/rootfs.mk | 2 | ||||
| -rw-r--r-- | target/arm/kernel/solidrun-imx6 | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.bus | 6 | ||||
| -rw-r--r-- | target/linux/config/Config.in.misc | 10 |
4 files changed, 18 insertions, 2 deletions
diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 360e41083..0d273a30e 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -44,7 +44,7 @@ BLOCKDEV:= root=/dev/mmcblk0p2 endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) -BLOCKDEV:= root=/dev/mmcblk0p1 +BLOCKDEV:= root=/dev/mmcblk1p1 endif ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) diff --git a/target/arm/kernel/solidrun-imx6 b/target/arm/kernel/solidrun-imx6 index af4888d09..1a694f75c 100644 --- a/target/arm/kernel/solidrun-imx6 +++ b/target/arm/kernel/solidrun-imx6 @@ -8,6 +8,6 @@ CONFIG_SOC_IMX6SL=y CONFIG_LOCAL_TIMERS=y CONFIG_MXC_DEBUG_BOARD=y CONFIG_KUSER_HELPERS=y -CONFIG_PCI_IMX6=y CONFIG_PM_SLEEP=y CONFIG_ATAGS=y +CONFIG_CMDLINE_FORCE=y diff --git a/target/linux/config/Config.in.bus b/target/linux/config/Config.in.bus index 351b09f41..f7f5e82fc 100644 --- a/target/linux/config/Config.in.bus +++ b/target/linux/config/Config.in.bus @@ -15,3 +15,9 @@ config ADK_KERNEL_PCI_QUIRKS config ADK_KERNEL_PCI_MSI bool + +config ADK_KERNEL_PCI_IMX6 + bool + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + default n diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index ec7b5afb4..185f435c2 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -67,6 +67,16 @@ source "target/linux/config/Config.in.gpio" source "target/linux/config/Config.in.dma" source "target/linux/config/Config.in.lib" +config ADK_KERNEL_PWM + bool + +config ADK_KERNEL_PWM_IMX + bool + select ADK_KERNEL_PWM + depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + default n + config ADK_KERNEL_KEXEC bool "Add KEXEC syscall" help |