Browse Source

solidrun-imx6: fix bootup, root dev is now recognized as mmcblk1p1

Waldemar Brodkorb 7 years ago
parent
commit
56f26fe87c

+ 1 - 1
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)

+ 1 - 1
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

+ 6 - 0
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

+ 10 - 0
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