1. 05 Apr, 2017 40 commits
    • Ye Li's avatar
      MLK-14382-2 mx6ularm2: Add DTS files for ARM2 boards · 1900d532
      Ye Li authored
      
      
      Copy the DTS files from kernel for DDR3 ARM2 board and LPDDR2 ARM2 board
      preparing for enabling OF_CONTROL.
      Modify the QSPI n25q256a flash node's compatible to "spi-flash" for using
      DM SPI driver.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      1900d532
    • Ye Li's avatar
      MLK-14382-1 mx6ularm2: Add DDR3 and LPDDR2 ARM2 board codes · 62c6437a
      Ye Li authored
      
      
      Move the mx6ul DDR3/LPDDR2 ARM2 boards codes from v2016.03 u-boot as
      the base for OF_CONTROL enabling.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      62c6437a
    • Ye Li's avatar
      MLK-14326-14 mx6ulevk: Enable OF_CONTROL and DM drivers · b224cafc
      Ye Li authored
      
      
      Update mx6ulevk board files and build configurations to enable
      OF_CONTROL and DM drivers.
      
      1. QSPI settings and codes update for using DM QSPI driver.
         For DM and non-DM driver, the AMBA address is not same.
      2. Update configurations for DM i2c driver, using CONFIG_SYS_I2C for non-DM driver
      3. GPIO update for adding gpio_request
      4. Add FEC DM driver support for two FEC controllers.
      5. Enable USB DM driver.
      6. Enable 74X164 DM driver for 74LV controlling.
      7. Enable PMIC DM driver for 9x9 EVK
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      b224cafc
    • Ye Li's avatar
      MLK-14326-13 mx6ulevk: Add DTS files · 0f59c047
      Ye Li authored
      
      
      Update i.MX6ul dtsi file and add mx6ul 14x14 and 9x9 evk DTS file
      to latest in kernel.
      To support DM QSPI driver, modify the DTS files with adding a spi0
      alias for qspi node and changing the the n25q256a flash node's compatible
      to "spi-flash"
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      0f59c047
    • Ye Li's avatar
      MLK-14326-12 mx6sllevk: Update DTS files · e9f6bbbc
      Ye Li authored
      
      
      Update i.MX6SLL dtsi file and mx6sll-evk DTS file to latest in kernel.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      e9f6bbbc
    • Ye Li's avatar
      MLK-14326-11 mx6slevk: Enable OF_CONTROL and DM drivers · 1666cfa6
      Ye Li authored
      
      
      Update mx6slevk board files and build configurations to enable
      OF_CONTROL and DM drivers.
      
      1. Update PMIC and LDO-bypass codes for DM PMIC driver.
      2. Update configurations for DM i2c driver
      3. GPIO update for adding gpio_request
      4. Remove duplicated configurations from build config
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      1666cfa6
    • Ye Li's avatar
      MLK-14326-10 mx6slevk: add DTS files and dt-binding header file · 5421d70d
      Ye Li authored
      
      
      Update i.MX6SL dtsi file and dt-binding header files.
      Add the imx6sl-evk DTS file preparing for using DTB.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      5421d70d
    • Ye Li's avatar
      MLK-14326-9 mx6sxsabreauto: Update board file and build configuration · 76e1c802
      Ye Li authored
      
      
      Enable FEC, USB and QSPI DM driver in build configuration and update
      board file for them.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      76e1c802
    • Ye Li's avatar
      MLK-14326-8 mx6sxsabreauto: Update DTS file to latest in kernel · dbf1c4a4
      Ye Li authored
      
      
      Copy the imx6sx-sdb latest DTS file from imx_4.1.y kernel.
      To support DM QSPI driver, modify the n25q256a flash node's compatible
      to "spi-flash".
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      dbf1c4a4
    • Ye Li's avatar
      MLK-14326-7 mx6sxsabresd: Enable OF_CONTROL and DM drivers · 5339edf5
      Ye Li authored
      
      
      Update mx6sxsabresd board files and build configurations to enable
      OF_CONTROL and DM drivers.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      5339edf5
    • Ye Li's avatar
      MLK-14326-6 mx6sxsabresd: Update and add mx6sxsabresd DTS files · daa11e1c
      Ye Li authored
      
      
      Update i.MX6SX dtsi file and relevant DTS header files.
      Add the imx6sx-sdb DTS files preparing for using DTB.
      
      To support DM QSPI driver
      1. Modify the n25q256a flash node's compatible to "spi-flash".
      2. Add spi0 and spi1 alias for qspi1 and qspi2.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      daa11e1c
    • Ye Li's avatar
      MLK-14326-5 mx6qpsabreauto: Enable OF_CONTROL and DM driver · cbcbf4f2
      Ye Li authored
      
      
      Update mx6qpsabreauto build configurations to use OF_CONTROL and DM driver.
      Also add the imx6qpsabreauto DTS file for using DTB.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      cbcbf4f2
    • Ye Li's avatar
      MLK-14326-4 mx6dl/solosabreauto: Enable OF_CONTROL and DM driver · cbd41894
      Ye Li authored
      
      
      Update mx6dl/solosabreauto build configurations to use OF_CONTROL and DM driver.
      Also add the imx6dlsabreauto DTS file for using DTB.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      cbd41894
    • Ye Li's avatar
      MLK-14326-3 mx6qsabreauto: Enable OF_CONTROL and DM driver · d5f904fc
      Ye Li authored
      
      
      Enable OF_CONTROL and DM driver on mx6qsabreauto.
      1. Add the imx6qsabreauto relevant DTS file for using DTB.
      2. Modify PMIC initialization codes to use DM PMIC driver.
      3. Modify to use PCA953X DM driver
      4. Remove NAND from default, since the default imx6q-sabreauto.dts disabled
         the nand. The pins are conflicted with UART3, while UART3 is enabled.
      5. For NAND build configuration, remove the USB, since the imx6q-sabreauto-gpmi-weim.dts
         will have pin conflicts on steer logic.
      6. GPIO requests added.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      d5f904fc
    • Ye Li's avatar
      MLK-14326-2 mx6dlsabresd: Enable OF_CONTROL and DM driver · 24066e39
      Ye Li authored
      
      
      Enable OF_CONTROL and DM driver on mx6dlsabresd. And add the imx6dl
      sabresd DTS file for using DTB.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      24066e39
    • Ye Li's avatar
      MLK-14326-1 mx6qpsabresd: Add DTS file · 057a61e8
      Ye Li authored
      
      
      Since we have enabled the i.MX6QP sabresd board with OF_CONTROL and DM
      driver. Add the imx6qp DTS file and imx6qp sabresd DTS file for build.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      057a61e8
    • Ye Li's avatar
      MLK-14375-3 mx6ullevk: Add 9x9 EVK board support · 0cccce2d
      Ye Li authored
      
      
      1. Add build configs for i.MX6ULL 9X9 EVK. Enable DM I2C driver and
         DM PMIC driver for pfuze3000. Convert power init codes to use
         DM PMIC driver.
      
      2. Add lpddr2 script IMX6ULL_9X9_LPDDR2_400MHz_16bit_V1.2.inc for
         the 9x9 board.
         Refer the commit 44a84b44a84cd1bdcc54d722987e5f109510891b
      
      3. Add DTS file for 9x9 evk board.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      0cccce2d
    • Ye Li's avatar
      MLK-14375-2 mx6ullevk: Add DTS and build configuration for various boot devices · 7c4ed06c
      Ye Li authored
      
      
      To support boot from QSPI/NAND/eMMC, add relevant DTS files and
      build configurations.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      7c4ed06c
    • Ye Li's avatar
      MLK-14375-1 mx6ullevk: Update board codes to align with v2016.03 · c41050e2
      Ye Li authored
      
      
      Update mx6ull evk to add features from v2016.03.
      1. Add support for NAND flash.
      2. Add support for QSPI DM driver.
      3. Add USB DM driver support.
      4. Add two FEC support by using DM FEC driver
      5. Update environments for various boot devices support: SD/NAND/eMMC/QSPI
      6. Add MFGtool environments.
      7. Add board codes for 9x9 EVK board
      
      For the DTS file, some changes are needed for using QSPI DM driver
      1. Add spi0 alias for qspi node. Which is used for bus number 0.
      2. Modify the n25q256a@0 compatible property to "spi-flash".
      3. Modify spi4 (gpio_spi) node to spi5
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      c41050e2
    • Ye Li's avatar
      MLK-14371 fsl_qspi: update the driver to support mx6ul and mx7d · 7901123e
      Ye Li authored
      
      
      After porting to v2017.03. we start to use community's QSPI driver,
      not the one we maintained before in v2014-v2016.
      The new QSPI driver only supports i.MX6SX. This patch adds support
      for i.MX6UL and i.MX7D
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      7901123e
    • Ye Li's avatar
      MLK-14366 mx6sllevk: Update board codes to align with v2016.03 · 0912f868
      Ye Li authored
      
      
      Update mx6sll EVK board codes for features:
      1. Add SD/MMC dynamical device detect.
      2. Add wdog set for kernel.
      3. Add mfgtool environments.
      4. Modify SD/MMC environment offset.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      0912f868
    • Ye Li's avatar
      MLK-14363 mx6qsabreauto: Fix ethernet PHY setting issue · b9c64d0e
      Ye Li authored
      
      
      The PHY settings for RGMII has been removed from mx6qsabreauto board codes,
      due to the atheros PHY driver have updated to use same configuration for
      AR8031 and AR8035, while this configuration is duplicated as we set in board codes.
      
      But in recent codes, the PHY driver added a patch for AR8031 independent config.
      So needs to add the PHY settings back to the board codes.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      b9c64d0e
    • Ye Li's avatar
      MLK-12996 imx: mx6dqp/dq: Fix SATA read/write fail after booting from SATA · 70bc3dd2
      Ye Li authored
      
      
      We found a issue in PLL6 ENET that changing the bit[1:0] DIV_SELECT for ENET
      ref clock will impact the SATA ref 100Mhz clock.  If SATA is initialized before
      this changing, SATA read/write can't work after it. And we have to re-init SATA.
      
      The issue can reproduce on both i.MX6DQP and i.MX6DQ. IC investigation is ongoing.
      
      This patch is an work around that moves the ENET clock setting
      (enable_fec_anatop_clock) from ethernet init to board_init which is prior
      than SATA initialization. So there is no PLL6 change after SATA init.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit fd8fbf7fa0b10199ac89cd13cae851149f51accb)
      70bc3dd2
    • Ye Li's avatar
      MLK-12791 mx6qpsabresd: Change ENET TXCLK clock from PLL · 4976f8f1
      Ye Li authored
      
      
      In u-boot, i.MX6QP sabresd board uses 125Mhz ref clock from PHY,
      While kernel uses the clock from internal PLL by setting GPR5 bit 9.
      When doing warm reset in kernel, the GPR regigster is not reset, so
      the clock source still is the PLL. This causes ENET in u-boot can't work.
      
      In this patch, we change the u-boot to use internal PLL to align with
      kernel for i.MX6QP. This also fixes the ENET issue after kernel warm reset.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit 7f00c72e17e4e440df62aa4945a619fdbc9cfd8f)
      4976f8f1
    • Ye Li's avatar
      MLK-12723 imx: Change the env offset on NAND to 60M · 2906317e
      Ye Li authored
      
      
      Current environment offset on NAND is 37MB, this will cause a alignment
      issue when erasing if nand erase block is 2MB. The saveenv is failed.
      
      => saveenv
      Saving Environment to NAND...
      Erasing NAND...
      Attempt to erase non block-aligned data
      
      Since the max erase block we supported is 4MB, adjust the env offset to 60MB,
      where is the last 4MB in 64MB reserved area for boot.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit 22f6c4b151fbdea1985403086715de841152c880)
      2906317e
    • Ye.Li's avatar
      MLK-10186-1 imximage: add fixed IVT offset support · f8b95c08
      Ye.Li authored
      
      
      Since from mx7, we use fixed IVT offset for all boot devices.
      Introduce a new configuration CONFIG_IMX_FIXED_IVT_OFFSET for this.
      Signed-off-by: default avatarPeng Fan <Peng.Fan@freescale.com>
      Signed-off-by: default avatarYe.Li <B37916@freescale.com>
      (cherry picked from commit 88e0a3552b08627b18d98380a32dbafacb18854b)
      (cherry picked from commit 3d52e221ed444dab96038a2417d1dcb2217ad593)
      (cherry picked from commit 13d39c51bbaabbcf3b72516d8ac3f1853f686ace)
      f8b95c08
    • Peng Fan's avatar
      MLK-12416-9: mx6qp: define CONFIG_MX6QP · 7feb7fcd
      Peng Fan authored
      
      
      Define CONFIG_MX6QP which will also set CONFIG_MX6Q, otherwise
      plugin code will use wrong ddr script.
      Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
      (cherry picked from commit 901d9eb01736ab54822678a197fe1aeb281a81b9)
      7feb7fcd
    • Adrian Alonso's avatar
      MLK-12442: imx: mx6qarm2: lpddr2 set dram 2 channel fixed mode · 6857edad
      Adrian Alonso authored
      
      
      Setup MMDC in two channel fixed mode
      Initialize dram banks for two channel fixed mode
      DRAM bank = 0x00000000
      -> start  = 0x10000000
      -> size   = 0x20000000
      DRAM bank = 0x00000001
      -> start  = 0x80000000
      -> size   = 0x20000000
      Signed-off-by: default avatarAdrian Alonso <adrian.alonso@nxp.com>
      (cherry picked from commit bf1d8faf1dab7c4245ba7b79ceef6279cff45625)
      6857edad
    • Ye Li's avatar
      MLK-12560 mx6: Enable eMMC boot support for all mx6 · 0df826a3
      Ye Li authored
      
      
      Set the CONFIG_SUPPORT_EMMC_BOOT in mx6_common.h to enable the eMMC
      boot support for all mx6 platforms. Remove the duplicated definition
      in board's header file.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit dbe744de73c88f14e01f56a3258752ab5cd45b14)
      0df826a3
    • Ye Li's avatar
      MLK-12559 mx6: Enable memory test command · 9996b7ef
      Ye Li authored
      
      
      Set the CONFIG_CMD_MEMTEST on all mx6 platforms for enabling the u-boot
      memory test.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit 75b5a7d5931064386ae38ce74a34eb6e368666a5)
      9996b7ef
    • Ye Li's avatar
      MLK-12555-2 mx6ulevk: Enable the Watchdog WDOG_B signal output · d0560c22
      Ye Li authored
      
      
      When using watchdog timeout in kernel, the reset does not output the
      WDOG_B signal, so the power supply won't be reset. To solve the problem,
      we enable it in u-boot.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit 8a713e8cd1500ecc6daa02a14a63763a548095b4)
      d0560c22
    • Ye Li's avatar
      MLK-12555 mx6sxsabreauto: Enable the Watchdog WDOG_B signal output · b5c62778
      Ye Li authored
      
      
      When using watchdog timeout in kernel, the reset does not output the
      WDOG_B signal, so the power supply won't be reset. To solve the problem,
      we enable it in u-boot.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit 7b53ee014c9f02f6ead0b60d5295d07205247a7c)
      b5c62778
    • Ye.Li's avatar
      MLK-11230 imx6: USB: Modify OTG ID pin pad setting to pull up · f8f50ba4
      Ye.Li authored
      
      
      Set the ID pin pad to pull up not the pull down at default, otherwise
      we can't enter the device mode, but always detect as host.
      
      After this change we have to use portA cable to play as host,
      and use portB cable for device.
      Signed-off-by: default avatarYe.Li <B37916@freescale.com>
      (cherry picked from commit b315d6b36a913d75d25284320e69050ebdf7a7eb)
      f8f50ba4
    • Ye Li's avatar
      MLK-12531 mx6sxsabresd: Add CM4 fast boot up demo · b1200eb2
      Ye Li authored
      
      
      This is a demo that CM4 will boot up by u-boot without typing any
      command. It boots up at u-boot early init, try to minimize the time
      from power up to the CM4 running.
      Since CM4 runs on QSPI NOR XIP, we have to disable the QSPI driver in
      u-boot to avoid conflict.
      
      RDC for shared GPIO1 is added, but not enabled, because the kernel is
      not ready for shared GPIO1. Users can uncomment the CONFIG_IMX_RDC to
      enable it.
      
      Some legacy codes in mx6sxsabreauto are removed. We only need this work
      on mx6sxsabresd as a demo.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit f66842f79d4e33ace45762466eed23a86d367642)
      b1200eb2
    • Ye Li's avatar
      MLK-12493-1 Add support for various boot device · b3b794bf
      Ye Li authored
      
      
      Add support for various boot devices like NAND, QSPINOR, SPINOR,
      eMMC, EIMNOR, SATA.
      
      Modify board level files to support the feature and add corresponding defconfig files
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit 72c35e80b86f7f75a52db45959793882bb730793)
      b3b794bf
    • Ye Li's avatar
      MLK-12500-2 HAB: Add commented secure boot configurations · 2398e5ff
      Ye Li authored
      
      
      CONFIG_SECURE_BOOT is used for signed image building, this configuration is
      not enabled at default. Comment it in mx6/mx7 common header file. Users can
      uncomment it to enable.
      
      Also add CONFIG_CSF_SIZE for defining the CSF reserved size and resize
      the CONFIG_CSF_SIZE to 0x4000 to align with v2016.03.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit 01cc7d9bc205251c13712418d51f3a4d7b20861b)
      2398e5ff
    • Ye Li's avatar
      MLK-12500-1 HAB: Add kernel image authentication in image loading · fd9a9759
      Ye Li authored
      
      
      To support the trust boot chain, we integrate the authentication
      into the kernel image loading process. The kernel image will be verified
      at its load address. So when signing the kernel image, we need to
      use this load address which may change on different platforms.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit 3c118b8d6bbe1a25ca8c8bafeb528309f16fc73d)
      fd9a9759
    • Ye Li's avatar
      MLK-12495 mx6: Add LDO bypass support · 8f8699a8
      Ye Li authored
      
      
      Port LDO bypass support from v2015 to support the features:
      
      1. Add check for 1.2GHz core speed. If Speed grading fuse is for 1.2GHz,
         enable LDO bypass and setup PMIC voltages. LDO bypass is dependent
         on the flatten device tree file.
      
      2. We set WDOG_B in set_anatop_bypass() before, because it is the only case, but now
         on i.mx6sabreauto board, we didn't use ldo-bypass mode, but have to use WDOG_B to
         reboot whole board, so split these code to independent function so that board file
         can call it freely.
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      (cherry picked from commit 5b87d04dba66fa45375d59648838ef89f559f75d)
      8f8699a8
    • Ye Li's avatar
      MLK-12436-17: imx: mx6sxsabreauto: update board and header · e1c8247f
      Ye Li authored
      
      
      Align with imx_v2016.03
      1. Update pmic settings to enable SD3 power and use PMIC common init codes.
      2. Enable bmode.
      3. Update MMC root parameters
      4. Update AUXBOOT for M4
      Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
      (cherry picked from commit 0816a496fbe3f7d0e4f1a9322c76908a5c557c8c)
      Signed-off-by: default avatarYe Li <ye.li@nxp.com>
      e1c8247f
    • Peng Fan's avatar
      MLK-12436-16: imx: mx6sxsabresd: update board and header · ddbfaf18
      Peng Fan authored
      
      
      Align with imx_v2016.03.
      Add emmc support which needs board rework.
      Add I2C2.
      Update pmic settings.
      Add bmode.
      Move partial code from board_early_init_f to board_init.
      Add PCI power and reset GPIO and disable PCI at default.
      Update QSPI settings.
      Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
      (cherry picked from commit 9613a2d07760f56b3c93779b14ad32ef69856da7)
      ddbfaf18