summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* MLK-12436-13: mx6ulevk: update board codePeng Fan2016-03-25-7/+69
| | | | | | | | | Align with imx_v2015.04. Add nand related settings. Update qspi pad electric settings. Add usb ethernet support. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12436-12: mx6slevk: update board codePeng Fan2016-03-25-6/+105
| | | | | | | | | | | | | | Add elan code, to handle epdc which has i2c devices. To 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 Align ddr script and header file to imx_v2015.04. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12436-11: mx6sabresd: add 6qp and solo build targetPeng Fan2016-03-25-0/+18
| | | | | | Add default build target for mx6qp and mx6solo. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12436-10: mx6sabresd: update board code and header fileYe Li2016-03-25-25/+122
| | | | | | | | | Align board code and header file with imx_v2015.04. Update pmic settings. wrap spi code together using CONFIG_MXC_SPI macro. To i.MX6SOLO, need to define CONFIG_MX6DL. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12436-9: mx6sabresd: update ddr scriptPeng Fan2016-03-25-82/+350
| | | | | | | | | | | | Align ddr script with imx_v2015.04 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>
* MLK-12436-8: imx: mx6qsabreauto: misc board updatePeng Fan2016-03-25-39/+211
| | | | | | | | | | | | | | To Align with imx_v2015.04. 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>
* MLK-12436-7: imx: mx6qsabreauto: add solo board supportPeng Fan2016-03-25-0/+134
| | | | | | Add solo version ddr script and build target. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12436-6: imx: mx6dqpsabreauto: update ddr script to 1.13Peng Fan2016-03-25-5/+15
| | | | | | | | | | | | | | | | | | 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>
* MLK-12436-5: imx: mx6qsabreauto: update ddr script filePeng Fan2016-03-25-4/+36
| | | | | | Align script file with imx_v2015.04. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12436-4: mx6qarm2: update board headerPeng Fan2016-03-25-2/+4
| | | | | | | Define CONFIG_MMCROOT, CONFIG_SYS_MMC_ENV_PART to align with imx_v2015.04. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12436-3: mx6qarm2: add new board revision supportPeng Fan2016-03-25-0/+299
| | | | | | | | | | | | | | 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: Peng Fan <peng.fan@nxp.com> Signed-off-by: Adrian Alonso <adrian.alonso@nxp.com>
* MLK-12436-2: mx6qarm2: update ddr scriptsPeng Fan2016-03-25-1/+179
| | | | | | | | | | | | | | | | | | | | | | | 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>
* MLK-12436-1: mx6qarm2: support lpddr2 boardPeng Fan2016-03-25-2/+12
| | | | | | Support lpddr2 board. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12444-2 mx6: Modify kernel and fdt load address to align with mfgtoolYe Li2016-03-25-4/+5
| | | | | | | | 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>
* MLK-12444-1 mfgtool: Add mfgtool supportYe Li2016-03-25-1/+136
| | | | | | | | | | | | 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>
* MLK-12440-10 mx6dq/dl: Add plugin boot support for arm2 boardsYe Li2016-03-25-3/+1198
| | | | | | | Add plugin.S for plugin boot initialization on mx6dq/dl arm2 board. Need to enable "CONFIG_USE_PLUGIN" for this feature. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12440-9 mx6dq/dl/dqp: Add plugin boot support for sabre boardsYe Li2016-03-25-7/+1373
| | | | | | | | Add plugin.S for plugin boot initialization on mx6dq/dl/dqp sabresd board and sabreauto board. Need to enable "CONFIG_USE_PLUGIN" for this feature. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12440-8 mx6slevk: Add plugin boot supportYe Li2016-03-25-2/+202
| | | | | | | Add plugin.S for plugin boot initialization on mx6slevk board. Need to enable "CONFIG_USE_PLUGIN" for this feature. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12440-7 mx6sxsabreauto: Add plugin boot supportYe Li2016-03-25-1/+150
| | | | | | | Add plugin.S for plugin boot initialization on mx6sxsabreauto board. Need to enable "CONFIG_USE_PLUGIN" for this feature. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12440-6 mx6sxsabresd: Add plugin boot supportYe Li2016-03-25-2/+150
| | | | | | | Add plugin.S for plugin boot initialization on mx6sxsabresd board. Need to enable "CONFIG_USE_PLUGIN" for this feature. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12440-5 mx7dsabresd: Add plugin boot supportYe Li2016-03-25-2/+236
| | | | | | | Add plugin.S for plugin boot initialization on mx7dsabresd board. Need to enable "CONFIG_USE_PLUGIN" for this feature. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12440-4 mx6ulevk: Add plugin boot supportYe Li2016-03-25-0/+371
| | | | | | | Add plugin.S for plugin boot initialization. Need to enable "CONFIG_USE_PLUGIN" for this feature. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12440-3 mkimage: Update imximage tool to support pluginYe Li2016-03-25-47/+215
| | | | | | Update imximage for parsing and adding plugin codes to IVT. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12440-2 mx7: Add plugin supportYe Li2016-03-25-0/+122
| | | | | | | Add mx7_plugin.S which calls boot rom setup function, generate the second ivt, and jump back to boot rom. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12440-1 mx6: Add plugin supportYe Li2016-03-25-0/+145
| | | | | | | Add mx6_plugin.S which calls boot rom setup function, generate the second ivt, and jump back to boot rom. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12439 mx6sxsabreauto: Enable GIS for the AI boardYe Li2016-03-25-0/+6
| | | | | | | | Enable the GIS feature for i.MX6SX sabreauto board. Need to define the "gis=vadc" environment variable for the gis input. At default this variable is not set. Signed-off-by: Ye Li <ye.li@nxp.com>
* ENGR00315894-81 gis: Add gis moduleYe.Li2016-03-25-1/+607
| | | | | | | | | | Add gis module, current gis is support vadc input. Add power down function to lcdif driver. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit a007b00dd8ef9f773dfdebef0b1deb0990281793) (cherry picked from commit a31dcdafb0963381e7213c59f79a340ef27ec2e2)
* ENGR00315894-80 pxp: Add pxp moduleYe.Li2016-03-25-0/+324
| | | | | | | | | | | Add pxp module. Support csc between YUV444 and RGB888 and scaling. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 4c6e1f9ed1b2f5c98a34502b44b6414593fdd290) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit 92295fafcdbaa3a3fe0a63ede15f896dfc9ce0b0)
* ENGR00315894-79 csi: Add csi moduleYe.Li2016-03-25-0/+425
| | | | | | | | | | Add csi module. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 854ae26758ec8132ef749b98645dd2f43b84e5e2) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit 5f133bd9420109951fd03bd5168801327e929c3b)
* ENGR00315894-78 vadc: Add vadc moduleYe.Li2016-03-25-0/+603
| | | | | | | | | | | Add vadc module. Both PAL and NTSC mode can work. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 03c31ae30c1e81c99f6824221e4801433445e04a) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit b5d776ffc1519c16091736445b3217ffb7fcd7db)
* ENGR00321299 gis: clean csi0 input mux set bit in GPRSandor Yu2016-03-25-0/+6
| | | | | | | | | | | When gis enable in uboot, the CSI0 input mux select setting to vadc module, clean the bit when gis disabled. Signed-off-by: Sandor Yu <R01008@freescale.com> (cherry picked from commit ae66b17b7da3be50dc81ca636b67e8e879f52e26) (cherry picked from commit c83fd326e810c2fff44b8b02e78406d5d04c977c) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit d6e803ed5f51d31ebe7e9d178aa11f16401b7fc8)
* ENGR00315894-77 mx6 soc: Add vadc power up/down functionYe.Li2016-03-25-2/+49
| | | | | | | | | | Add vadc power up/down function. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 96d990ef754a879f6ca9da4adf6e0be3d21cdc51) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit 01b88201aa86bef26a4254ac43aff90e99fd2c06)
* ENGR00315894-76 mx6 clock: Add vadc clock enable functionYe.Li2016-03-25-0/+13
| | | | | | | | | | Add vadc clock enable function. Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 721c7a1448c5b7265b597b83d18f8338a27ea213) Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit 903a59ef941f39b6d7f693dd7c60528e166de079)
* MLK-10655 Video: Fix second line string display issueYe.Li2016-03-25-4/+5
| | | | | | | | | | | The string display on second line repeats the last word of first line and does not show full. This is the bug introduced by the fixing to MLK-10542. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit ac430cee8c42f0acad9e126631d772b99f1166ea) (cherry picked from commit ff62c5b275a9b5e47d570d3eb10622799bf12070) (cherry picked from commit bd265a064c8f797e542955352d170e7f20f7b0d1)
* MLK-10542 video: Support multiple lines version string displayYe.Li2016-03-25-7/+23
| | | | | | | | | | | | | The caculation of left space for version string is not correct, should use VIDEO_COLS not VIDEO_LINE_LEN / 2, otherwise we will get larger space than actual have and cause string to overlay logo picture. Also current version string display only supports two lines words at max. This also causes overlay when the LCD pixel colume size is not enough. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit ed53487d36a886fb4557088804a4b5232b168889) (cherry picked from commit 253936bb920c5bb8e7d26e0425d155fb2576ab77)
* MLK-11211 lcd: fix build warningPeng Fan2016-03-25-4/+1
| | | | | | | | | | | | | | | Fix build warning: common/lcd.c: In function 'lcd_clear': common/lcd.c:166:6: warning: variable 'bg_color' set but not used [-Wunused-but-set-variable] int bg_color; ^ common/lcd.c: In function 'lcd_setmem': common/lcd.c:296:2: warning: format '%d' expects argument of type 'int', but argument 2 has type 'u_long' [-Wformat=] debug("LCD panel info: %d x %d, %d bit/pix\n", panel_info.vl_col, ^ common/lcd.c:296:2: warning: format '%d' expects argument of type 'int', but argument 3 has type 'u_long' [-Wformat=] Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-12437-6 mx7dsabresd: Update display to support panel selectionYe Li2016-03-25-8/+26
| | | | | | | Change to panel environment for display at default. Align this feature to v2015.04 uboot. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12437-5 mx6ulevk: Update display to support panel selectionYe Li2016-03-25-10/+27
| | | | | | | Change to panel environment for display at default. Align this feature to v2015.04 uboot. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12437-4 mx6sxsabreauto: Update display to support panel selectionYe Li2016-03-25-1/+124
| | | | | | | Support two display panels, one for LVDS, another for parallel LCD. Align the feature to v2015.04 uboot. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12437-3 mx6sxsabresd: Update display to support panel selectionYe Li2016-03-25-11/+89
| | | | | | | Support two display panels, one for LVDS, another for parallel LCD. Align the feature to the v2015.04 uboot. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12437-2 Video: Update the common board_video_skip to support MXS LCDYe Li2016-03-25-0/+14
| | | | | | Update the board_video_skip to use CONFIG_VIDEO_MXS for LCD display support. Signed-off-by: Ye Li <ye.li@nxp.com>
* MLK-12437-1 mx6sx: Add support for LVDS displayYe Li2016-03-25-1/+63
| | | | | | | The i.MX6SX uses a LVDS bridge to mux to the LCDIF interface. Implmement a function for this muxing. So that on 6SX we can use a LVDS display. Signed-off-by: Ye Li <ye.li@nxp.com>
* ENGR00315894-70 iMX6SX:Video Update MXS LCDIF driverYe.Li2016-03-25-11/+89
| | | | | | | | | | | | | | Add a new interface "mxs_lcd_panel_setup" to setup fb parameters and specifies the LCDIF controller for multiple controllers of iMX6SX. Pass fb parameters via "videomode" env remains work if the new interface is not called before video initialization. Modify LCDIF clock interface "mxs_set_lcdclk" to support multiple LCDIF controllers on iMX6SX. Signed-off-by: Ye.Li <B37916@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com> (cherry picked from commit d7f49b9378547c3a57b96bcdb907fc44616beb3d)
* MLK-12434-9: mx6: define CONFIG_BOARD_LATE_INITPeng Fan2016-03-25-0/+3
| | | | | | | Define CONFIG_BOARD_LATE_INIT for mx6qarm2/mx6slevk/mx6sxsabresd to let mmcdev/mmcroot work as expected. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12434-8: mx7dsabresd: dynamic setting mmcdev and mmcrootPeng Fan2016-03-25-35/+2
| | | | | | Dynamic setting mmcdev and mmcroot for mx7dsabresd. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12434-7: mx6ulevk: dynamic setting mmcdev and mmcrootPeng Fan2016-03-25-0/+4
| | | | | | Dynamic setting mmcdev and mmcroot for mx6ul evk board. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12434-6: mx6slevk: dynamic setting mmcdev and mmcrootPeng Fan2016-03-25-0/+9
| | | | | | Dynamic setting mmcdev and mmcroot for mx6slevk. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12434-5: mx6sxsabreauto: dynamic setting mmcdev and mmcrootPeng Fan2016-03-25-1/+20
| | | | | | Dynamic setting mmcdev and mmcroot for mx6sxsabresd. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12434-4: mx6sxsabresd: dynamic setting mmcdev and mmcrootPeng Fan2016-03-25-1/+17
| | | | | | Dynamic setting mmcdev and mmcroot for mx6sxsabresd. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* MLK-12434-3: mx6sabre: dynamic setting mmcdev and mmcrootPeng Fan2016-03-25-1/+35
| | | | | | Dynamic setting mmcdev and mmcroot for mx6sabresd and mx6qsabreauto. Signed-off-by: Peng Fan <peng.fan@nxp.com>