summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* MLK-11230 imx6: USB: Modify OTG ID pin pad setting to pull upYe.Li2015-07-09-14/+54
| | | | | | | | | | 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>
* MLK-11227 imx: mx6ul_14x14_lpddr2_arm2 add weimnor defconfigPeng Fan2015-07-09-5/+31
| | | | | | | | | | | | | 1. Add weimnor boot defconfig 2. move CONFIG_FSL_USDHC and CONFIG_VIDEO to board header 3. Add CONFIG_SYS_FLASH_PROTECTION for mx6ul 14x14 lpddr2 arm2 4. correct CONFIG_SYS_FLASH_SECT_SIZE and CONFIG_SYS_MAX_FLASH_SECT 5. Add comments for setup_eimnor, since ENET2_RXER pin conflicts with ENET2. Also eimnor support will disable SD1/SD2, need ENET to boot kernel and nfs using enet. So setup_eimnor should be invoked after setup_fec Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-11217 imx: mx6ul: Modify QSPI PAD DSE to 120ohmYe.Li2015-07-03-3/+3
| | | | | | | | The current pad DSE for QSPI is 60ohm. Per hardware team measurement, this setting cause too strong drive to clock and data signals. Need to change the DSE to 120ohm for better signal quality. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-11216-2 imx: mx7d-ddr3 remove epdc qos settingsPeng Fan2015-07-03-48/+0
| | | | | | Remove epdc qos settings from plugin.S, since set_epdc_qos does same thing. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-11216-1 imx:mx7d_12x12_ddr3_arm2 add missed Kconfig filesPeng Fan2015-07-03-0/+20
| | | | | | Add missed Kconfig files for mx7d_12x12_ddr3_arm2 board. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-11211 lcd: fix build warningPeng Fan2015-07-01-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-11201 mx7: clock: Fix PLL divider for the 100MHz caseFabio Estevam2015-06-29-1/+1
| | | | | | | We should divide the 1000MHz ENET PLL clock by 10 in order to achieve 100MHz, so fix the divider accordingly. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
* MLK-11159-2 Revert "MLK-11028 imx: mx6qp change L2 prefetch offset to 0"Robby Cai2015-06-24-1/+1
| | | | | | | | | | | | This reverts commit 2bc93d766dee5d5dc33035446f82622c4f1fb784. After further investigation, find L2 prefetch offset setting of 0xF is not the root cause for USB stress reboot failure. With the fix in USB driver, and L2 prefetch offset setting of 0xF, the reboot stress test has passed 4-days both on imx6q and imx6qp sabreauto board. Signed-off-by: Robby Cai <r63905@freescale.com> (cherry picked from commit 6e9282c2567b2820699fa55d2c6bf0ab78e992d6)
* MLK-11135-2 imx: mx6ul: Add MX6UL LPDDR2 ARM2 board supportYe.Li2015-06-19-0/+1363
| | | | | | | | | Add MX6UL LPDDR2 ARM2 board BSP codes, supported peripherals: SD1, eMMC(USDHC2), USB OTG1, I2C, ENET2, PMIC. Due to a board issue, the SD1 only supports 1 bit bus width. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-11135-1 imx: mx6ul: Abstract the common settings of 6UL ARM2 boardYe.Li2015-06-19-392/+407
| | | | | | | Create a new head file mx6ul_arm2.h, and move the common settings of MX6UL ARM2 boards to this file. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-11134-2 imx: mx7d_12x12_ddr3_arm2 update spi nor codePeng Fan2015-06-19-1/+6
| | | | | | | We should use board_spi_cs_gpio and remove the GPIO from CONFIG_SF_DEFAULT_CS. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-11134-1 imx: mx6ul_14x14_ddr3_arm2 correct CONFIG_DEFAULT_SPI_CSPeng Fan2015-06-19-1/+1
| | | | | | We should not put the GPIO in CONFIG_SF_DEFAULT_CS Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-11121 imx: mx6qpsabreauto use correct cfg filePeng Fan2015-06-17-7/+7
| | | | | | | | | | | IPU on/ L2 on --> nand fail IPU close/ L2 on --> nand ok IPU on/ L2 close --> nand ok This problem is because mx6qp.cfg should be used for mx6qpsabreauto, but not imximage.cfg which is for mx6qsabreauto. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-11059 imx: HAB unable to support Encrypted boot for 4096-bit keysUlises Cardenas2015-06-16-24/+84
| | | | | | | | Abstracted the CSF size in imximage from a hardcoded value to a config setting CONFIG_CSF_SIZE. This configuration is only enabled for secure boot. Increased the size of the CSF default allocation to 0x4000. This size covers the event the worst case of 4906-bits keys.
* MLK-11101 imx: mx6: Move the set_wdog_reset out of CONFIG_LDO_BYPASS_CHECKYe.Li2015-06-12-22/+22
| | | | | | | | Since the 6ul does not enable the CONFIG_LDO_BYPASS_CHECK, but have to use the set_wdog_reset function. Need to move the funciton out of CONFIG_LDO_BYPASS_CHECK to resolve build issue. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-11099 imx: mx6ul: Enable the Watchdog WDOG_B signal outputYe.Li2015-06-12-0/+2
| | | | | | | | 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 <B37916@freescale.com>
* MLK-11028 imx: mx6qp change L2 prefetch offset to 0Peng Fan2015-06-12-1/+1
| | | | | | Change L2 prefetch offset to 0 to make system stable. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-11035 imx: mx6 update thermal slope factorsPeng Fan2015-06-12-2/+2
| | | | | | | | | | | | | | | | | | | | From temp sensor guys: " I confirmed the math with him(had do the accuracy study) today. The new, final equation is: Tmeas = (Nmeas - n1) / slope + t1 + offset n1= fused room count t1= 25 offset=3.580661 slope= 0.4148468 – 0.0015423*n1 " 87723f903454aaf17336e0fe9098ea7911c19f3c update the thermal with not accurate slope parameters. This patch fix it. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-11090 imx: mx6ul: Add build target for emmc boot on ddr3 arm2 boardYe.Li2015-06-11-0/+7
| | | | | | | | | The mx6ul ddr3 arm2 board needs rework to enable the emmc. Since the pin used by emmc are multiplexed with SD1 and QSPI, the SD1 and QSPI can't work. The u-boot build target for emmc is: mx6ul_14x14_ddr3_arm2_emmc_config Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-11064 imx: mx6qp: Adjust AQos settings for peripheralsYe.Li2015-06-08-0/+3
| | | | | | | | | 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>
* MLK-11062 imx: mx7d arm2: Add nand mtdpart info to u-boot environmentsYe.Li2015-06-08-0/+22
| | | | | | For nand boot, the mtdpart info are needs to load kernel and rootfs. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-11050 ARM: imx6: configure the PMIC_STBY_REQ pin as open drainBai Ping2015-06-05-0/+9
| | | | | | | Configure the PMIC_STBY_REQ pin as open drain 100K according to the design team's requirement for the PMIC_STBY_REQ pin. Signed-off-by: Bai Ping <b51503@freescale.com>
* MLK-11033 imx: mx7d: Update the lpddr3 script to 3.0.3 revYe.Li2015-06-04-4/+4
| | | | | | | | | | | | | | | | | | Update the DDR script for i.MX7D 12x12 LPDDR3 ARM2 board and i.MX7D 19x19 LPDDR3 ARM2 board to file "7D_lpddr3_0_3.ds5" Updated items: Changes DRAMTMG2 WR2RD from 7 to 8. Compass link for this script: http://compass.freescale.net/livelink/livelink?func=ll &objid=233861153&objAction=browse&sort=name Test results: Passed overnight test on two MX7D 12x12 LPDDR3 ARM2 board Passed overnight test on one MX7D 19x19 LPDDR3 ARM2 board Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-11036 imx: mx6ul fix plugin build fail and update ddrPeng Fan2015-06-04-5/+9
| | | | | | | | | | Since directory name changed, need to change it in imximage.cfg, or we will get "Can't stat board/freescale/mx6ulevk/plugin.bin". Since this commit 7331a4cc0853722b4c3addf1927a2797f39f5de2 missed to update ddr, here update the plugin code. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-11011 imx: mx6ul-14x14-evk update ddr version to 1.1Peng Fan2015-06-02-4/+4
| | | | | | | | | | | | | | | | | | | | updated DDR Script of 6UL EVK Board to avoid a calibration error when using “DDR_Stress_Tester_V1.04.exe”. Updated items: [Modified] setmem /32 0x020E027C = 0x00000008 [Modified] setmem /32 0x020E0280 = 0x00000038 [Modified] setmem /32 0x021B080C = 0x00070007 [Added ] setmem /32 0x021B0858 = 0x00000F00 The script versions of EVK board and Validation Board from the following link: http://compass.freescale.net/livelink/livelink?func=ll&objId=234191407&obj Action=browse&viewType=1 Test Results: Tested on two boards, both passed overnight memtester stress test. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-11010 imx: mx7d: Fix EIMNOR lock issue on mx7d 19x19 lpddr3 boardYe.Li2015-06-01-0/+4
| | | | | | | | | | Since the flash blocks are locked at default , need to set "CONFIG_SYS_FLASH_PROTECTION" to unlock them before write/erase. The patch also add the pinmux for LBA (ADV) pin and set eimnor enabled at default. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-11008 imx: HAB: Fix secure boot configuration and build issueYe.Li2015-06-01-2/+2
| | | | | | | | | | | 1. There is conflict when building secure boot, because some common codes for MPC are included by using same configuration. So modify the makefile to get rid of them. 2. The 6UL arch config is missed in hab.h. Fix this issue by using the CONFIG_ROM_UNIFIED_SECTIONS. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10981 mxc: ocotp fix hole in shadow registersPeng Fan2015-05-29-6/+76
| | | | | | | | | | | | | | | | | | | | There is a hole in shadow registers address map of size 0x100 between bank 5 and bank 6 on iMX6QP, iMX6DQ, iMX6SDL, iMX6SX and iMX6UL. Bank 5 ends at 0x6F0 and Bank 6 starts at 0x800. When reading the fuses, we should account for this hole in address space. Similar hole exists between bank 14 and bank 15 of size 0x80 on iMX6QP, iMX6DQ, iMX6SDL and iMX6SX. Note: iMX6SL has only 0-7 banks and there is no hole. Note: iMX6UL doesn't have this one. When reading, we use register offset, so need to account for holes to get the correct address. When writing, we use bank/word index, there is no need to account for holes, always use bank/word index from fuse map. Signed-off-by: Nitin Garg <nitin.garg@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10972-2 imx: mx7dsabresd fix i2c index usagePeng Fan2015-05-26-1/+1
| | | | | | i2c_pad_info3's i2c index should 2, but not 1. Correct it. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10972-1 imx: mx7d Add SION bit for i2c pin muxPeng Fan2015-05-26-28/+28
| | | | | | Add SION bit for all i2c pin mux settings. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10958 imx: mx6ul support Bus Encryption EnginePeng Fan2015-05-25-1/+507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is to support Bus Encryption Engine(BEE) for i.MX 6UL. Supported feature: 1. SNVS key and soft key 2. CTR and ECB mode 3. Specify address region to bee. Two commands are included: bee init [key] [mode] [start] [end] - BEE block initial "Example: bee init 1 1 0x80000000 0x80010000\n" bee test [region] "Example: bee test 1\n" Mapping: [0x10000000 - (0x10000000 + size - 1)] : [start - (start + size - 1)] [0x30000000 - (0x30000000 + IRAM_SIZE - 1)] : [IRAM_BASE_ADDR - (IRAM_BASE_ADDR + IRAM_SIZE - 1)] Whatever start is, start - (start + size -1) will be fixed mapping to 0x10000000 - (0x10000000 + size - 1) Since default AES region's protected size is SZ_512M, so on mx6ul evk board, you can not simply run 'bee init', it will overlap with uboot execution environment, you can use 'bee init 0 0 0x80000000 0x81000000'. If want to use bee, Need to define CONFIG_CMD_BEE in board configuration header file, since CONFIG_CMD_BEE default is not enabled. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10956 imx: mx6ul: Change BSP name and dtb name for 14x14 packageYe.Li2015-05-25-75/+75
| | | | | | | | | | | | | | Since there is another 9x9 package for mx6ul, modify the BSP names of ddr3 arm2 board and evk board to add 14x14 package info. Also modify the loaded dtb file to align with kernel. After the change, the build target for mx6ul ddr3 arm2 board is: mx6ul_14x14_ddr3_arm2_config and the build target for mx6ul evk board is: mx6ul_14x14_evk_config Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10955 imx: mx7d arm2: Add NAND support for mx7d 19x19 lpddr3 arm2 boardYe.Li2015-05-25-0/+28
| | | | | | | | Add the default TSOP NAND support and build target. New build target for nand boot: mx7d_19x19_lpddr3_arm2_nand_config Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10546-2 imx: mx7 implement reset_miscPeng Fan2015-05-22-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | On mx7d 12x12 lpddr3 arm2 board, POR_B reset in uboot will fail stress reset test, and hangs in rom code. Rom log buffer show thats wrong hab_image_entry and runs into serial download mode. Also there is no time delay reset circuit for this board. We found when disable CONFIG_VIDEO, all seems fine. Actually, only the following piece of code can make stress reset ok, " writel(LCDIF_CTRL1_VSYNC_EDGE_IRQ, &regs->hw_lcdif_ctrl1_clr); while (--timeout) { if (readl(&regs->hw_lcdif_ctrl1) & LCDIF_CTRL1_VSYNC_EDGE_IRQ) break; udelay(1); } " Here we use lcdif_power_down API which is better to shutdown lcdif same as the way used in arch_preboot_os. Implement reset_misc for mx7, since it does not hurt for others boards. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10546-1 imx: mxsfb include fb.hPeng Fan2015-05-22-1/+3
| | | | | | Include fb.h in mxsfb.h. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10936 imx: mx7d: Change to use bootrom_sw_info for getting boot deviceimx_3.14.38_6ul_engrYe.Li2015-05-20-60/+56
| | | | | | | | | | | | | | | | | | | | | On MX7D, boot rom can provide some boot information such as boot device, arm freq, axi freq, etc. (see the structure below) Offset Byte4 | Byte3 | Byte2 | Byte1 0x0 Reserved | Boot Device Type | Boot Device Instance | Reserved 0x4 ARM core frequency(in Hz) 0x8 AXI bus frequency(in Hz) 0x0C DDR frequency(in Hz) 0x10 GPT1 input clock frequency(in Hz) 0x14 Reserved 0x18 0x1C The boot information can be accessed by get the pointer at 0x1E8. This patch changes the u-boot to use the new approach. When manufacture boot, the info recorded is the actual SD port, not the failed device. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10931 imx: wdog: Turn off internal reset signal for mx7dYe.Li2015-05-20-0/+4
| | | | | | | Set wdog WCR register SRS bit to turn off internal reset signal WDOG_RESET_B_DEB for mx7d. So that the warm reset is disabled. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10908: imx: mx6sx Add mx6sx_17x17_arm2_qspi2 configHan Xu2015-05-15-0/+7
| | | | | | This config was missed when porting to 2015.04 u-boot. Signed-off-by: Han Xu <b45815@freescale.com>
* MLK-10885 imx: mx6slevk ignore elan init when no epdc on boardPeng Fan2015-05-14-13/+21
| | | | | | | | | | | | | | | | If no epdc pannel is plugged into mx6slevk board, no need to do the elan init operation for each i2c init transfer which will slow the i2c speed. If epdc panned is plugged into mx6slevk board, all works as the original patch: "b6ba68516b681a38025252bd0ef6a6ed3e8adfa0" - "MLK-10215 Add elan init in i.MX6SL-EVK board" This patch also fix a bug that setup_elan_pads should be called in board_init, but not board_late_init where too late to setup_elan_pads. And align pad property with linux kernel, value is 0x17000. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10839: arm: imx: mx7d 19x19 lpddr3 arm2 board supportAdrian Alonso2015-05-13-2/+1072
| | | | | | | | | | | | | * Add mx7d_19x19_lpddr3_arm2 target board supprt * Enable i2c, spinor, usb, usdhc, qspi, enet, uart * Build targets mx7d_19x19_lpddr3_arm2_defconfig mx7d_19x19_lpddr3_arm2_eimnor_defconfig - Set EIMNOR settings for Intel Sibley Asynchronous mode - Set flash sector size for 256kb (erase block size) Signed-off-by: Adrian Alonso <aalonso@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10884 imx: MX6SX: Fix IOMUXC GPR registers access issueYe.Li2015-05-13-6/+2
| | | | | | | | The iomuxc structure has changed to add 0x4000 offset for i.MX6SX and UL, so when using this structure to access gpr registers needs to change the base address to IOMUXC_BASE_ADDR. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10873-2 imx:mx6ul removed uncompiled pmic codePeng Fan2015-05-11-8/+0
| | | | | | | This piece of code will never be compiled and used, since we use pmic framework. So remove the code block. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10873-1 imx:mx7d use pmic frameworkPeng Fan2015-05-11-93/+58
| | | | | | Use pmic framework to simplify code and make code clean. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
* MLK-10870 imx: mx7d: Implement to get board serial numberYe.Li2015-05-11-1/+7
| | | | | | Get the Unique ID of the chip from the fuse TESTER0 and TESTER1. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10865 imx: mx6ulevk: Add android supportYe.Li2015-05-08-0/+182
| | | | | | | | Add android features booti, fastboot and recovery to i.MX6UL EVK board. Since there is no user button on the board, we can't implement the recovery by using button. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10855 imx: mx6ulevk/ddr3_arm2: Fix bmode value for SD1 and SD2Ye.Li2015-05-07-3/+3
| | | | | | Correct USDHC Port Selection bits in bmode value for SD1 and SD2. Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10852 imx: mx6ul_ddr3_arm2: Add support for NAND bootYe.Li2015-05-07-20/+27
| | | | | | | | | | | Since the NAND has two pins conflict with SD2, when NAND is enabled, we must disable SD2. So the CONFIG_SYS_FSL_USDHC_NUM needs configure to 1 and should be moved to under defining CONFIG_SYS_USE_NAND. New build target for NAND boot: mx6ul_ddr3_arm2_nand_config Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10841 imx: mx6ul_ddr3_arm2: Add support for WEIMNOR bootYe.Li2015-05-07-5/+17
| | | | | | | | | | Correct the EIMNOR settings to non-mux mode and set the environment variables configuration to FLASH when using WEIMNOR boot. New target is added for build WEIMNOR boot u-boot: mx6ul_ddr3_arm2_eimnor_config Signed-off-by: Ye.Li <B37916@freescale.com>
* MLK-10740: add maximum ecc platfrom can supportHan Xu2015-05-07-1/+7
| | | | | | | | Add maximum ecc strength for each platfrom to avoid the calculated ecc exceed the limitation. Signed-off-by: Han Xu <b45815@freescale.com> (cherry picked from commit fdc5bac6ae8b699924c4e84b86e38aa73f694827)
* MLK-10747-2 video: ipu: Enable/disable LDB_DI clock when necessaryLiu Ying2015-05-07-7/+65
| | | | | | | | This patch adds enable/disable hooks support for ldb_di[0/1] clocks and enables/disables them when necessary. Signed-off-by: Liu Ying <Ying.Liu@freescale.com> (cherry picked from commit 839a1da941be48baf27c9cb28939cc6b2030424a)