summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2018-08-20[iot] Support dual bootloader in SPLLuo Ji
Move the A/B slot check to SPL, the A/B slot switch workflow is just like what we have in libavb_ab. Test: A/B select works fine on imx8m. Change-Id: Ie3d827a9be0298b491bf2bc8d48833597fd70e90 Signed-off-by: Luo Ji <ji.luo@nxp.com>
2018-08-20MA-12120 [Android] Enlarge buffer size for partition nameLuo Ji
Some partition name can be larger than 16 bytes like "factory_bootloader", enlage the buffer size to 20 bytes. Change-Id: I266c4e0af02e0ac1d758334aafcd6ed41d072dba Signed-off-by: Luo Ji <ji.luo@nxp.com>
2018-08-20[iot] Correct oem and vendor partition typeHaoran.Wang
Correct oem and vendor partition to ext4. This make it available to use fastboot command to format above two parts. Test: Builds, loads & boots successfully. ext4 file system type displayed for expected partitions in "fastboot getvar all" output.. Change-Id: If6d2c58abfb526a7162fb4cd644b6e1e209f8456 Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
2018-08-20[iot] Check Trusty OS available before load itYu Shan
When SECURE_BOOT enabled, use HAB verify Trusty OS image or check its IVT available. If not available, bootloader consider the TOS lost unexpected and wipe all data on disk. Then enter limited fastboot mode. In this situation only bootloader and tos is able to flash, gpt won't be available for external. Change-Id: I04f037f5bd5a51f53174b5b99b2c3053182a8fcf Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
2018-08-20[iot] Support reading ATAP certificate UUID from keymasterYu Shan
Add API and IPC calls to read the ATAP certificate UUID from keymaster. Also rename const local variables to the standard convention. This cherry-picked the CL 649562 from trusty/external/trusty. Bug: 76211194 Change-Id: I98ab68180c3855e07884994dc20b879f0b59965d Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
2018-08-20[iot] Support atap in u-boot for imx7dYu Shan
Support Android Things Attestation Protocol in u-boot for imx7d. Change-Id: I0aef8f208cf8e81238248efc8d7dcfdbc09c3119 Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
2018-08-20[iot] Support fastboot oem fuse at-perm-attr commandYu Shan
Support "fastboot oem fuse at-perm-attr" command for ATX. The perm_attr will be stored into RPMB which managed by Trusty OS. Modified permanent_attributes related AVB ops that support Trusty OS backed RPMB storage. Change-Id: Id6248570b4294fed3c45270064196bd6b9cf9208 Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
2018-08-20[iot] Update libavb in u-bootLuo Ji
This commit did: 1. Sync AVB lib with external/avb, head of commit is: commit 6d5326a945c2d17d5d0e7718d5cb97663c3b33a2 Author: Neal Ostrem <nealo@google.com> Date: Tue Apr 24 13:09:45 2018 -0700 Merge fix/changes required after merge from AOSP ToT. Change library name to one used by AT. Test: Built successfully and unit tests pass. Change-Id: I5e5fc9a6010d96cfecfc6faf0858ba930cba65a0 2. Change product id in ATX to be full zeros to sync with external/avb. 3. Fix build errors and implement ops fsl_set_key_version. 4. Move most nxp modified code to lib/avb/fsl/. Test: build and boot successfully for imx7d_pico and imx8m_phanbell. Change-Id: I199a035fe8267b10955299a4b745458d40a2e754 Signed-off-by: Luo Ji <ji.luo@nxp.com>
2018-08-20[iot] Corrent product and variant name for PhanbellHaoran.Wang
This will make "fastboot flashall" work. Test: "fastboot flashall" work on imx8m_phanbell. Bug: 79999777 Change-Id: Iea25c79f761ccc57675980f41a8c3efc396109fb Signed-off-by: Haoran.Wang <elven.wang@nxp.com> Reviewed-on: http://androidsource.ap.freescale.net/project/4123 Reviewed-by: guoyin.chen <guoyin.chen@nxp.com>
2018-08-20[iot] Change the format of CONFIG_SPL_MAX_SIZELuo Ji
Target u-boot-with-spl.imx won't be genarated due to aarch64-linux-android-objcopy can't identify the value of CONFIG_SPL_MAX_SIZE as format "(124 * 1024)", error message like below: aarch64-linux-android-4.9/bin/aarch64-linux-android-objcopy: --pad-to: bad number: (124 * 1024) Test: build and loaded on imx8m board. Change-Id: I19b609011e3056200767ef7648a64a5050a88d36 Signed-off-by: Luo Ji <ji.luo@nxp.com>
2018-08-20[iot] Load fdt from oem_bootloader using dtimg formatBraden Kell
See http://cs/android/system/libufdt/utils/README.md for the dtimg format. Bug: 78537598 Bug: 78630913 Bug: 78904624 Test: iMX7D boots with new oem_bootloader format. Test: iMX8M boots with new oem_bootloader format. Change-Id: I2cab38a0f0706586a9e4fb06b75e29c82d134032
2018-08-20[iot] Update Trusty IPC code to latestJocelyn Bohr
Update to commit bb39a2b12dce8b6c9df9012faf231648de795e6d List of changes: bb39a2b ql-tipc: Support ATAP operations from bootloader 62b8d61 ql-tipc: Move serialization code to keymaster_serializable 8283307 avoid dead loop if tipc is closed by peer cf3f7f5 [ql-tipc] Refactor U-boot rpmb_storage_send 4b1d74d Make logging more readable Test: build + manual TIPC tests Change-Id: Ib2c0e7a4a8313b6e62c1fe4f58b923c0c2d3f695
2018-08-20[iot] imx7d: disable u-boot logo by defaultJaesung Chung
This CL disables u-boot logo. U-boot logo screen appears at very short time duration (lesser than 2.5 secs) and it is hard to make u-boot screen configurable. Bug: 74301019 Test: no u-boot logo seen Change-Id: I52e0fe637e78bcd2c74adcca7fe59231a8449928
2018-08-20MA-11371 [Android Things] Enlarge CONFIG_SYS_CBSIZE sizeLuo Ji
Enlarge CONFIG_SYS_CBSIZE to 2048 Bytes because kernel cmdline is large than 1024 Bytes. Test: Entire kernel cmdline was print out by console. Change-Id: I1dc7bf1da6f92f0f1abbadd4e2abb690e6ae70f8 Signed-off-by: Luo Ji <ji.luo@nxp.com>
2018-08-20[iot] Add iot_imx8mq supportLuo Ji
This patch add support for iot_imx8mq. Change-Id: Ia77d80fe1ad8b36c47e8a2ab18c286f6e522abcf Signed-off-by: Luo Ji <ji.luo@nxp.com>
2018-08-20MLK-19203 configs: imx8qm_arm2: update xen boot argsPeng Fan
Remove clk_ignore_unused Enlarge dom0 memory to 2048M Support booting 6 cores support creating partition from parsing device tree Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit dff1ad048f0767a91c6e62904612b0f5ac9c52d7)
2018-08-16MLK-19249-2 imx8mq_evk: Fix wrong emmc_dev and sd_dev for uuuYe Li
On imx8mq_evk, the eMMC connects USDHC0 and SD connects USDHC1, so we have wrong settings and cause problem when running uuu release script for imx8mq evk. Signed-off-by: Ye Li <ye.li@nxp.com>
2018-08-15MLK-18885 mx6ullevk: Fix undefined findteeYe Li
The "findtee" is actually not used on mx6ullevk, because there is only one uTee-6ullevk image for optee. So remove the "run findtee" Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit ef29246aaa2d8f00623c381afb9e79c3dbfd1597)
2018-08-13MA-12371 Sync evk_imx8mq config file to fix build errorsJi Luo
Move some configs from imx8mq_evk_android.h to imx8mq_evk_android_defconfig to sync with BSP team. Test: build and boot ok on evk_imx8mq. Change-Id: I954f2c284b368ca26c6fb44a6db6a200cb1e6da7 Signed-off-by: Ji Luo <ji.luo@nxp.com>
2018-08-12MLK-19200-2 Revert "Add iMX8DX DDR3 arm2 board support"Ye Li
This is debug patch, pushed by mistake. Since we already support DDR3 ARM2 in previous commit, must revert it. This reverts commit d0602d2ee64c9ad2bf38a38bfb84f8ff9ac9b68d. Signed-off-by: Ye Li <ye.li@nxp.com>
2018-08-12MLK-19200-1 Revert "disable mmc trace"Ye Li
This is debug patch for DX DDR3 ARM2 support, which is pushed by mistake. This reverts commit 3514c8a2a6add2e6f1574814bbe326684f3062f3. Signed-off-by: Ye Li <ye.li@nxp.com>
2018-08-10disable mmc traceYe Li
Signed-off-by: Ye Li <ye.li@nxp.com>
2018-08-10Add iMX8DX DDR3 arm2 board supportYe Li
When rewoked eMMC to MMC socket, change MMC driver can recognize the card Enable the fastboot to test usb gadget Signed-off-by: Ye Li <ye.li@nxp.com>
2018-08-10MLK-19181-3: defconfig: iMX850D enable USB SDPFrank Li
uuu can download whole uboot and run it fastboot also enabled. malloc start at 0x182000, size is 0x6000 (24K) So BSS and malloc use all OCRAM_S stack move to endof OCRAM 0x91FFF0. ATF start at 91000 AFT about 48K, 0x91000 - 0x91D000, Stack size is about 16K. Signed-off-by: Frank Li <Frank.Li@nxp.com>
2018-08-10MLK-19177 imx8dx: Add iMX8DX DDR3 ARM2 board supportYe Li
Add new dts, config and defconfig file for DX DDR3 ARM2 board. Since it does not have USB3.0 and SD, disable them in DTS and header file. Also move gpio expander to i2c1 according with its schematic. In defconfig, fastboot is default enabled due to we need uuu to program eMMC. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit e5b822615a5aa2fadb481002c286f35d996999f8)
2018-08-10MLK-19189 arm64: dts: imx8qm/qxp: set enet IO voltage to 1.8vAndy Duan
By default, imx8qm/qxp b0 silicon set the IO voltage to 2.5v, but mek/arm2 boards are designed as 1.8v voltage for enet IO, so force the IO voltage to 1.8 by setting COMP_CTL_GPIO_1V8_3V3 pins like: The pin setting: 1.8V/3.3V : bit4=0, bit[30]=1, bit[2:0]=000 2.5V : bit4=1, bit[30]=1, bit[2:0]=010 Reviewed-by: Ye Li <ye.li@nxp.com> Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
2018-08-09 MLK-19182-2 iMX8QM SPL: include/configs: imx8qm_arm2: Add SPL build configTeo Hall
Add all necessary configs when building for SPL based on CONFIG_SPL_BUILD set. Signed-off-by: Teo Hall <teo.hall@nxp.com>
2018-08-09MLK-19183-3 iMX8QXP SPL: include/configs: imx8qxp_mek: Add SPL build configsAbel Vesa
This adds all the configs necessary for when CONFIG_SPL_BUILD is set. Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
2018-08-08MLK-19150 fastboot: enable fastboot in mx7dsabreJoakim Zhang
Modify mx7dsabresd.h file and defconfig file to enable fastboot in mx7dsabre board Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
2018-08-07MLK-19131 configs: imx8mm_evk: add jailhouse boot commandPeng Fan
Add jailhouse env. Currently need to pass clk_ignore_unused to bootargs to avoid linux root cell shutdown clocks used by inmates. If only want a minimal clk being on in inmates, the clks could be added in clk_inits_on in linux kernel drivers/clk/imx/clk-imx8mm.c or use init-on-array under clk node. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 7732b3b87423069c1c31d25ec07201098062b717)
2018-08-05MLK-18431-01 imx8mm: move the spl bss base to ocram 0x910000Bai Ping
Move the SPL bss and malloc base to OCRAM 0x910000. OCRAM_S will be reserved for dram low power purpose. Signed-off-by: Bai Ping <ping.bai@nxp.com> (cherry picked from commit 2b2cd1adc23525d2fb79dc281cd2a741ebe13f90)
2018-08-05MLK-19127 mx6sxsabresd: Change prime ethernet port to eth0Ye Li
All previous u-boot versions use eth0 as the prime ethernet port on iMX6SX SDB board. But this default configuration is modified to eth1 when upgrading to v2017.03. Change it back to align previous setting. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 1f128fdba8399878243444e71646f941a6ca9649)
2018-08-05MLK-19064 imx8qm: Add secure boot environmentYe Li
Add the secure boot relevant environment variables to ARM2 and MEK. When CONFIG_AHAB_BOOT is enabled, we will switch to boot flow: 1. Load the signed OS container to address 0x88000000 2. Using auth_cntr to authenticate the OS container. It will load the kernel and FDT to destination addresses. 3. Using booti to boot kernel. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit eb47b72c1c89deddeaa3b3618d8c28aca05cd4ad)
2018-08-05MLK-19023-1 imx6: Increase the EPDC waveform buffer sizeYe Li
Since the epdc_flash.bin size has increased over 2MB, the orignal buffer size can't fit it and will cause overwrite to other useful data in heap. Thus, increase the EPDC waveform buffer size to 4MB to align imx7d and imx6ul platforms. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 6aaca204c1ccdb967065ebb03cf39ecd8f4d6766)
2018-08-05MLK-18939 mx7ulp_evk: Fix mtest end address issueYe Li
When TEE is enabled, the high 32MB memory is reserved to TEE. So the mtest end address 0x9e000000 will overlay with u-boot runtime text and data. Fix the issue by changing the mtest end to half of DDR size. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 9b56f22639703bd70bfdd1de0cbdcef2b80f0bff)
2018-08-03MLK-18793 imx8mq: config: add jailhouse envPeng Fan
Add jailhouse env. Currently need to pass clk_ignore_unused to bootargs to avoid linux root cell shutdown clocks used by inmates. If only want a minimal clk being on in inmates, the clks could be added in clk_inits_on in linux kernel drivers/clk/imx/clk-imx8mq.c Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 0d33db00e96e7addb6910a7097a62222ff75480f)
2018-08-03MLK-19123-1 fastboot: edit common file to enable fastboot in mx6sabreJoakim Zhang
board Edit mx6sabre_common.h file to enable fastboot in all mx6sabre boards Support:mx6dlsabre board mx6qpsabre board mx6qsabre board Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
2018-08-03MLK-19059-5 Enable uuu for i.MX6SL in 2018 ubootXiaoning Wang
i.MX6SL boards enable fastboot as default. Support: mx6slevk_defconfig mx6slevk_epdc_defconfig mx6slevk_optee_defconfig mx6slevk_plugin_defconfig uuu will use fastboot command to write emmc. Signed-off-by: Xiaoning Wang <xiaoning.wang@nxp.com>
2018-08-03MLK-19062-1 fastboot: enable fastboot in mx6ulJoakim Zhang
Modify mx6ul_14x14_evk.h file and defconfig files to enable fastboot in mx6ul_14x14 and mx6ul_9x9 board Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
2018-08-03MLK-19062-2 fastboot: enable fastboot in mx6ullJoakim Zhang
Modify mx6ullevk.h file and deconfig files to enable fastboot in mx6ull_14x14 and mx6ull_9x9 board Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
2018-08-02MLK-19104 imx7ulp: Enable uuu support for mx7ulp.Shenwei Wang
Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com> Acked-by : Frank Li <frank.li@nxp.com>
2018-08-01MLK-19059-4 Enable uuu for i.MX6SoloX in 2018 ubootXiaoning Wang
i.MX6SoloX boards enable fastboot as default. Support: mx6sxsabresd_defconfig mx6sxsabresd_emmc_defconfig mx6sxsabresd_optee_defconfig mx6sxsabresd_plugin_defconfig uuu will use fastboot command to write emmc. Except: mx6sxsabresd_m4fastup_defconfig mx6sxsabresd_qspi2_defconfig mx6sxsabresd_spl_defconfig -- this one will fail without any changes when execute 'make -j8'. Signed-off-by: Xiaoning Wang <xiaoning.wang@nxp.com>
2018-08-01MLK-19059-3 Enable uuu for i.MX6SLL in 2018 ubootXiaoning Wang
i.MX6SLL boards enable fastboot as default. Support: mx6sllevk_defconfig mx6sllevk_epdc_defconfig mx6sllevk_optee_defconfig mx6sllevk_plugin_defconfig uuu will use fastboot command to write emmc. Signed-off-by: Xiaoning Wang <xiaoning.wang@nxp.com>
2018-08-01MLK-19059-2 Edit imx_env.h to support teeXiaoning Wang
Add bootm option for tee at CONFIG_MFG_ENV_SETTINGS_DEFAULT in imx_env.h file. Adapt to ARM64/32 chip boot. Signed-off-by: Xiaoning Wang <xiaoning.wang@nxp.com>
2018-07-30MA-12245 Disable CAAM on imx8m for AndroidJi Luo
CAAM was enabled on imx8m by default in commit 9963299 (MLK-18703: crypto: caam: Add TRNG init function call), this will cause errors when try to access RPMB. Disable CAAM on imx8m because we don't need it on Android now. Test: build and boot ok on imx8m_evk and imx8mm_evk. Change-Id: I469f95ed0eada7161fa7f44f022ceb02b2e185b5 Signed-off-by: Ji Luo <ji.luo@nxp.com>
2018-07-26MLK-19049 mx6qsabreauto: Fix kernel NAND boot issue in bootargsYe Li
When enabling NAND boot, the ubi.mtd should be set to 6 because the one mtdpart is added for tee. Also the MFG_NAND_PARTITION is duplicated in mx6qsabreauto.h and mx6sabre_common.h. We can remove it from mx6qsabreauto.h, since only the sabreauto board have NAND. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit b495fb882339191593019074cf8b421c84469f31)
2018-07-25MLK-19011-2 configs: imx8qm_mek: add jailhouse boot envPeng Fan
Add jailhouse boot env. run `jh_netboot` or `jh_mmcboot` to boot Linux. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 2248152c7217ac78f4d399612679a45c54405502)
2018-07-25MLK-19011-1 configs: imx8qxp_mek: add jailhouse boot envPeng Fan
Add jailhouse boot env. Use `run jh_netboot` or `jh_mmcboot` to boot Linux. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 8a575a160b8e4f8cfdd79177a8f9551106395cf9)
2018-07-23MA-12221 [Android] caam: fix build break for imx6/7Luo Ji
config 'CONFIG_FSL_CAAM_KB' was added to Kconfig and would be selected for imx6/imx7/imx8m(if has caam), remove the defination in header file to fix redefination errors. Test: build pass for imx6dq, imx6sx, imx6sl and imx7ulp. Change-Id: I5ccf1e9747613b66f20eacf15f126a80054b3441 Signed-off-by: Luo Ji <ji.luo@nxp.com>
2018-07-19MLK-18945-10 imx8mm_evk: Add splash screen support for MIPI DSIYe Li
Add board level codes for enabling splash screen on imx8mm EVK. We support two different display connecting to MIPI DSI miniSAS interfaces: 1. MIPI2HDMI daughter card (default) 2. RM67191 OLED panel Users can set "panel" env vairable to "MIPI2HDMI" or "RM67191_OLED" to switch them after reboot. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 41f896ce26aa0f518b5cacb1d9660a0a085ee691)
generated by cgit v1.2.3 (git 2.0.4) at 2024-09-13 13:41:51 +0000