summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRichard Zhu <r65037@freescale.com>2014-07-15 12:56:43 +0800
committerRichard Zhu <r65037@freescale.com>2014-07-18 12:41:51 +0800
commit6d1a7c02286b4db08949f6a293433d16b3c96b00 (patch)
tree870954e3c04298f095c941ee52fca4ed07177eef /include
parent92bb0622184d8656462e4eca2155b09924fa7d16 (diff)
downloadu-boot-imx-6d1a7c02286b4db08949f6a293433d16b3c96b00.zip
u-boot-imx-6d1a7c02286b4db08949f6a293433d16b3c96b00.tar.gz
u-boot-imx-6d1a7c02286b4db08949f6a293433d16b3c96b00.tar.bz2
ENGR00323143 pcie:can't be enabled in both uboot and kernel
imx6 q/dl/solo pcie would be failed to work properly in kernel, if the pcie module is iniialized/enumerated both in uboot and linux kernel. rootcause:imx6 q/dl/solo pcie don't have the reset mechanism. it is only be RESET by the POR. So, the pcie module only be initialized/enumerated once in one POR. Set to use pcie in kernel defaultly, mask the pcie config here. Remove the mask freely, if the uboot pcie functions, rather than the kernel's, are required. Signed-off-by: Richard Zhu <r65037@freescale.com> (cherry picked from commit 30d6a9abccb9c5424fce9dec2085db0ac21579b1)
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx6sabresd.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index ed85b84..9f3fae7 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -39,7 +39,18 @@
#define CONFIG_SF_DEFAULT_CS (0|(IMX_GPIO_NR(4, 9)<<8))
#endif
-#define CONFIG_CMD_PCI
+/*
+ * imx6 q/dl/solo pcie would be failed to work properly in kernel, if
+ * the pcie module is iniialized/enumerated both in uboot and linux
+ * kernel.
+ * rootcause:imx6 q/dl/solo pcie don't have the reset mechanism.
+ * it is only be RESET by the POR. So, the pcie module only be
+ * initialized/enumerated once in one POR.
+ * Set to use pcie in kernel defaultly, mask the pcie config here.
+ * Remove the mask freely, if the uboot pcie functions, rather than
+ * the kernel's, are required.
+ */
+/* #define CONFIG_CMD_PCI */
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCI
#define CONFIG_PCI_PNP