Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch iMX-based devices to latest NXP BSP #210

Merged
merged 56 commits into from
Sep 8, 2020

Conversation

ricardosalveti
Copy link
Member

  • Switch remaining targets to u-boot-fio 2020.04
  • imx8mmevk: switch to latest u-boot/optee/kernel
  • apalis-imx8: import machine config and bump atf/u-boot to latest
  • imx7ulpea-ucom: import machine config and bump u-boot to latest
  • Drop compatibility with meta-toradex bsp layers

Set by the NXP BSP but not implemented for cubox-i, so disable in order
to make it compatible with latest u-boot-fio.

Signed-off-by: Ricardo Salveti <[email protected]>
Switch cubox-i to use the latest u-boot-fio revision (2020.04).

Signed-off-by: Ricardo Salveti <[email protected]>
Switch colibri-imx7-emmc to use the latest u-boot-fio revision (2020.04)

Signed-off-by: Ricardo Salveti <[email protected]>
Required by the latest u-boot-fio (changes from the NXP BSP).

Signed-off-by: Ricardo Salveti <[email protected]>
Relevant changes:
- 0f459eb31b0 [FIO toup] imx8mm_evk: set bootm len to 64
- bdd9bfd7363 [FIO extras] imx8mm_evk: disable default hardcoded bootcmd
- c186a4b355d [FIO extras] arm: mx7: use weak for reset_cpu

Signed-off-by: Ricardo Salveti <[email protected]>
Follow similar change as done at the meta-freescale/linux-fslc-imx
recipe, updating the base revision/branch on top of the latest NXP BSP
release.

Signed-off-by: Ricardo Salveti <[email protected]>
Add build options required by imx8mmevk.

Signed-off-by: Ricardo Salveti <[email protected]>
Add support for loading lmp from scr-fit. Overlay logic is not required
as that is done automatically by ATF/U-Boot.

Signed-off-by: Ricardo Salveti <[email protected]>
Add imx8mmevk config fragment for both u-boot-fio and
u-boot-fio-mfgtool, besides the required logic for imx-boot compatiblity
(taken from u-boot-imx).

Signed-off-by: Ricardo Salveti <[email protected]>
Copy from u-boot-imx, which was the previous provider for imx8mmevk.

Signed-off-by: Ricardo Salveti <[email protected]>
…-os-fio

Switch both imx8mmevk machine and mfgtool-machine custom configuration
to u-boot-fio 2020.04 and optee-os-fio 3.10.0.

Boot flow now uses boot.itb, with a reduced u-boot configuration.

Signed-off-by: Ricardo Salveti <[email protected]>
Not required anymore as imx8mmevk is now using u-boot-fio by default.

Signed-off-by: Ricardo Salveti <[email protected]>
Recipe based on the linux toradex tree, for the imx-based SoCs.

Signed-off-by: Ricardo Salveti <[email protected]>
Not relevant anymore as we're now using u-boot-fio as our main u-boot
recipe provider.

Signed-off-by: Ricardo Salveti <[email protected]>
Drop recipe as our main u-boot-fio tree already incorporates the NXP BSP
related changes.

Signed-off-by: Ricardo Salveti <[email protected]>
Linux fails to probe the ethernet phy when not enabled in u-boot.

Signed-off-by: Ricardo Salveti <[email protected]>
Relevant changes:
- 129a6fad43b89 arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL
- e85ce3157725a arm: imx: do not include smp_wfe_imx6.S for i.MX6SX
- 4f49200132e6d arm: imx: enable HAVE_IMX_BUSFREQ for i.MX6
- 5d229c51b5a52 arm: imx: do not build busfreq without HAVE_IMX_BUSFREQ
- 4b4933fc1bd7c drm: ipuv3: fix missing ret
- 959ad60732779 perf cs-etm: Move definition of 'traceid_list' global variable from header file

Signed-off-by: Ricardo Salveti <[email protected]>
Extra changes:
- [FIO toup] hwrng: optee: support generic crypto
- [FIO fromtree] hwrng: optee - fix wait use case
- [FIO fromtree] hwrng: optee - handle unlimited data rates
- [FIO fromtree] drivers: optee: allow op-tee to access devices on the i2c bus
- Revert "[FIO fromlist] drivers: optee: allow op-tee to access devices on the i2c bus"
- [FIO extras] mmc: add feature of setting slot index via devicetree alias

Meta changes:
- 9f43f9d2 bsp: imx8mmevk: update cfg based on 5.4-2.1.x-imx
- 245a96a6 bsp: apalis-imx6: switch OPTEE RNG
- b147f62c standard: add debug-panic-oops
- 4c43726e debug-panic-oops: set default panic timeout to 5
- b31195ef debug-lockup: add hung task panic

Signed-off-by: Ricardo Salveti <[email protected]>
Meta changes:
- 5910f727 bsp: imx8mmevk: update cfg based on 5.4-2.1.x-imx

Signed-off-by: Ricardo Salveti <[email protected]>
Backport optee related patches related to i2c and hwrng handling.

Signed-off-by: Ricardo Salveti <[email protected]>
Enable NXP CAAM (for NXP_CAAM_RNG_DRV) and the RNG PTA so linux can use
the optee RNG driver.

Signed-off-by: Ricardo Salveti <[email protected]>
Set image name to lmp-factory-image by default, as that is the main
target used by our factory users.

Signed-off-by: Ricardo Salveti <[email protected]>
Needed for u-boot signing.

Signed-off-by: Ricardo Salveti <[email protected]>
Copy the correct dtb when u-boot sign is enabled, otherwise u-boot is
unable to find the key during boot.

Signed-off-by: Ricardo Salveti <[email protected]>
Enable u-boot signing for mx8mm. SPL is not yet validating the
imx-container, but this at least allows u-boot proper to verify the
signature of the kernel fitimage during boot.

Signed-off-by: Ricardo Salveti <[email protected]>
Now that u-boot sign is enabled, we can also enable fit signature strict
to only allow booting images that are properly signed.

Signed-off-by: Ricardo Salveti <[email protected]>
Based on the machine configuration available in meta-toradex-nxp. This
is needed in order to be able to remove the toradex-based layers and
still be compatible with apalis-imx8.

At some point this machine should be provided by meta-freescale-3rdparty
instead, probably after the latest NXP BSP upgrade.

Signed-off-by: Ricardo Salveti <[email protected]>
Bump toradex kernel revision and packport a patch required to fix a
build failure with latest oe-core.

Signed-off-by: Ricardo Salveti <[email protected]>
Add apalis-imx8 scr-fit support, including rollback logic and m4
extract/boot from fit.

Signed-off-by: Michael Scott <[email protected]>
Signed-off-by: Ricardo Salveti <[email protected]>
Drop changes based on the older NXP BSP and bring a patch for fixing
reboot support on toradex-based targets.

Signed-off-by: Ricardo Salveti <[email protected]>
Changes based on the older NXP BSP release, not required now that
apalis-imx8 is using the latest BSP.

Signed-off-by: Ricardo Salveti <[email protected]>
Changes based on the older NXP BSP release, not required now that
apalis-imx8 is using the latest BSP.

Signed-off-by: Ricardo Salveti <[email protected]>
Add SCFW firmware related changes available in meta-toradex-nxp.

Signed-off-by: Ricardo Salveti <[email protected]>
Relevant changes:
- b9c97cb72f1 [FIO toup] apalis-imx8: set fdt_high to 0xffffffffffffffff
- b3b93d3c78d verdin-imx8mm: correct fdt and kernel load addresses
- a32eb7f09a2 verdin-imx8mm: fix broken reset and pinctrl driver
- 59f4c8a5ef8 verdin-imx8mm: fix device tree and overlay support
- 3c2d3e7ad65 verdin-imx8mm.h: change default fdt name
- b894d144e0a gitlab-ci: adjust for new names and add apalis-imx8x
- bc665173cc0 rename all occurences of apalis-imx8qm to apalis-imx8
- 718a906a868 rename all occurences of apalis-imx8qxp to apalis-imx8x
- eda3660f9b7 rename all occurences of colibri-imx8qxp to colibri-imx8x
- 111b5f6dd83 board: apalis-imx8/colibri-imx8x: remove checkboard function
- 214aceb5a62 board: apalis-imx8: add commented out board_quiesce_devices function
- e97de56e5d3 board: colibri-imx8x: change comment for uart initialization
- 0e5d619d764 board: colibri-imx8x: comment board_quiesce_devices
- c580aa8d223 arm: dts: colibri-imx8qxp: remove old earlycon description
- 1c94a473ca4 colibri-imx8x.h: change default fdt name
- b81e5b5a1bd include: colibri-imx8x.h: use same addresses as apalis-imx8qm
- 66105bd224e defconfig: colibri-imx8x: savedefconfig and add CONFIG_OF_SYSTEM_SETUP
- 612c4b5691d apalis-imx8qm_defconfig: add CONFIG_OF_SYSTEM_SETUP
- fa20fe69544 board: apalis-imx8: fix build_info
- 76764c10009 board: apalis-imx8: get rid of sc_err_t type
- 04a3bde96d5 board: apalis-imx8: order code differently for comparing reasons
- fbdd85e70f0 include: apalis-imx8: different fixes for new u-boot
- f3641f508d8 board: add apalis-imx8x

Signed-off-by: Ricardo Salveti <[email protected]>
Not yet disabling all options that are not required by u-boot.

Signed-off-by: Michael Scott <[email protected]>
Signed-off-by: Ricardo Salveti <[email protected]>
Signed-off-by: Michael Scott <[email protected]>
Signed-off-by: Ricardo Salveti <[email protected]>
Not needed with latest BSP and without meta-toradex layers.

Signed-off-by: Ricardo Salveti <[email protected]>
Not needed with latest BSP and without meta-toradex layers.

Signed-off-by: Ricardo Salveti <[email protected]>
Switch to use the latest NXP BSP by default (latest atf/optee-os/u-boot).

Also switch boot logic to use scr-fit by default.

Kernel is still based on the 4.14 toradex tree as latest is not yet
functional.

Signed-off-by: Ricardo Salveti <[email protected]>
Set required mfgtool providers for apalis-imx8.

Signed-off-by: Ricardo Salveti <[email protected]>
Relevant changes:
- 90926db2309 [FIO extras] fastboot: don't enable console mux by default
- 2c4241bb087 [FIO toup] mx7ulp_com: allow setting CONFIG_BOOTCOMMAND in defconfig
- 906856c7811 [FIO toup] imx: imx7ulp-com: add support for SPL
- 9bd13e9d794 [FIO toup] imx: add base SPL support for mx7ulp
- ec0a730b8a6 [FIO extras] mx7ulp_com: force board_ehci_usb_phy_mode to device
- 78f221cd6fe [FIO toup] mx7ulp_com: allocate specific region of memory to OP-TEE
- 31b3bba1912 [FIO extras] imx: mx7ulpea-ucom: system reset function
- 01bcdb0855b [FIO toup] Kconfig: Don't use RSA_FREESCALE_EXP on MX7ULP
- ec6e8627026 defconfig: add overlays support for iMX8-based SoMs
- 0c0cca7b4ab [FIO toup] mx7ulp_com: sync changes from the EA BSP tree
- 6e656768913 [FIO extras] mx7ulp: allow get_board_serial even without fastboot
- 537f5951d5d [FIO extras] imx: imx7ulp-com: add sys_reset config
- 9b22c244c68 [FIO extras] arch: arm: imx7ulp: fix rpmsg reservation conflict with OP-TEE
- 1fca4442260 [FIO extras] imx7ulpea: dts: enable DM QSPI flash
- ee03aa69a14 [FIO toup] imx7ulp: fiohab: support tool to enable closing the device
- 14c26ff80aa [FIO toup] fpga: imx_m4: boot M4
- c50f83412d4 [FIO fromtree] arm: imx: Finish migration from CONFIG_SECURE_BOOT to CONFIG_IMX_HAB
- 6b92b1a448b [FIO fromtree] mx7ulp: Only enable LDO if it is not already enabled
- 2bbe3e6987d [FIO fromtree] mx7ulp: Remove duplicated definitions
- 4e3d1edbfd2 [FIO toup] mx7ulp: update wdog disable sequence
- a2c58623920 [FIO toup] mmc: fsl_esdhc_imx: initialize data for imx7ulp

Signed-off-by: Ricardo Salveti <[email protected]>
Kernel based on the EA BSP.

Signed-off-by: Ricardo Salveti <[email protected]>
With support for applying the OP-TEE overlay and rollback.

Signed-off-by: Michael Scott <[email protected]>
Signed-off-by: Ricardo Salveti <[email protected]>
Minimal configuration enough for loading signed images from emmc.

Signed-off-by: Ricardo Salveti <[email protected]>
Minimal config with USB support for SDP/Fastboot.

Signed-off-by: Ricardo Salveti <[email protected]>
Enabling RNG_PTA and device tree overlay for u-boot.

Signed-off-by: Ricardo Salveti <[email protected]>
Enabling RNG_PTA and device tree overlay for u-boot.

Signed-off-by: Ricardo Salveti <[email protected]>
Defconfig based on the NXP 4.19-based BSP.

Signed-off-by: Michael Scott <[email protected]>
Signed-off-by: Ricardo Salveti <[email protected]>
Files for flashing bootloader and the entire wic image.

Signed-off-by: Michael Scott <[email protected]>
Signed-off-by: Ricardo Salveti <[email protected]>
Based on the machine configuration provided by meta-ea.

Signed-off-by: Michael Scott <[email protected]>
Signed-off-by: Ricardo Salveti <[email protected]>
Add imx7ulpea-ucom specific fstab with extra logic to mount the
boot partition at /mnt/boot (for u-boot env).

Signed-off-by: Ricardo Salveti <[email protected]>
Add required fw_env config for fw_env tools. Env is set to the first
vfat partition by default.

Signed-off-by: Ricardo Salveti <[email protected]>
Support for fit image and signed components.

Signed-off-by: Michael Scott <[email protected]>
Signed-off-by: Ricardo Salveti <[email protected]>
Add required overrides for supporting the imx7ulpea-ucom target.

Signed-off-by: Michael Scott <[email protected]>
Signed-off-by: Ricardo Salveti <[email protected]>
Mfgtool and proper u-boot are now set to fit strict, so enable u-boot
signing by default.

Signed-off-by: Ricardo Salveti <[email protected]>
Use the upstream BSP tree and branch as reference as that is known to be
stable.

Signed-off-by: Ricardo Salveti <[email protected]>
Copy link
Contributor

@mike-scott mike-scott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ricardosalveti I haven't take the time to look through all of these commits. But I'm inclined to get this merged into master so we can get real HW builds that can go hand in hand with review.

For some of this we need to see the builds.

@ricardosalveti ricardosalveti merged commit c364e8f into foundriesio:master Sep 8, 2020
quaresmajose pushed a commit that referenced this pull request Nov 9, 2022
Relevant changes:
- de0eb14 Merge pull request #210 from YoeDistro/yoe/mut
- 1bf66f8 linux-firmware: Use nonarch_base_libdir instead of hardcoding /lib
- 478e0c4 Merge pull request #209 from YoeDistro/yoe/mut
- 7ca49de ti-18xx-wlconf: Drop spurious dot from PV
- aff7e79 ti-18xx-wlconf: Use nonarch_base_libdir instead of hardcoding /lib
- f244dd4 Merge pull request #207 from chrisdimich/master
- d52f46a linux-boundary: bump revision to bb58f0ee
- 1e88fc2 Merge pull request #206 from Ossanes/topic/fix-nitrogen8-boards
- 47d2543 nitrogen*: Drop duplicated WKS dependencies
- b806279 nitrogen8*: Drop useless overrides for WKS_FILE_DEPENDS
- 18912db Merge pull request #203 from boundarydevices/master
- 4d1b126 u-boot-boundary: fix fw_env.config management
- bd3eb22 u-boot-boundary: switch filesextrapaths to generic-bsp
- 7596527 Merge pull request #202 from YoeDistro/yoe/mut
- 1efcb1b recipes: Use SPDX naming scheme for LICENSE field
- a27ac73 Merge pull request #199 from chrisdimich/master
- b30a5bc u-boot-boundary: bump revision to 3d5e7f60
- 4d7c7c5 linux-boundary: bump revision to 04f4286f
- f467829 Merge pull request #198 from Ossanes/topic/linux-kontron
- 100b41b linux-kontron: defconfig: Rework to enable CONFIG_KPROBES
- d236514 linux-kontron: Upgrade 5.4.41>5.10.95
- dc91d5e Merge pull request #197 from Freescale/topic/simplify-overrides
- b034e5c Rework machine definitions to reduce duplication
- bf7ae43 u-boot-script-toradex: Revert wrong override change
- 671aee4 Generalize overrides subsystem for NXP and Mainline support
- a161b3a Merge pull request #196 from Ossanes/topic/nitrogen8mp
- 52e9a93 nitrogen8mp: Define nxp as default BSP
- 10a470a Merge pull request #195 from YoeDistro/yoe/mut
- 4560e22 layers: Bump to use kirkstone
- 0c68a5a Merge pull request #193 from Ossanes/topic/imx7d-remarkable2-remove-firmwares
- 654d5b5 imx7d-remarkable2: Remove bcm43456 firmware as it has no providers
- f8d9213 Merge pull request #192 from Ossanes/topic/imx6dl-riotboard-uboot
- e78de66 imx6dl-riotboard: Fix u-boot target
- 6059586 Merge pull request #191 from sapiippo/apalis-imx6
- 61b70a0 apalis-imx6: add missing space to append
- b3670f9 Merge pull request #190 from MaxKrummenacher/master
- e064d0e colibri-imx6ull: fix mistyped override
- b26df7f Merge pull request #187 from boundarydevices/master
- 748b8f0 linux-boundary: bump revision to acef1311
- f007a9f Merge pull request #185 from MaxKrummenacher/update-toradex
- 13bd2ac machines: toradex: update
- 02bff68 linux-toradex: vf: update to 4.4.291
- 74fc138 linux-toradex: imx: update to 5.4-2.3.x-imx
- a2c343e u-boot-script-toradex: improve script
- 6e8f05b u-boot-toradex: updated to latest
- 839df32 u-boot-toradex: drop inc file
- 4661bdc Merge pull request #184 from texierp/topic/git-fetcher
- be54937 recipes: use https protocol and add explicit branch parameter
- be3442a Merge pull request #183 from Ossanes/topic/remove-dms-ba16
- f6c6d9e Merge pull request #182 from Ossanes/topic/remove-congatec
- 5dc9275 imx6q-dms-ba16: Remove files because it is not being maintained
- 00acf49 congatec: Remove defconfig
- af1c0cb Merge pull request #181 from Ossanes/topic/remove-congatec
- 3777793 congatec: Remove files because it is not being maintained
- 557e7b6 Merge pull request #180 from Ossanes/topic/u-boot-script-gateworks-imx
- d57becc u-boot-script-gateworks-imx.bb: Fix license checksum
- ea36713 Merge pull request #178 from Ossanes/topic/linux-remarkable
- 322f7f9 linux-remarkable2_5.4.bb: Fix git revision
- 5ed5d23 Merge pull request #177 from Ossanes/topic/imx6sl-warp-uboot
- 18f54fa imx6sl-warp: Fix u-boot suffix
- c57b5f3 Merge pull request #176 from Ossanes/topic/riotboard-suffix
- a9fce64 imx6dl-riotboard: Fix u-boot suffix

Signed-off-by: Ricardo Salveti <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants