Ye Li [Tue, 13 Dec 2016 07:32:20 +0000 (15:32 +0800)]
MLK-13602-2 epdc: Add disable fuse checking
Add fuse checking for EPDC module. Once the fused is programmed, the
EPDC module is disabled, can't to access it.
Signed-off-by: Ye Li <ye.li@nxp.com>
Tested-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit
ea7429b70c1eb2cf475028ee8df2ac9ed18b3c82)
Ye Li [Tue, 13 Dec 2016 07:31:05 +0000 (15:31 +0800)]
MLK-13602-1 mx6: Add i.MX6ULL fused modules checking support
Add the modules disable fuses mapping with FDT nodes and devices name.
Signed-off-by: Ye Li <ye.li@nxp.com>
Tested-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit
d033825f034467fa9c9aeff6fcf95a146c802cf1)
Robby Cai [Thu, 23 Jun 2016 06:44:19 +0000 (14:44 +0800)]
MLK-12929 imx6ull: support splash screen for epdc
add splash screen feature for epdc.
it's tested on imx6ull arm2 board.
Signed-off-by: Robby Cai <robby.cai@nxp.com>
(cherry picked from commit
bcdbe240bb2a97d38ba30dd244a51ece87662b06)
Ye Li [Wed, 8 Mar 2017 03:48:32 +0000 (11:48 +0800)]
MLK-14380-1 mx6ullarm2: Add mx6ull DDR3 ARM2 board codes
Move the mx6ull ddr3 arm2 board codes and defconfigs from v2016.03
as the base for converting to use DTB OF_CONTROL.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Wed, 8 Mar 2017 13:53:08 +0000 (21:53 +0800)]
MLK-14382-3 mx6ularm2: Convert to enable OF_CONTROL and DM drivers
Update mx6ul ddr3 arm2 and lpddr2 arm2 boards codes and build configurations
to enable OF_CONTROL and DM drivers.
1. Update QSPI settings and codes for DM QSPI driver.
2. Update GPIO codes for adding gpio request
3. Enable FEC DM driver and update relevant configurations
4. Enable USB DM driver
5. Update PMIC and LDO by-pass codes for DM PMIC
6. Add various boot media support, QSPI/NAND/SPINOR/EIMNOR
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Wed, 8 Mar 2017 13:22:57 +0000 (21:22 +0800)]
MLK-14382-2 mx6ularm2: Add DTS files for ARM2 boards
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: Ye Li <ye.li@nxp.com>
Ye Li [Wed, 8 Mar 2017 06:36:53 +0000 (14:36 +0800)]
MLK-14382-1 mx6ularm2: Add DDR3 and LPDDR2 ARM2 board codes
Move the mx6ul DDR3/LPDDR2 ARM2 boards codes from v2016.03 u-boot as
the base for OF_CONTROL enabling.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Tue, 7 Mar 2017 16:42:44 +0000 (00:42 +0800)]
MLK-14326-14 mx6ulevk: Enable OF_CONTROL and DM drivers
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: Ye Li <ye.li@nxp.com>
Ye Li [Tue, 7 Mar 2017 16:37:27 +0000 (00:37 +0800)]
MLK-14326-13 mx6ulevk: Add DTS files
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: Ye Li <ye.li@nxp.com>
Ye Li [Tue, 7 Mar 2017 01:52:41 +0000 (09:52 +0800)]
MLK-14326-12 mx6sllevk: Update DTS files
Update i.MX6SLL dtsi file and mx6sll-evk DTS file to latest in kernel.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Mon, 6 Mar 2017 16:23:57 +0000 (00:23 +0800)]
MLK-14326-11 mx6slevk: Enable OF_CONTROL and DM drivers
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: Ye Li <ye.li@nxp.com>
Ye Li [Mon, 6 Mar 2017 16:20:45 +0000 (00:20 +0800)]
MLK-14326-10 mx6slevk: add DTS files and dt-binding header file
Update i.MX6SL dtsi file and dt-binding header files.
Add the imx6sl-evk DTS file preparing for using DTB.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Mon, 6 Mar 2017 14:37:17 +0000 (22:37 +0800)]
MLK-14326-9 mx6sxsabreauto: Update board file and build configuration
Enable FEC, USB and QSPI DM driver in build configuration and update
board file for them.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Mon, 6 Mar 2017 14:34:42 +0000 (22:34 +0800)]
MLK-14326-8 mx6sxsabreauto: Update DTS file to latest in kernel
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: Ye Li <ye.li@nxp.com>
Ye Li [Mon, 6 Mar 2017 12:36:36 +0000 (20:36 +0800)]
MLK-14326-7 mx6sxsabresd: Enable OF_CONTROL and DM drivers
Update mx6sxsabresd board files and build configurations to enable
OF_CONTROL and DM drivers.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Mon, 6 Mar 2017 12:29:04 +0000 (20:29 +0800)]
MLK-14326-6 mx6sxsabresd: Update and add mx6sxsabresd DTS files
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: Ye Li <ye.li@nxp.com>
Ye Li [Mon, 6 Mar 2017 07:27:05 +0000 (15:27 +0800)]
MLK-14326-5 mx6qpsabreauto: Enable OF_CONTROL and DM driver
Update mx6qpsabreauto build configurations to use OF_CONTROL and DM driver.
Also add the imx6qpsabreauto DTS file for using DTB.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Mon, 6 Mar 2017 07:12:34 +0000 (15:12 +0800)]
MLK-14326-4 mx6dl/solosabreauto: Enable OF_CONTROL and DM driver
Update mx6dl/solosabreauto build configurations to use OF_CONTROL and DM driver.
Also add the imx6dlsabreauto DTS file for using DTB.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Mon, 6 Mar 2017 06:43:13 +0000 (14:43 +0800)]
MLK-14326-3 mx6qsabreauto: Enable OF_CONTROL and DM driver
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: Ye Li <ye.li@nxp.com>
Ye Li [Fri, 3 Mar 2017 08:46:08 +0000 (16:46 +0800)]
MLK-14326-2 mx6dlsabresd: Enable OF_CONTROL and DM driver
Enable OF_CONTROL and DM driver on mx6dlsabresd. And add the imx6dl
sabresd DTS file for using DTB.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Fri, 3 Mar 2017 08:03:01 +0000 (16:03 +0800)]
MLK-14326-1 mx6qpsabresd: Add DTS file
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: Ye Li <ye.li@nxp.com>
Ye Li [Tue, 7 Mar 2017 12:44:30 +0000 (20:44 +0800)]
MLK-14375-3 mx6ullevk: Add 9x9 EVK board support
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: Ye Li <ye.li@nxp.com>
Ye Li [Tue, 7 Mar 2017 12:29:40 +0000 (20:29 +0800)]
MLK-14375-2 mx6ullevk: Add DTS and build configuration for various boot devices
To support boot from QSPI/NAND/eMMC, add relevant DTS files and
build configurations.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Tue, 7 Mar 2017 12:24:19 +0000 (20:24 +0800)]
MLK-14375-1 mx6ullevk: Update board codes to align with v2016.03
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: Ye Li <ye.li@nxp.com>
Ye Li [Tue, 7 Mar 2017 08:30:50 +0000 (16:30 +0800)]
MLK-14371 fsl_qspi: update the driver to support mx6ul and mx7d
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: Ye Li <ye.li@nxp.com>
Ye Li [Tue, 7 Mar 2017 04:13:05 +0000 (12:13 +0800)]
MLK-14366 mx6sllevk: Update board codes to align with v2016.03
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: Ye Li <ye.li@nxp.com>
Ye Li [Mon, 6 Mar 2017 13:35:08 +0000 (21:35 +0800)]
MLK-14363 mx6qsabreauto: Fix ethernet PHY setting issue
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: Ye Li <ye.li@nxp.com>
Ye Li [Thu, 28 Jul 2016 03:42:14 +0000 (11:42 +0800)]
MLK-12996 imx: mx6dqp/dq: Fix SATA read/write fail after booting from SATA
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: Ye Li <ye.li@nxp.com>
(cherry picked from commit
fd8fbf7fa0b10199ac89cd13cae851149f51accb)
Ye Li [Mon, 16 May 2016 06:04:53 +0000 (14:04 +0800)]
MLK-12791 mx6qpsabresd: Change ENET TXCLK clock from PLL
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: Ye Li <ye.li@nxp.com>
(cherry picked from commit
7f00c72e17e4e440df62aa4945a619fdbc9cfd8f)
Ye Li [Thu, 5 May 2016 09:02:23 +0000 (17:02 +0800)]
MLK-12723 imx: Change the env offset on NAND to 60M
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: Ye Li <ye.li@nxp.com>
(cherry picked from commit
22f6c4b151fbdea1985403086715de841152c880)
Ye.Li [Fri, 30 Jan 2015 08:17:36 +0000 (16:17 +0800)]
MLK-10186-1 imximage: add fixed IVT offset support
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: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit
88e0a3552b08627b18d98380a32dbafacb18854b)
(cherry picked from commit
3d52e221ed444dab96038a2417d1dcb2217ad593)
(cherry picked from commit
13d39c51bbaabbcf3b72516d8ac3f1853f686ace)
Peng Fan [Wed, 16 Mar 2016 07:17:12 +0000 (15:17 +0800)]
MLK-12416-9: mx6qp: define CONFIG_MX6QP
Define CONFIG_MX6QP which will also set CONFIG_MX6Q, otherwise
plugin code will use wrong ddr script.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
901d9eb01736ab54822678a197fe1aeb281a81b9)
Adrian Alonso [Wed, 20 Jan 2016 21:16:08 +0000 (15:16 -0600)]
MLK-12442: imx: mx6qarm2: lpddr2 set dram 2 channel fixed mode
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: Adrian Alonso <adrian.alonso@nxp.com>
(cherry picked from commit
bf1d8faf1dab7c4245ba7b79ceef6279cff45625)
Ye Li [Mon, 14 Mar 2016 15:51:24 +0000 (23:51 +0800)]
MLK-12560 mx6: Enable eMMC boot support for all mx6
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: Ye Li <ye.li@nxp.com>
(cherry picked from commit
dbe744de73c88f14e01f56a3258752ab5cd45b14)
Ye Li [Mon, 14 Mar 2016 14:36:25 +0000 (22:36 +0800)]
MLK-12559 mx6: Enable memory test command
Set the CONFIG_CMD_MEMTEST on all mx6 platforms for enabling the u-boot
memory test.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
75b5a7d5931064386ae38ce74a34eb6e368666a5)
Ye Li [Mon, 14 Mar 2016 08:50:44 +0000 (16:50 +0800)]
MLK-12555-2 mx6ulevk: Enable the Watchdog WDOG_B signal output
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: Ye Li <ye.li@nxp.com>
(cherry picked from commit
8a713e8cd1500ecc6daa02a14a63763a548095b4)
Ye Li [Mon, 14 Mar 2016 08:49:04 +0000 (16:49 +0800)]
MLK-12555 mx6sxsabreauto: Enable the Watchdog WDOG_B signal output
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: Ye Li <ye.li@nxp.com>
(cherry picked from commit
7b53ee014c9f02f6ead0b60d5295d07205247a7c)
Ye.Li [Thu, 9 Jul 2015 09:07:32 +0000 (17:07 +0800)]
MLK-11230 imx6: USB: Modify OTG ID pin pad setting to pull up
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: Ye.Li <B37916@freescale.com>
(cherry picked from commit
b315d6b36a913d75d25284320e69050ebdf7a7eb)
Ye Li [Thu, 10 Mar 2016 09:18:57 +0000 (17:18 +0800)]
MLK-12531 mx6sxsabresd: Add CM4 fast boot up demo
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: Ye Li <ye.li@nxp.com>
(cherry picked from commit
f66842f79d4e33ace45762466eed23a86d367642)
Ye Li [Tue, 15 Mar 2016 03:05:06 +0000 (11:05 +0800)]
MLK-12493-1 Add support for various boot device
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: Ye Li <ye.li@nxp.com>
(cherry picked from commit
72c35e80b86f7f75a52db45959793882bb730793)
Ye Li [Wed, 16 Mar 2016 06:39:06 +0000 (14:39 +0800)]
MLK-12500-2 HAB: Add commented secure boot configurations
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: Ye Li <ye.li@nxp.com>
(cherry picked from commit
01cc7d9bc205251c13712418d51f3a4d7b20861b)
Ye Li [Tue, 8 Mar 2016 14:03:47 +0000 (22:03 +0800)]
MLK-12500-1 HAB: Add kernel image authentication in image loading
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: Ye Li <ye.li@nxp.com>
(cherry picked from commit
3c118b8d6bbe1a25ca8c8bafeb528309f16fc73d)
Ye Li [Mon, 7 Mar 2016 07:37:34 +0000 (15:37 +0800)]
MLK-12495 mx6: Add LDO bypass support
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: Ye Li <ye.li@nxp.com>
(cherry picked from commit
5b87d04dba66fa45375d59648838ef89f559f75d)
Ye Li [Thu, 2 Mar 2017 02:31:03 +0000 (10:31 +0800)]
MLK-12436-17: imx: mx6sxsabreauto: update board and header
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: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
0816a496fbe3f7d0e4f1a9322c76908a5c557c8c)
Signed-off-by: Ye Li <ye.li@nxp.com>
Peng Fan [Thu, 25 Feb 2016 09:05:46 +0000 (17:05 +0800)]
MLK-12436-16: imx: mx6sxsabresd: update board and header
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: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
9613a2d07760f56b3c93779b14ad32ef69856da7)
Peng Fan [Wed, 24 Feb 2016 11:59:54 +0000 (19:59 +0800)]
MLK-12436-13: mx6ulevk: Add usb ethernet
Align with imx_v2016.03. Add usb ethernet support, since there is no
FEC on this i.MX6UL
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
9811e3db89f535e54ae10a10caa660f8e6036270)
Peng Fan [Wed, 24 Feb 2016 11:58:49 +0000 (19:58 +0800)]
MLK-12436-12: mx6slevk: update board code
Add elan code, to handle epdc which has i2c devices.
In imx_v2015.04, the two pathces are for elan.
b6ba68516b681a38025252bd0ef6a6ed3e8adfa0
MLK-10215 Add elan init in i.MX6SL-EVK board
0c600f6a67f00fe0c674c08c355bea3789109679
MLK-10885 imx: mx6slevk ignore elan init when no epdc on board
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
cb249aa1d57788c52145d28f2e2c68cb320d8ae3)
Signed-off-by: Ye Li <ye.li@nxp.com>
Peng Fan [Tue, 23 Feb 2016 09:40:09 +0000 (17:40 +0800)]
MLK-12436-11: mx6sabresd: add 6qp and solo build target
Add default build target for mx6qp and mx6solo.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
1a2bbdea962ab4dde3838430a06be9140af5176d)
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Fri, 25 Mar 2016 06:50:37 +0000 (14:50 +0800)]
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>
Ye Li [Fri, 29 Apr 2016 05:30:25 +0000 (13:30 +0800)]
MLK-12735 mx6qpsabresd: Update DDR script to version 1.14
DDR script file:
arik_r2_sdb_ddr3_528_1.14.inc
Compass link:
http://compass.freescale.net/livelink/livelink?func=ll&objid=
235302593&objAction=browse&sort=name&viewType=1
Update:
setmem /32 0x020e0534 = 0x00018200 // IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR02 (SDQS0_B_TRIM=01, SDQS0_TRIM=10)
setmem /32 0x020e0538 = 0x00008000 // IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR03 (SDQS1_B_TRIM=00, SDQS1_TRIM=00)
setmem /32 0x020e053C = 0x00018200 // IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR04 (SDQS2_B_TRIM=01, SDQS2_TRIM=10)
setmem /32 0x020e0540 = 0x00018200 // IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR05 (SDQS3_B_TRIM=01, SDQS3_TRIM=10)
setmem /32 0x020e0544 = 0x00018200 // IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR06 (SDQS4_B_TRIM=01, SDQS4_TRIM=10)
setmem /32 0x020e0548 = 0x00018200 // IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR07 (SDQS5_B_TRIM=01, SDQS5_TRIM=10)
setmem /32 0x020e054C = 0x00018200 // IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR08 (SDQS6_B_TRIM=01, SDQS6_TRIM=10)
setmem /32 0x020e0550 = 0x00018200 // IOMUXC_SW_PAD_CTL_PAD_DRAM_ADDR09 (SDQS7_B_TRIM=01, SDQS7_TRIM=10)
setmem /32 0x021b08c0 = 0x24912489 // fine tune SDCLK duty cyc to low - seen to improve measured duty cycle of i.mx6
setmem /32 0x021b48c0 = 0x24914452
setmem /32 0x021b0018 = 0x00011740 // MMDC0_MDMISC, RALAT=0x5, WALAT=0x1
Test:
Passed stress memtester on one board.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
b7f43f47a78c9d0c14fe104daf22efab13709ab1)
(cherry picked from commit
f521de2c5b79ab7f9b60b26cbe6a7ad50cfce9fa)
Peng Fan [Thu, 25 Feb 2016 08:52:49 +0000 (16:52 +0800)]
MLK-12436-9: mx6sabresd: update ddr script
Align ddr script with imx_v2016.03 latest ddr script.
mx6qp.cfg is 1.13 version
http://sw-stash.freescale.net/projects/IMX/repos/ddr-scripts-rel/commits/
8111e4d0cd81226899be637013048281e3c097b4
http://compass.freescale.net/livelink/livelink?func=ll&objId=
234753630&objAction=browse&viewType=1
arik_r2_sabre_ddr3_528_1.13.inc is for sabre-AI
arik_r2_sdb_ddr3_528_1.13.inc is for sabresd
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
39c2989e6ba0de6b35b2d93acd9d67f889ab4b39)
Peng Fan [Wed, 24 Feb 2016 11:50:16 +0000 (19:50 +0800)]
MLK-12436-8: imx: mx6qsabreauto: misc board update
To Align with imx_v2016.03.
1. Add USDHC1 support on mother board
2. Add SPINOR flash support.
3. Add enet ref clk pinmux setting and enet settings
4. Use CONFIG_SYS_USE_EIMNOR to wrap eimnor settings.
5. update mmc board settings
6. update board_init and move nand settings to board_init, but not in
board_early_init_f
7. update pmic settings to align with datasheet.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
f05f2281548ab7b47f69b2c517eb6f85ad09a5d2)
Signed-off-by: Ye Li <ye.li@nxp.com>
Peng Fan [Tue, 23 Feb 2016 08:25:42 +0000 (16:25 +0800)]
MLK-12436-7: imx: mx6qsabreauto: add solo board support
Add solo version ddr script and build target.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
54af2f744c663ac2326c1488a26fac0c4ccdad09)
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Mon, 27 Feb 2017 08:45:26 +0000 (16:45 +0800)]
MLK-14261-2 mx6solo: Add nosmp kernel bootargs
For i.MX6 SOLO sabreauto and sabresd boards, add the "nosmp" kernel
bootargs.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Fri, 24 Feb 2017 09:20:08 +0000 (17:20 +0800)]
MLK-14261-1 mx6solo: Rename the CONFIG_MX6SOLO to CONFIG_MX6S
Since there is already CONFIG_MX6S used for i.MX6 SOLO in u-boot codes,
we don't need to add new CONFIG_MX6SOLO. Rename the existing CONFIG_MX6SOLO
to CONFIG_MX6S.
Additional, for CONFIG_MX6S, we should select CONFIG_MX6DL. The major difference
for these two chips are core number and DDR controller. So all duallite
relevant definitions can apply to solo. User can combine the two configs
if any code only apply to solo or duallite.
Signed-off-by: Ye Li <ye.li@nxp.com>
Peng Fan [Wed, 24 Feb 2016 11:48:10 +0000 (19:48 +0800)]
MLK-12436-6: imx: mx6dqpsabreauto: update ddr script to 1.13
DDR script:
http://sw-stash.freescale.net/projects/IMX/repos/ddr-scripts-rel/commits/
8111e4d0cd81226899be637013048281e3c097b4
http://compass.freescale.net/livelink/livelink?func=ll&objId=
234753630&objAction=browse&viewType=1
arik_r2_sabre_ddr3_528_1.13.inc is for sabre-AI
Patch in imx_v2015.04:
"
commit
5fb08a4dcc7b8478fc4236b90ad8dc2190cf94e7
Author: Peng Fan <Peng.Fan@freescale.com>
Date: Wed Nov 4 16:30:47 2015 +0800
"MLK-11825 imx: mx6dqp: update ddr script to 1.13"
"
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
d756891b9d303e456f59a18d5fa81969a7f37337)
Signed-off-by: Ye Li <ye.li@nxp.com>
Peng Fan [Tue, 23 Feb 2016 06:42:36 +0000 (14:42 +0800)]
MLK-12436-4: mx6qarm2: update board header
Define CONFIG_MMCROOT, CONFIG_SYS_MMC_ENV_PART
to align with imx_v2016.03.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
b06ddb7a09346bf21028a239e77d5bf92469a284)
Signed-off-by: Ye Li <ye.li@nxp.com>
Peng Fan [Tue, 23 Feb 2016 06:11:10 +0000 (14:11 +0800)]
MLK-12436-3: mx6qarm2: add new board revision support
Add mx6qarm2 new board revision support using mx6q pop SoC
Enable DRAM support for imx6q PoP SoC with populated LPDDR2
MT42L128M64D2
DDR calibration script:
http://sw-stash.freescale.net/projects/IMX/repos/ddr-scripts-rel/commits/
040ee38ba9ad238fcb6053b663746d51321abb69
Test result: Stress test passed.
Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Adrian Alonso <adrian.alonso@nxp.com>
(cherry picked from commit
b0ac10892cad46c22accf89c04ea59c46bd9eb01)
Peng Fan [Wed, 24 Feb 2016 11:40:13 +0000 (19:40 +0800)]
MLK-12436-2: mx6qarm2: update ddr scripts
ALign with imx_v2015.04.
Also to lpddr2 support:
From commit: "
620cf5f3d4cf37b065b5857a8ea91d61bf6c471d"
"
Current uboot supports for running LPDDR2 at 400MHz on MX6Q ARM2 board,
but there is a problem in switching pre_periph_clk_sel to pll2_pfd2.
We cannot directly change the parent of pre_periph_clk_sel as this mux
is not a glitchless mux. We need to follow the correct procedure and wait
for the busy bits to clear before switching.
Change to follow the procedure:
1. Set periph_clk2 to OSC.
2. Switch the periph_clk to periph_clk2, checking the CCM_CDHIPR for
periph_clk , ahb_podf and axi_podf busy bits.
3. Setting the pre_periph_clk to PLL2 PFD 396M.
4. Switch the periph_clk back to pre_periph_clk and checking CCM_CDHIPR
busy bits.
"
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Ye.Li <ye.li@nxp.com>
(cherry picked from commit
febf98c68853030ce5c1f9124e77d75456e71314)
Peng Fan [Tue, 23 Feb 2016 06:03:16 +0000 (14:03 +0800)]
MLK-12436-1: mx6qarm2: support i.MX6DQ PoP lpddr2 board
Add the support for i.MX6DQ PoP lpddr2 ARM2 board.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
e8777e91a239599ffd231ef56c60d49b68e5e3fc)
Ye Li [Fri, 24 Feb 2017 08:06:24 +0000 (16:06 +0800)]
MLK-14250-6 mx6dq/dl: Add plugin boot support for arm2 boards
Add plugin.S for plugin boot initialization on mx6dq/dl arm2 board.
Need to set "CONFIG_USE_IMXIMG_PLUGIN" for this feature.
New build configurations are added for the plugin:
mx6dlarm2_lpddr2_plugin_defconfig
mx6dlarm2_plugin_defconfig
mx6qarm2_lpddr2_plugin_defconfig
configs/mx6qarm2_plugin_defconfig
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Thu, 23 Feb 2017 15:15:10 +0000 (23:15 +0800)]
MLK-14250-5 mx6ulevk: Add plugin boot support
Add plugin.S for plugin boot initialization. Need to set "CONFIG_USE_IMXIMG_PLUGIN"
for this feature.
Add build configurations for the plugin:
mx6ul_14x14_evk_plugin_defconfig
mx6ul_9x9_evk_plugin_defconfig
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Fri, 24 Feb 2017 07:24:20 +0000 (15:24 +0800)]
MLK-14250-4 mx6dq/dl/dqp: Add plugin boot support for sabre boards
Add plugin.S for plugin boot initialization on mx6dq/dl/dqp sabresd and sabreauto
boards. Need to set "CONFIG_USE_IMXIMG_PLUGIN" for this feature.
Add the configurations for the plugin enabled buiding.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Fri, 24 Feb 2017 06:58:34 +0000 (14:58 +0800)]
MLK-14250-3 mx6sxsabreauto: Add plugin boot support
Add plugin.S for plugin boot initialization. Need to set "CONFIG_USE_IMXIMG_PLUGIN"
for this feature.
Add the build configuration "mx6sxsabreauto_plugin_defconfig" to use the plugin.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Fri, 24 Feb 2017 06:52:23 +0000 (14:52 +0800)]
MLK-14250-2 mx6sxsabresd: Add plugin boot support
Add plugin.S for plugin boot initialization. Need to set "CONFIG_USE_IMXIMG_PLUGIN"
for this feature.
Add the build configuration "mx6sxsabresd_plugin_defconfig" to use the plugin.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Thu, 23 Feb 2017 06:47:57 +0000 (14:47 +0800)]
MLK-14250-1 mx6slevk: Add plugin boot support
Add plugin.S for plugin boot initialization. Need to set "CONFIG_USE_IMXIMG_PLUGIN"
for this feature.
Add the build configuration "mx6slevk_plugin_defconfig" to use the plugin.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye.Li [Mon, 13 Apr 2015 09:18:14 +0000 (17:18 +0800)]
MLK-10647 armv7: Fix Dcache disable issue on i.MX7
The issue on the i.MX7D is that, there is one cache-able memory access
between the L1 and L2 cache flush by calling the flush_dache_all->
v7_maint_dcache_all() [Flush L1 and L2 cache) which written in the C code.
L1-cache-flush -> This will flush L1 cache to L2 cache in the end.
Cache-able memory access -> This will have the chance cause the L1 line-fill
with dirty data from L2 cache(L1 cache-line dirty,
L2 clean)
L2-cache-flush -> This will only flush L2 cache to L3, but still
some dirty data on the L1 cacheline.
After C & M bit clean, -> The dirty data on the L1 cache line lost, which will
cause memory coherent issue if that dirty cache line
has some useful data
The only problem here is: there is one cache-cable memory access between L1 and L2 cache flush.
This patch should works fine on the i.MX6 and i.MX7.
The second cache flush have zero impact on the i.MX6, but this is really need for
the i.MX7D platform due to the L1 line-fill during the first dcache_flush.
And the second flush will not bring in the L1 dirty cache line due to the C bit is
clear now, which means the dcache is disabled.
Acked-by: Jason Liu<r64343@freescale.com>
Reviewed-by: Jason Liu<r64343@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit
f5d5f07fba936c4bb05c887de9d72fb75b3dc0f2)
(cherry picked from commit
86c784cf4c4b633d37a76de7d47155c08f75dc82)
(cherry picked from commit
d85cd484e6825631aa1ab572e5e0539f2191d795)
(cherry picked from commit
2b29c1873c2293abe1c4b361392521223b9c9ecf)
Andy Duan [Thu, 19 Jan 2017 06:22:29 +0000 (14:22 +0800)]
MLK-13782 net: fec_mxc: specify the registered eth index by dev_id
Specify the registered eth index by dev_id.
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit
df42b7b0c5e6847f32419075eb25f274ed039d6f)
Andy Duan [Wed, 18 Jan 2017 08:04:10 +0000 (16:04 +0800)]
MLK-13777 net: fec_mxc: avoid transfer dev_id -1 to get mac address from fuse
Avoid transfer parameter dev_id value with "-1" to .fec_get_hwaddr(),
it should transfer fec->dev_id to get mac address from fuse.
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
(cherry picked from commit
7e4a55b068311d46d16e86e697d36f34a59bf47a)
Peng Fan [Tue, 22 Nov 2016 02:57:13 +0000 (10:57 +0800)]
MLK-13486: imx: logos: use NXP logo
Use NXP logo.
The vendor and board dir not changed, only replace the contents
of freescale.bmp.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
0b381fdf1a45cb06a057724e708ce0bbeee67f4d)
Ye Li [Mon, 31 Oct 2016 02:10:17 +0000 (10:10 +0800)]
MLK-13410 Android: Change to set mfgtool only for none android u-boot
The mfgtool environments only can set in BSP u-boot image, not for android
u-boot. Since android u-boot may go into fastboot in board_r phase which is
earlier than mfgtool environment check. The USB status from android fastboot
will cause u-boot to configure mfgtool environment.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
066f001a19bdc51b0fc0d65bcb87081b01f957c2)
(cherry picked from commit
03f995630f92462081e98412a0fbc86bb5106f10)
Peng Fan [Mon, 10 Oct 2016 03:14:26 +0000 (11:14 +0800)]
MLK-13307-12 imx: mx6: update ccm macro settings for i.MX6SLL
Update CCM macros for i.MX6SLL.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Ye.Li <ye.li@nxp.com>
(cherry picked from commit
f735f8ac328aa49759f6db524f7c2ba32622f711)
Peng Fan [Mon, 10 Oct 2016 02:00:45 +0000 (10:00 +0800)]
MLK-13307-7 imx: mx6sll: update soc settings
Update soc settings for i.MX6SLL.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
afa2d78f2b799337eae3dc67c0ed702d5520eee6)
Peng Fan [Mon, 6 Jun 2016 05:53:43 +0000 (13:53 +0800)]
MLK-12883 usb: limit USB_MAX_XFER_BLK to 256
For Some USB mass storage devices, such as:
"
- Kingston DataTraveler 2.0
001D7D06CF09B04199C7B3EA
- Class: (from Interface) Mass Storage
- PacketSize: 64 Configurations: 1
- Vendor: 0x0930 Product 0x6545 Version 1.16
"
When `usb read 0x80000000 0 0x2000`, we met
"EHCI timed out on TD - token=0x80008d80".
The devices does not support scsi VPD page, we are not able
to get the maximum transfer length for READ(10)/WRITE(10).
So we limit this to 256 blocks as READ(6).
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
df0052575b2bc9d66ae73584768e1a457ed5d914)
Ye Li [Wed, 24 Feb 2016 14:01:07 +0000 (22:01 +0800)]
MLK-12444-2 mx6: Modify kernel and fdt load address to align with mfgtool
Change the CONFIG_LOADADDR to 0x80800000 and environment variable "fdt_addr"
to 0x83000000 for i.MX6SX, i.MX6SL and i.MX6UL to align the address
used in mfgtool.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
41a6f612f6ae638ac6db61c60e19dcfebf052820)
Ye Li [Wed, 24 Feb 2016 09:38:54 +0000 (17:38 +0800)]
MLK-12444-1 mfgtool: Add mfgtool support
If boot from usb, reset environment to default value.
Auto apply mfgtools setting and boot mfgtools kernel.
Porting this from fsl uboot to uboot 2016.
The 7dsabresd has already added the environment and usb boot
related functions. No need to add them more. Only need to add
NAND parts environment for mfgtools.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
a352ed3c5184b95c4c9f7468f5fbb5f43de5e412)
Ye Li [Fri, 24 Feb 2017 06:23:12 +0000 (14:23 +0800)]
MLK-14259-3 mx6ulevk: Add support for NAND
Add NAND pinmux settings, clock setting and related configurations.
Default not enabled, need hardware rework.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Fri, 24 Feb 2017 06:17:18 +0000 (14:17 +0800)]
MLK-14259-2 mx6ulevk: Add PHYS_SDRAM_SIZE and CMA macro
Define PHYS_SDRAM_SIZE future usage.
Define CMA for kernel usage, default is 320MB, but we do not
have enough memory on 9x9 evk lpddr2 board, so swith to 96MB.
Signed-off-by: Ye Li <ye.li@nxp.com>
Ye Li [Fri, 24 Feb 2017 06:03:53 +0000 (14:03 +0800)]
MLK-14259-1 mx6ulevk: Change i.MX6UL EVK to non-SPL at default
Current i.MX6UL EVK boards enable the SPL u-boot. Change it to non-SPL
for default configurations. Add two other build configurations for SPL.
Signed-off-by: Ye Li <ye.li@nxp.com>
Peng Fan [Mon, 9 May 2016 09:31:34 +0000 (17:31 +0800)]
MLK-12767 imx6ull: fix runtime checking for i.MX6ULL
Fix runtime checking for i.MX6ULL. Add is_cpu_type(MXC_CPU_MX6ULL)
to avoid using wrong code path.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
05922b0abf848949df778c19312cb1cf7fdfbe6a)
Peng Fan [Mon, 9 May 2016 08:53:32 +0000 (16:53 +0800)]
MLK-12766 net: fec: do not access reserved register for i.MX6ULL
The MIB RAM and FIFO receive start register does not exist on
i.MX6ULL. Accessing these register will cause enet not work well or
cause system report fault.
Reported-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit
5fb09cab9bb3cc4cef02239299d02cec666396ab)
Ye Li [Wed, 16 Mar 2016 08:27:56 +0000 (16:27 +0800)]
MLK-12565 mx7: rdc: Change IS_ENABLED to remove build warning
Change to use #ifdef not the IS_ENABLED, because we will get build warning
when the CONFIG_IMX_RDC is not set.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
a212eff242efb8dc171479cbaca34049d508f87b)
Peng Fan [Tue, 21 Apr 2015 03:38:09 +0000 (11:38 +0800)]
MLK-10708 imx:mx6qp Update Saturation THR for PREx
Update settings for PRE. Value for Saturation THR of PREx,
changed from 0x20 to 0x10 to make system more stable.
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit
02e7090604e55d9690532294b02b499609d46e63)
(cherry picked from commit
f7c5cf580fcc2c8ab95a8d835f5874d26216910f)
(cherry picked from commit
1a90b60731cd60feba1ef7a11ede2613283bb4a8)
Ye Li [Tue, 15 Mar 2016 14:16:54 +0000 (22:16 +0800)]
MLK-12483-5 mx6ul: Enable module fuse check EVK board
Enable the configurations CONFIG_MODULE_FUSE and CONFIG_OF_SYSTEM_SETUP for
module fuse check. And modify board level codes for SD, FEC and EIM.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
9232e9f7637afa3b71b43ab2d1361582ec5a080a)
Ye Li [Wed, 16 Mar 2016 05:50:54 +0000 (13:50 +0800)]
MLK-12483-4 mx6: Modify drivers to disable fused modules
Add the fuse checking in drivers, when the module is disabled in fuse,
the driver will not work.
Changed drivers: BEE, GPMI, APBH-DMA, ESDHC, FEC, QSPI, ECSPI, I2C,
USB-EHCI, GIS, LCDIF.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
1704e116f9b39aeb99201919a18bc2b1e19a980e)
Ye Li [Tue, 15 Mar 2016 14:12:46 +0000 (22:12 +0800)]
MLK-12483-3 mx6: Add a module fuse checking
Implement a functionality to read the soc fuses and check if any module
is fused. For fused module, we have to disable it in u-boot dynamically,
and change the its node in FDT to "disabled" status before starting the kernel.
In this patch, we implement the ft_system_setup for FDT fixup. This function will
be called during boot process or by "fdt systemsetup" command.
To enable the module fuse checking, two configurations must be defined:
CONFIG_MODULE_FUSE
CONFIG_OF_SYSTEM_SETUP
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
7236051526b73a5a25cc8330a79f5c08b7d70726)
Ye.Li [Wed, 11 Jun 2014 07:34:49 +0000 (15:34 +0800)]
ENGR00315894-55 iMX6SX: add debug monitor support
Debug monitor will print out last failed AXI access info when
system reboot is caused by AXI access failure, only works when
debug monitor is enabled.
Enable this module on i.MX6SX.
Signed-off-by: Anson Huang <b20788@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit
df6ac8531d498021ed379c74fc1847bd2cec7179)
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit
4f4ecdbf6fe2673b8ad117df1a4974bdb7e6aa4a)
Peng Fan [Fri, 17 Apr 2015 10:28:29 +0000 (18:28 +0800)]
MLK-10674-2 imx: mx6qp settings for PRE
Since the following piece settings can not be in DCD table, we
add them in enable_ipu_clock.
"
setmem /32 0x00bb048c = 0x00000002 ## Bypass IPU1 QoS generator
setmem /32 0x00bb050c = 0x00000002 ## Bypass IPU2 QoS generator
setmem /32 0x00bb0690 = 0x00000200 ## Bandwidth THR for of PRE0
setmem /32 0x00bb0710 = 0x00000200 ## Bandwidth THR for of PRE1
setmem /32 0x00bb0790 = 0x00000200 ## Bandwidth THR for of PRE2
setmem /32 0x00bb0810 = 0x00000200 ## Bandwidth THR for of PRE3
setmem /32 0x00bb0694 = 0x00000020 ## Saturation THR for of PRE0
setmem /32 0x00bb0714 = 0x00000020 ## Saturation THR for of PRE1
setmem /32 0x00bb0794 = 0x00000020 ## Saturation THR for of PRE2
setmem /32 0x00bb0814 = 0x00000020 ## Saturation THR for of PRE
"
CONFIG_VIDEO_IPUV3 is always defined in mx6sabre_common.h,
the settings sure will effect.
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit
61cec88a59ebf450dd1352d81e03b5aa842e1d71)
(cherry picked from commit
3d25e2acd48f605678a98cf594a715809dea8286)
Nitin Garg [Fri, 27 Mar 2015 19:45:43 +0000 (14:45 -0500)]
MLK-10496: Check the PL310 version for applying errata
Apply errata based on PL310 version instead of compile
time. Also set Prefetch offset to 15, since it improves
memcpy performance by 35%. Don't enable Incr double
Linefill enable since it adversely affects memcpy
performance by about 32MB/s and reads by 90MB/s. Tested
with 4K to 16MB sized src and dst aligned buffer.
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
(cherry picked from commit
31751fa9cf29ef4056f49fe06a54700a89c9bdc5)
Peng Fan [Mon, 9 Mar 2015 02:22:41 +0000 (10:22 +0800)]
MLK-10176-6 imx: mx7: Modify GPT timer driver for mx7
Modify the GPT common platform driver for mx7 which only use 24Mhz
OSC as clock source.
Note: at default, the mx7d will use system counter as timer. The GPT
is disabled.
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit
6e250796d6a07d84093eeae96e5a6e4c593cdb0b)
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit
708898fe547bd3d56f0abf7e40f1af91cf4271cf)
Fugang Duan [Mon, 11 Aug 2014 07:14:50 +0000 (15:14 +0800)]
ENGR00328312 i2c: imx: Optimize the i2c device recovery solution
From i2c spec, if device pull down the SDA line that causes
i2c bus dead, host can send out 9 clock to let device release
SDA.
But for some special device like pfuze100, it pull down SDA line
and the solution cannot take effort.
The patch just add NACK and STOP signal after 8 dummy clock, and pmic
can release SDA line after the recovery. Test case catch 375 times of
i2c hang, and all are recovered.
Signed-off-by: Fugang Duan <B38611@freescale.com>
(cherry picked from commit
53118db42d201d36ca9067b4bb0e2702399e100b)
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit
b8dcb812401026cb2189b24a4f6058830151c85a)
(cherry picked from commit
c5a44a2a0b2218221cb12645b10f0b34ecc6f79b)
Nitin Garg [Fri, 3 Apr 2015 14:59:45 +0000 (09:59 -0500)]
MLK-10576 ARM: i.MX6: exclude the ARM errata from i.MX6 UP system
The ARM errata 751472, 794072, 761320, 845369 only applied
to the following configuration:
This erratum affects configurations with either:
- One processor if the ACP is present
- Two or more processors
i.MX6 family does not have the ACP and thus only the MPCore system
will be impacted, which are the i.MX6DQ, i.MX6DL, and i.MX6QP.
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
Signed-off-by: Jason Liu <r64343@freescale.com>
(cherry picked from commit
0db960784ba4f631ee5c0321b5d25f3b1ac55640)
(cherry picked from commit
850f27d137a083a141c99fe9828d596807937d38)
Nitin Garg [Wed, 1 Apr 2015 01:37:36 +0000 (20:37 -0500)]
MLK-10524: iMX6x: Implement workaround for Cortex-A9 errata 845369
Under very rare timing circumstances, transitioning into streaming
mode might create a data corruption. Present on Two or more processors
or 1 core with ACP, all revisions. This erratum can be worked round
by setting bit[22] of the undocumented Diagnostic Control Register to 1.
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
(cherry picked from commit
70ad44e523680de67dd8b7a7505d7f27799980ee)
(cherry picked from commit
f20a65847577ff40dc7e3739a0bb69926885c734)
Ye Li [Mon, 14 Mar 2016 09:52:12 +0000 (17:52 +0800)]
MLK-12557 mx6ul: Enable syscounter as default timer
Use syscounter for i.MX6UL platform as default timer, not use GPT.
Add a CONFIG_GPT_TIMER for selecting GPT. Using CONFIG_SYSCOUNTER_TIMER
for selecting system counter.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
1c27c9ecf80b3cc63a7c9751ebfd11755f847b1d)
Ye Li [Fri, 11 Mar 2016 09:28:00 +0000 (17:28 +0800)]
ENGR00325255 pcie:enable pcie support on imx6sx sd
Enable pcie support in uboot on imx6sx sd boards
- enable_pcie_clock should be call before ssp_en is set,
since that ssp_en control the phy_ref clk gate, turn on
it after the source of the pcie clks are stable.
- add debug info
- add rx_eq of gpr12 on imx6sx
- there are random link down issue on imx6sx. It's
pcie ep reset issue.
solution:reset ep, then retry link can fix it.
(cherry picked from commit
ec78595a24b5ff1020baa97b6d6e79a3a3326307)
Signed-off-by: Richard Zhu <r65037@freescale.com>
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
81fd30250110d72992758f08b66c07306126892b)
Richard Zhu [Wed, 25 Jun 2014 06:20:16 +0000 (14:20 +0800)]
ENGR00319965 pcie: mask the imx6sl out
imx6sl doesn't have the pcie module, mask the pcie
related codes from imx6sl.
Signed-off-by: Richard Zhu <r65037@freescale.com>
(cherry picked from commit
acaff11da33f8f0cb1521d3c48e64e7ed9a87bec)
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit
48a4606ef575c72e16e31c167dce042fcb66191c)
Richard Zhu [Tue, 24 Jun 2014 01:59:47 +0000 (09:59 +0800)]
ENGR00319415 pcie: random link down issue after warm-rst
There are about 0.02% percentage on some imx6q/dl/solo
hw boards, random pcie link down when warm-reset is used.
Make sure to clear the ref_ssp_en bit16 of gpr1 before
warm-rst, and set ref_ssp_en after the pcie clks are
stable to workaround it.
rootcause:
* gpr regisers wouldn't be reset by warm-rst, while the
ref_ssp_en is required to be reset by pcie.
(work-around in u-boot)
* ref_ssp_en should be set after pcie clks are stable.
(work-around in kernel)
Signed-off-by: Richard Zhu <r65037@freescale.com>
(cherry picked from commit
5cc825b12c6b86a22f1a6a0535b52cf3ee142e77)
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit
6193cf4e3384a59e29546d13a67657f7faeafc9e)
(cherry picked from commit
7b4aabeddffabca46d7d6e7ef2611de468a6b4f7)
Ye.Li [Fri, 5 Jun 2015 14:11:41 +0000 (22:11 +0800)]
MLK-11064 imx: mx6qp: Adjust AQos settings for peripherals
To resolve USB camera bandwidth issue, the patch sets recommended AQoS
setting from IC team value for peripheral and only on imx6qp.
The address is: 0xbb0608, the value is: 0x80000201
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit
11906c712a52e7a20caf71d7c5da4e951a59db29)
(cherry picked from commit
5dcf073b8f2479a2adbb8d9fb03d9c9c70664e32)
Ye Li [Fri, 11 Mar 2016 07:44:01 +0000 (15:44 +0800)]
MLK-12534 mx6: shutdown vddpu and PCIE phy to save power
Shutdown VDDPU and PCIE phy to save power.
For PCIE, the i.MX6SL and i.MX6UL does not have this module,
so don't need it.
For VDDPU, the i.MX6UL does not have GPU, does not need it. And on
i.MX6QP there is narrow window that PRE driver is ready but GPU driver probe later,
and the later GPU driver turn on PU may cause 'PRE hang' issue. To simplify
thing, do not turn off PU in u-boot.
Reference:
commit:
6b0787b726e2ff32210d742d93ecd3f4bb2ae402
commit:
4bd0032c0eba50fa0caf43f50f735a3cfbe36a8d
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit
5c96ea91fe89c67991c929c9b39ffaa940d28391)
Ye Li [Fri, 11 Mar 2016 06:20:23 +0000 (14:20 +0800)]
MLK-12533 mx6sx: select OSC as uart's clk parent
As M4 is sourcing UART clk from OSC, to make UART work
when M4 is enabled, need to select OSC as clk parent,
24M OSC is enough for debug UART in uboot.
Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Anson Huang <b20788@freescale.com>
(cherry picked from commit
b5e1b393192099e91c5cb75b69291c87eacb9f60)
(cherry picked from commit
416dea861c2dd5a197bf2354069bba8415a20b12)