summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2016-03-25 14:50:37 +0800
committerYe Li <ye.li@nxp.com>2017-04-05 14:04:40 +0800
commitfdc18aceb57291e48149d210721b3e6d755d5ba2 (patch)
treea816e3b9e4e843704945c3fd836707eff89d3274 /configs
parent07206a02f8accf1a795757ef86016a4f046f6dab (diff)
downloadu-boot-imx-fdc18aceb57291e48149d210721b3e6d755d5ba2.zip
u-boot-imx-fdc18aceb57291e48149d210721b3e6d755d5ba2.tar.gz
u-boot-imx-fdc18aceb57291e48149d210721b3e6d755d5ba2.tar.bz2
MLK-12436-10: mx6sabresd: update board code and header file
Align board code and header file with imx_v2016.03. Update pmic settings for i.MX6QP. wrap spi code together using CONFIG_MXC_SPI macro. To i.MX6SOLO, need to define nosmp in bootargs. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit bb35d09d140efc7ff9b74bbcd77d7827c1dd503e) Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'configs')
-rw-r--r--configs/mx6dlsabresd_defconfig1
-rw-r--r--configs/mx6dlsabresd_plugin_defconfig1
-rw-r--r--configs/mx6qsabresd_defconfig3
-rw-r--r--configs/mx6qsabresd_plugin_defconfig1
4 files changed, 1 insertions, 5 deletions
diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index 0254a53..eb7ecdd 100644
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -31,7 +31,6 @@ CONFIG_DFU_MMC=y
CONFIG_DFU_SF=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PCI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
diff --git a/configs/mx6dlsabresd_plugin_defconfig b/configs/mx6dlsabresd_plugin_defconfig
index 8329919..0dd0c03 100644
--- a/configs/mx6dlsabresd_plugin_defconfig
+++ b/configs/mx6dlsabresd_plugin_defconfig
@@ -32,7 +32,6 @@ CONFIG_DFU_MMC=y
CONFIG_DFU_SF=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PCI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index 4e3d745..c6efe26 100644
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -31,7 +31,6 @@ CONFIG_DFU_MMC=y
CONFIG_DFU_SF=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PCI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
@@ -59,4 +58,4 @@ CONFIG_DM_REGULATOR_PFUZE100=y
CONFIG_DM_REGULATOR_FIXED=y
CONFIG_DM_REGULATOR_GPIO=y
CONFIG_DM_ETH=y
-CONFIG_DM_USB=y \ No newline at end of file
+CONFIG_DM_USB=y
diff --git a/configs/mx6qsabresd_plugin_defconfig b/configs/mx6qsabresd_plugin_defconfig
index ce5c1b5..41553cf 100644
--- a/configs/mx6qsabresd_plugin_defconfig
+++ b/configs/mx6qsabresd_plugin_defconfig
@@ -32,7 +32,6 @@ CONFIG_DFU_MMC=y
CONFIG_DFU_SF=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_PCI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y