summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-10MLK-19722-4 doc: imx: mkimage: reorganize i.MX mkimage documentationBreno Lima
The following documents describe the image type used by the mkimage tool to generate U-Boot images for i.MX devices. - README.imximage - README.mxsimage Move all mkimage related document to doc/imx/mkimage for a better directory structure. Signed-off-by: Breno Lima <breno.lima@nxp.com> (cherry picked from commit 57310be619b009bd7df804702d1bad724bc87430)
2018-10-10MLK-19722-3 doc: imx: Move SPD related info to the appropriate docBreno Lima
Currently the Serial Download Protocol tools and procedure are documented in two places: - doc/imx/README.sdp - doc/imx/README.imx6 It is better to consolidate all SDP related information into README.sdp file, so move the content from README.imx6 to README.sdp. Signed-off-by: Breno Lima <breno.lima@nxp.com> (cherry picked from commit 27373a1723f427fd271ff1b39de2f0bca8c5302d)
2018-10-10MLK-19722-2 doc: imx: reorganize i.MX documentationBreno Lima
Currently the U-Boot doc/ directory contains the following files that are only relevant for i.MX devices: - doc/README.imx25 - doc/README.imx27 - doc/README.imx5 - doc/README.imx6 - doc/README.imximage - doc/README.mxc_hab - doc/README.mxs - doc/README.mxsimage - doc/README.sdp Move all content to a common i.MX folder for a better documentation structure. Signed-off-by: Breno Lima <breno.lima@nxp.com> (cherry picked from commit a5e99a185aa09dfe964d9ba3f435f2ec0374c033)
2018-10-10MLK-19722-1 doc: Move device tree bindings documentation to ↵Breno Lima
doc/device-tree-bindings Currently the U-Boot project contains 2 documentation directories: - doc/ - Documentation/ The Documentation directory only contains device tree bindings related content, so move the 2 files to doc/device-tree-bindings/. This commit is based in a previous submission in U-Boot upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=ad7061ed742e1312289644268859a0f4b512aaee Signed-off-by: Breno Lima <breno.lima@nxp.com> (cherry picked from commit 10bb5cf4d0a4d079c1463df6d4cb3f51f1b5ad18)
2018-10-10MLK-19783-2 mx6slevk: Fix wrong mmcdev value in spinor build imageYe Li
Decouple the CONFIG_SYS_MMC_ENV_DEV with CONFIG_ENV_IS_IN_MMC to fix wrong mmcdev value in spinor build image. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit f800cd6890900c79266750a4faff375028612ecb)
2018-10-10MLK-19783-1 mx6sx_ard/sdb: Fix wrong mmcdev value in qspi build imageYe Li
We are using CONFIG_SYS_MMC_ENV_DEV for default value of mmcdev env. But this config is bound with CONFIG_ENV_IS_IN_MMC, so it is not valid for qspi build image. Fix the issue by decoupling two configs. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 52b48188ec1cc4e352beb034991657df8ce78129)
2018-10-10MA-12973 [AUTO] Skip serial init in board_init_fJi Luo
Serial init in board_init_f will cost much time, skip it here because the serial will be initialized again in board_init_r and it's more faster (after cache is enabled). We will miss some logs before the serial is ready but it's ok for Android Auto. This commit will save about 190ms on imx8qm. Test: boot ok for both imx8qm and imx8qxp. Change-Id: If6efdc19794aecda862f22b6fec7f7aba2005766 Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit b8296e64d2af14ec231f308a0318b0567c07e545)
2018-10-10MLK-19789 mach-imx: imx8: Make the eMMC container offset SOC dependantAbel Vesa
This is a hack for imx8qm-mek, since the offset of the flash.bin image on eMMC differs when compared to imx8qxp-mek. Basically, the default value is 32K, but for 8qm-mek it's 0. This can go away once the qm and qxp get aligned (again) from this point of view. Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit e9f87deae7e8cb3e71012f85c488e0a0d108762a)
2018-10-10MLK-19777-03: imx8mm_evk: Optimize the ddr4 init flowBai Ping
Optimize the DDR4 init flow. Split the common flow with the DDR specific timing config. So the common flow can be reused. Signed-off-by: Bai Ping <ping.bai@nxp.com> (cherry picked from commit 65fed31a520edf2f19f7fd1c10ff317ce4496ce6)
2018-10-10MLK-19777-02 imx8mm: rename lpddr4_timing variable to dram_timing.Bai Ping
For LPDDR4 and DDR4, we use the same dram_timing struct to config parameters. rename the 'lpddr4_timing' to 'dram_timing' for common use. Signed-off-by: Bai Ping <ping.bai@nxp.com> (cherry picked from commit 4e9048d810eb92c395453a28dea2a44961e08948)
2018-10-10MLK-19777-01: imx8mm: rename the lpddr4_ddrphy_train fileBai Ping
For LPDDR4 or DDR4, the ddr phy train flow is the same. So rename the 'lpddr4_ddrphy_train.c' to 'ddrphy_train.c'. make it more common for reuse and move it to driver/ddr/imx8m/. Signed-off-by: Bai Ping <ping.bai@nxp.com> (cherry picked from commit 258db72309ec47b99cec89c06f6b4491f9951b27)
2018-10-09MLK-19767-1: imx7ulp: configs: Enable DEFAULT_FDT_FILEShenwei Wang
Specify the default dtb file for kernel boot per i.MX7ULP board config. Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com> Reviewed-by: Frank Li <Frank.li@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com>
2018-10-09Revert "MLK-19767: imx7ulp: configs: add a new macro for kernel dtb"Shenwei Wang
This reverts commit 26766be89286cad4946655b3004ab0fc4ef63a65.
2018-10-09MLK-19697 imx6sx sd board emmc config should use emmc kernel dtb defaultFrank Li
change default dtb to imx6sx-sdb-emmc.dtb when config as emmc Signed-off-by: Frank Li <Frank.Li@nxp.com>
2018-09-29MLK-19762 imx8mm: Fix i2c pad issue in SPLYe Li
We enable the pull-up resistor for i2c pad by setting the PAD_CTL_PUE. But this requires to enable pull resistors first by setting PAD_CTL_PE on iMX8MM, otherwise the pull-up won't work. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit e2985a6e6437bba1b07ea88527aa83e1eda6d691)
2018-09-29MA-12283-4 remove the limitation of lock when use uuufaqiang.zhu
For imx8 chips, if boot from usb, lock status will be ignored for the convenience of using uuu. For imx6 and imx7, the presistdata partition is ignored, so unlock operation can alway succeed. Change-Id: I842bab9fd2c04f8a864f4a134b63efc4436f71a4 Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com> (cherry picked from commit bea54d4fbee5871187d80b67a5ace10577714f1e)
2018-09-29MLK-19767: imx7ulp: configs: add a new macro for kernel dtbShenwei Wang
The current u-boot configures the fdt_file environment variable to the file name of that built together with u-boot. Sometimes Linux kernel needs another dtb file other than the one built with u-boot. For example, imx7ulp needs to build imx7ulp-evk-qspi.dts for u-boot, but the kernel needs imx7ulp-evk.dts. Adding this new macro to let the user have an option to specify a dtb file to run Linux kernel. Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com> (cherry picked from commit 26766be89286cad4946655b3004ab0fc4ef63a65)
2018-09-29MLK-19768 fix mx6sxsabreauto sd_devFrank Li
sd_dev should be 0 Signed-off-by: Frank Li <Frank.Li@nxp.com> (cherry picked from commit 2e8a6b6ec6fec342c1076668e11a28676e8c27eb)
2018-09-29MLK-19769-2 iMX8QM SPL: Add QSPI defconfigAbel Vesa
Add the imx8qm_mek_spl_fspi_defconfig to allow booting from QSPI. Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 943dda2374128e4190e7de8eca99adaa6ad60fc7)
2018-09-29MLK-19769-1 iMX8QM SPL: Add QSPI support for imx8qm_mekAbel Vesa
Allow iMX8QM mek SPL to boot from QSPI. Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit e2c73faa7b2048551824773adf66b3912108d867)
2018-09-29MLK-19770-4 iMX8QM SPL: imx8qm_mek: add iMX8QM SPL defconfigAbel Vesa
Add a defconfig for SPL build for iMX8QM MEK board Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 5555cbfbfc5d7688f407ee5137a9ba2b0fc1c979)
2018-09-29MLK-19770-3 iMX8QM MEK SPL: arm: mach-imx: Add SPL support for iMX8QMAbel Vesa
Enable SPL support for iMX8QM MEK board. Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 5e18e5de3e2db6e096dd0314167ac05e8723bdca)
2018-09-29MLK-19770-2 iMX8QM SPL: include/configs: imx8qm_mek: Add SPL build configAbel Vesa
Add all necessary configs when building for SPL based on CONFIG_SPL_BUILD set. Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 143b65448e5717cfc51b6ac94594eaf651afbb8d)
2018-09-29MLK-19770-1 iMX8QM SPL: board: imx8qm_mek: Add spl implementationAbel Vesa
Add spl implementation for iMX8QM MEK board. Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 3695f4c41c1643d4dadb67eb8a52f775ac8abeb2)
2018-09-29MA-12943 [VTS] Fix firmware dtbo verify failJi Luo
VTS need commandline 'androidboot.dtbo_idx=<dtb_index_in_dtbo>' to verify fdt overlay. Pass the dtb index as "0" here since we only have one dtb in dtbo partition and haven't enabled the dtb overlay. Test: VTS case "VtsFirmwareDtboVerification#testVerifyOverlay" pass on imx8mq and imx8qxp. Change-Id: I33b089bf5a945e0b558bbb189b183a38f145dcbe Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 4d7f5fd7afbe8516757928ba7ff76b768a80c094)
2018-09-29MLK-19183-14: iMX8QXP SPL: Add ARM2 SPL defconfigTeo Hall
Add imx8qxp_lpddr4_arm2_spl_defconfig for lpddr4 boards Signed-off-by: Teo Hall <teo.hall@nxp.com> (cherry picked from commit 95e2bc161a677c59d2d2d43dd562283a8b64d118)
2018-09-29MLK-19183-14: iMX8QXP SPL: Add ARM2 board supportTeo Hall
Add implementation for ARM2 LPDDR4 board Signed-off-by: Teo Hall <teo.hall@nxp.com> (cherry picked from commit a6b6fd8aa69c2f8a9a4c8b5a15de6aa044b39fba)
2018-09-29MLK-19628: imx6ulz: configs: adding optee supportSilvano di Ninno
Adding new config file to enable OP-TEE support. Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com> (cherry picked from commit e3c26a7b908a6a3591ab2e619735c44a85e23972)
2018-09-29MA-12915 [AUTO] Only print kernel command line in debug modeJi Luo
Print the kernel command line in normal mode will consume about 122ms on imx8qm, move the log print to debug mode to save some boot time. Change-Id: I5996555cf3f210be8ea25111d2bc84e0d06caa5c Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit d71dcb917590227abd55e9486ea3b4d4de81f115)
2018-09-29MA-12913 [AUTO] Remove unnecessary uboot commandsJi Luo
This commit remove some unnecessary u-boot commands to reduce the u-boot image size. this will decrease about 17K bytes size and about 10ms boot time for imx8qm. Test: build and boot ok on imx8qm and imx8qxp. Change-Id: I54e4836e0504f69bf295fe8412bd2361a0324b73 Signed-off-by: Ji Luo <ji.luo@nxp.com> (cherry picked from commit 04de18c2b17dabdbf110cb655d35c7a398c0c179)
2018-09-29MLK-19748: configs: add iminfo command for all 7d configsHan Xu
add iminfo command for all 7d configs Signed-off-by: Han Xu <han.xu@nxp.com> (cherry picked from commit 080465178cde0017ba2df841fb70511e83bb4904)
2018-09-29MLK-19699: imx6ulz: configs: add fastboot for qspi/nand configsHan Xu
Add fastboot for qspi and nand config for ulz platform, also changed to use 64K sector size for qspi erase. Signed-off-by: Han Xu <han.xu@nxp.com> (cherry picked from commit 546ad31a2e57d8991a5be4257d43b5645255c2f6)
2018-09-29MLK-19726-2 arm: Don't remove all devices when power domain driver is enabledYe Li
Because we power off all devices in board_quiesce_devices which is prior then executing dm_remove_devices_flags. So any access to HW in dm_remove_devices_flags will cause problem. However, some drivers like ethernet which implements the pre_remove callback is always called without any flags check, and this finally accesses FEC controller. Since we don't need to remove all devices in u-boot before starting kernel, disable this feature when power domain is enabled. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 741f2ea182bf293d8270bdc4a217a96db22c414c)
2018-09-29MLK-19726-1 Revert "MLK-18568 imx8: disable the DM devices removing"Ye Li
This reverts commit af92ba299b2b87cde02bbd4f534f1a30b45552cd. Disable the CONFIG_DM_DEVICE_REMOVE will cause device_remove function do nothing. But it is needed by some drivers like usb, mmc, sf. When running "usb start" then "usb stop", it does not stop the usb, and cause problem to next "usb start". (cherry picked from commit b78c0eab73d19e945c6c98ea50c3e975f20ca249)
2018-09-29MA-12536-1[Android] Enable RTC for imx8m in ubootZhang Bo
Enable RTC in bootloader to avoid rtc time less than jiffies time when linux first bootup after RTC lose power. It will cause the issue as MA-9554[Android_6DL_SD]RTC: Sometimes the RTC reset to the initial time 1970 after softare reboot the first time. 40% Change-Id: I048a148003241f73345aeb8ff0fda8fc328c0efb Signed-off-by: Zhang Bo <bo.zhang@nxp.com> (cherry picked from commit 1a34c017d7838947870f84934f84adf351978411)
2018-09-29MA-12886 Set keymaster HAL to trusty when use Trusty OSHaoran.Wang
When use Trusty OS, set the property keymaster HAL to use the Trusty OS backed one. This patch make the bootloader able to control the Android Keymaster HAL. Change-Id: I0a533c12b99824ef499ce642cf87c22d72b51503 Signed-off-by: Haoran.Wang <elven.wang@nxp.com> (cherry picked from commit a0759c1bd75fab610f595fd9cd6b7c494ba5177e)
2018-09-29MLK-19691 mx7ulp_evk: Fix build warningYe Li
Fix the build warning below on iMX7ULP EVK board. The root cause is compiler uses integer for PHYS_SDRAM 0x60000000 when calculating the value for CONFIG_SYS_MEMTEST_END. So we add "ul" postfix to define its type to ulong. In file included from include/config.h:6:0, from include/common.h:21, from cmd/mem.c:14: cmd/mem.c: In function ‘do_mem_mtest’: include/configs/mx7ulp_evk.h:91:63: warning: integer overflow in expression [-Woverflow] #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_SIZE >> 1)) ^ cmd/mem.c:877:8: note: in expansion of macro ‘CONFIG_SYS_MEMTEST_END’ end = CONFIG_SYS_MEMTEST_END; Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 5eb040227b2d591acfd04d75a234ede1f78a198a)
2018-09-29MLK-19690 mx7ulp: Fix issue in selecting BOARD_LATE_INIT configurationYe Li
The BOARD_LATE_INIT config does not have input prompt, so we can't configure it to Y in defconfig. Modify the Kconfig in mx7ulp to select the BOARD_LATE_INIT when the boards are used. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 0f3667ddd4dae02d0d309fe68df26979d9e3c432)
2018-09-29MA-12847 [Android] skip checking the resource on android autozhang sanshan
camera sometime can't been open once run M4 image. ISI-CH0 probe funtion is not called when meet issue. The root cause is: M4 image set assign resource SC_R_ISI_CH0 into m4 partition when open camera in m4 side. Uboot will call update_fdt_with_owned_resources to check the pd in current dts node. it will call sc_rm_is_resource_owned to check the pd whether in other partition, If yes, it will delete the dts node. uboot delete isi_0 node whose pd is SC_R_ISI_CH0. Change-Id: I4e2afbed2c55caad0a9f804fa8d85511c3bfea38 Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com> (cherry picked from commit 23487f8f3ea5406fe37a15f4191ca9ed5350829d)
2018-09-20MLK-19660 imx8mq_arm2: fix build break due to header file missedYe Li
The "imx_env.h" is not included, so when using default mfgtool environments, we get build break. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2018-09-20MLK-19645 mx6ulz_evk: Fix fdt_file variable issueYe Li
Since we set the fdt_file value when running on iMX6ULZ. This cause the saved fdt_file change be overwritten. So users can't set to their own fdt_file. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2018-09-20MLK-19625 mx6ulz_evk: Disable the FEC driver and support USB2NET dongleYe Li
Since the mx6ulz don't have FEC, it needs to use USB2NET dongle to connect network. We decouple the CONFIG_FEC_MXC with CONFIG_CMD_NET. For 6ull, all defconfigs need to enable the CONFIG_FEC_MXC explicitly. Another change is adding ${usb_net_cmd} environment for usb start command in netboot scripts on 6ulz. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2018-09-19MLK-19627 arm: Round the dma_alloc_coherent memory size to cache line alignedYe Li
When running uuu on iMX8MQ, meet USB enumeration failure in fastboot. The root cause is a cache issue in dwc3 driver. When the issue happens, the ctrl_req in gadget driver is allocated at 0xfe932f40, and the usb_composite_dev (cdev) is allocated at 0xfe932f60. So after we submit the setup request (cache flushed) to USB controller, any accessing to usb_composite_dev variable will cause the cache refill, then when setup transfer is completed, reading the setup data in ctrl_req will gets old value from cache not from memory. The ctrl_req is allocated by API dma_alloc_coherent, but u-boot don't have cohernet memory. so it still needs cache maintain operations before/after HW accessing. Since the cache flush or invalidate bases on cache line, so when the allocated memory size is not cache line aligned, potentially it may meet such issue. This patch modifies the dma_alloc_coherent API to round the size to cache line aligned. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2018-09-18MLK-19183-13 iMX8QXP SPL: Add QSPI defconfigAbel Vesa
Add the imx8qxp_mek_spl_fspi_defconfig to allow booting from QSPI. Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com>
2018-09-18MLK-19183-12 iMX8QXP SPL: Add QSPI support for imx8qxp_mekAbel Vesa
Allow iMX8QXP SPL to boot from QSPI. Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com>
2018-09-18MLK-19219-4 iMX8QXP/QM: Add support to get container image set size from QSPIAbel Vesa
This transforms almost all related functions from mmc specific to device independent. This allows the container size to be computed from QSPI and other future devices that will be supported for boot. Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com>
2018-09-17MLK-19602 imx8mq_arm2: Fix environments issue for burning NAND in uuuYe Li
When running uuu to burning NAND on imx8mq DDR4 ARM2, meet two u-boot environments problems. 1. fastboot won't be run in regular u-boot, due the bootcmd_mfg is not correct. 2. mtdparts in bootargs are not updated to align with uuu. Signed-off-by: Ye Li <ye.li@nxp.com>
2018-09-17MLK-19599 imx8mm_ddr4_evk: Add NAND boot supportYe Li
Add SPL and u-boot support to load images from RAWNAND device when booting from RAWNAND. The NAND SPL loads the FIT image from nandfit mtdpart at 64MB offset of NAND. Users need uuu to burn the FIT image, kernel, DTB and rootfs to all fixed mtdparts. Since NAND SPL needs large BSS and MALLOC size, this patch also moves the MALLOC pool to DDR, and enable MALLOC_F pool on OCRAM for all malloc before DDR initialization. Signed-off-by: Ye Li <ye.li@nxp.com>
2018-09-17MLK-19595 imx6ulz: add emmc, nand, and qspi boot supportRobby Cai
add config for emmc, nand and qspi boot Signed-off-by: Robby Cai <robby.cai@nxp.com>
2018-09-14MLK-19594: imx8qx: config: enable fastboot for i.MX8QXP lpddr4 validation ↵Han Xu
defconfig enable fastboot for i.MX8QXP arm2 lpddr4 validation defconfig and add NAND parameters for all configs. Signed-off-by: Han Xu <han.xu@nxp.com>