summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-01-20 02:10:29 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2017-01-20 02:10:29 +0100
commit56f26fe87cd84869f2b2d2f88b6636d865932ca6 (patch)
tree3ed144a341fb18ef1eaab3ef063ebc54527fd461 /target
parentb9f32040f8a7a7efb036097c609502971ae5dcca (diff)
solidrun-imx6: fix bootup, root dev is now recognized as mmcblk1p1
Diffstat (limited to 'target')
-rw-r--r--target/arm/kernel/solidrun-imx62
-rw-r--r--target/linux/config/Config.in.bus6
-rw-r--r--target/linux/config/Config.in.misc10
3 files changed, 17 insertions, 1 deletions
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