summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-05toradex: tdx-cfg-block: add EEPROM read/store wrappersIgor Opaniuk
These functions wrap functionality for storing config blocks in EEPROM. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> (cherry picked from commit ad56253b6b219dcb9ecfb16909a32ba0cdf0a351)
2020-08-05apalis-imx8/colibri-imx8qxp: skip resource checkingIgor Opaniuk
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-08-05mmc board code: add a weak common implementationMax Krummenacher
NXP common code now calls a board function mmc_map_to_kernel_blk(). Provide a weak function in common code for boards not requiring special handling. Taken from boards/freescale/common/mmc.c Related-to: ELB-2351 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit a960b9ecd99d1b4e3f194bc52d92cb41b0d80e4a)
2020-08-05config: apalis-imx8: Enable FEC TXC delayPhilippe Schenker
Related-to: ELB-1299 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> (cherry picked from commit 3173b9aa17bc4c2580076376942a9ee1b6b8f636) (cherry picked from commit d2bca738761fb78dc86090f3118cd81c07798fe1)
2020-08-05net: phy: micrel: Use defines for PHY_IDs and MASKPhilippe Schenker
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> (cherry picked from commit 28491c802d36accbb4d8562114ce8085ca53e1b0) (cherry picked from commit 9ee5759d22acc3406bca3b76cb24ed558b64d0df) (cherry picked from commit b97b21b5db57be1dcc02fead8557dd0d6277bf44)
2020-08-05drivers: net: phy: micrel_ksz90x1.c: Add basic support for KSZ9131Philippe Schenker
This adds basic support for the new Micrel KSZ9131 phy. Related-to: ELB-1299 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> (cherry picked from commit cc96ed419f7585db15855dd53046562aadece3fb) (cherry picked from commit 150e6b7f6c9c8342997245be50f3bc58df78aaf3) (cherry picked from commit 60a530f544adb95bd251e387dfb8d88023c2d81a)
2020-08-05board: verdin-imx8mm: Add KSZ9131 phy skew settingsPhilippe Schenker
This patch basically just enables both RXC and TXC delay lines in the PHY. This will compensate the missing delay from the MAC. Other skew settings are not needed as the traces on board are routed exactly the same length Related-to: ELB-1299 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> (cherry picked from commit 50e975e6ce4e4e88f8c5c943ef2ddc38b0a31997) (cherry picked from commit f65442d8224dea0068a3d23db139608920688291)
2020-08-05net: fec: Add possibility to enable TXC delayPhilippe Schenker
Related-to: ELB-1299 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> (cherry picked from commit f53846c29f76ccee0141f6902703bb6855b14b6a) (cherry picked from commit 29884c54767bf04be3fc662f5f4aec227372d87e)
2020-08-05colibri-imx8x: Add fdt_high variable without valueIgor Opaniuk
This will actually clear the value of a variable that is potentially still existing. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-08-05apalis-imx8: integrate fastboot recoveryIgor Opaniuk
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-08-05colibri-imx8qxp: enable fastboot supportIgor Opaniuk
Enable USB fastboot support (CONFIG_FASTBOOT). Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> (cherry picked from commit f213fab63669c967a4136b9b527e3f7dc83902b8)
2020-08-05apalis-imx8: enable env import by defaultStefan Agner
Enable env import by default. It is enabled in other modules too and it is required to boot TorizonCore. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> (cherry picked from commit 0471e6a5e1aeaaf8c1a706064e3b421e6e39eb4a)
2020-08-05verdin-imx8mm: set fdtfile in runtimeIgor Opaniuk
fdtfile is required to have variant and fdt_board expanded, so we should set in runtime before distro_bootcmd is invoked. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-08-05verdin-imx8mm: use default BOOTCOMMANDIgor Opaniuk
Use default BOOTCOMMAND for distroboot and set proper fdtfile value. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-08-05verdin-imx8mm: disable CONFIG_DISPLAY_BOARDINFOIgor Opaniuk
Disable CONFIG_DISPLAY_BOARDINFO as it leads to Toradex Config block initialization before MMC subsystem is probed: No MMC card found MISSING TORADEX CONFIG BLOCK Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-08-05apalix-imx8: up-port initial implementationIgor Opaniuk
Boot test: U-Boot 2020.04-00118-gea539ce4dc-dirty (Jul 31 2020 - 22:57:53 +0300) CPU: NXP i.MX8QM RevB A53 at 1200 MHz DRAM: 4 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 Loading Environment from MMC... OK In: serial@5a070000 Out: serial@5a070000 Err: serial@5a070000 Model: Toradex Apalis iMX8 QuadMax 4GB Wi-Fi / BT IT V1.0B, Serial# 06438736 switch to partitions #0, OK ----------------------------------------- Was tested with: imx-mkimage: imx_5.4.24_2.1.0 imx-scfw: ab182211e("Update .gitignore to ignore our built files...") imx-atf: imx_5.4.24_2.1.0 imx-seco: 3.6.3 [1] ----------------------------------------- USB test: - USB flash drive connected with OTG cable (USBO1) - works => usb tree USB device tree: 1 Hub (480 Mb/s, 0mA) | u-boot EHCI Host Controller | +-2 Mass Storage (480 Mb/s, 200mA) USB DISK 2.0 077507A9002D 1 Hub (5 Gb/s, 0mA) U-Boot XHCI Host Controller - USB flash drive connected to USB 3.0 port (USBH4) - works => usb tree USB device tree: 1 Hub (5 Gb/s, 0mA) | U-Boot XHCI Host Controller | +-2 Mass Storage (480 Mb/s, 200mA) USB DISK 2.0 077507A9002D - USB flash drive connected to one of 4 USB 2.0 (USBH2 and USBH3) - doesn't (isn't enumerated at all) - UMS works (USBO1) ----------------------------------------- Network test: => dhcp BOOTP broadcast 1 DHCP client bound to address 192.168.88.251 (4 ms) Using ethernet@5b040000 device TFTP from server 192.168.88.2; our IP address is 192.168.88.251 Filename 'zImage'. Load address: 0x80280000 Loading: ################################################## 5.3 MiB 20.7 MiB/s done Bytes transferred = 5598256 (556c30 hex) ----------------------------------------- MMC test: => mmc rescan => mmc list FSL_SDHC: 0 (eMMC) FSL_SDHC: 1 FSL_SDHC: 2 ----------------------------------------- Dropped patches from toradex_imx_v2018.03_4.14.98_2.3.0_bringup as they have come in from mainline v2020.04 or just not relevant anymore: 2773302a("apalis-imx8: initial add") 09ab034c("apalis-imx8: add Apalis iMX8 specific device tree") 3e9d6dad("apalis-imx8: fix eMMC/MMC/SD interface muxing") 55cedfc1("apalis-imx8: remove unavailable peripherals") 1125cb6b("apalis-imx8: remove PCA9557 GPIO controllers") 47b1eeb2("apalis-imx8: fix Ethernet") 8e37e076("imx8: support UART1 as console UART for Apalis iMX8") d42b68ec("apalis-imx8: use UART1 as console UART") 2e356ef5("apalis-imx8: remove unused GPIOs") 954bef99("apalis-imx8: set device tree to Apalis DT by default") ce9ae949("apalis-imx8: load HDMI firmware") e90b8d36("apalis-imx8: use eMMC as environment location/default boot device") d872cd6e("apalis-imx8: add default memory layout and network options") ee3bf34e("tdx-cfg-block: add Apalis iMX8 QuadMax support") cdac0b13("apalis-imx8: config: remove pcie and sata") 1e77935d("apalis-imx8.c: fix typo") 3e6440d1("apalis-imx8: forward port to 2018.03") 365994c5("apalis-imx8: adjust copyright/licensing headers") 365994c5("apalis-imx8: adjust copyright/licensing headers ") 5bd6bdb9("apalis-imx8: change top-level compatible") 3d7dde4f("apalis-imx8: clean-up device tree") 5d2d7ec2("apalis-imx8: clean-up configuration") 58354713("apalis-imx8: clean-up board file") 7af4c9cb("apalis-imx8: fused modules boot from emmc") 478ad2f0("apalis-imx8: clean-up ethernet functionality") dfc9a6db("apalis-imx8: remove board code for usdhc") f574377c("apalis-imx8: modify default ramdisk loading address") 186747eb("apalis-imx8: do not undef configs configured using Kconfig") adb20873("apalis-imx8: make sure config block fdt fix-ups are called") ff45d3d5("apalis-imx8: increase bootm loading size") 912a867e("apalis-imx8: enable distro boot in tezi") b7beb5e5("apalis-imx8.h: move environment into first boot area") 70a89d49("apalis-imx8: add scriptaddr for distroboot") ca562b4d("apalis-imx8: enable FDT relocation") 32948b33("apalis-imx8: fix ramdisk relocation address") 62493440("apalis-imx8/colibri-imx8x: use proper distroboot script") f1993901("apalis-imx8/colibri-imx8x: set fdtfile since it is used by distro bootcmd") 83ec3f91("include: apalis-imx8.h: add default tdxargs pci=nomsi") bb64b46f("include: apalis-imx8.h: change tdxargs to defargs for pci_nomsi") a638c2aa("include: apalis-imx8.h: change default devicetree file") 7a829fc7("configs: apalis/colibri-imx8: change bootdelay to one second") c707a04a("ARM: dts: imx8qxp-apalis: Remove phy-reset-post-delay") 6415bc94("config: apalis/colibri-imx8*: Add fdt_high variable without value") 96c61bda("ARM: dts: apalis-imx8qm: update node fec1") cb3eb29b("config: apalis-imx8: fix auto-negotiation timeout error") 34ecf495("apalis-imx8: Remove fdt_file env variable") ff527ebc("apalis-imx8: Implement hardware version detection") 4653dcf8("apalis-imx8x: sync with MEK platform") 5b32f0b4("apalis-imx8: Fix hardware version detection in recovery mode") d626574b("apalis-imx8x: usb3 bringup") [1] https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/imx-seco-3.6.3.bin Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-08-05colibri-imx8x: up-port initial implementationIgor Opaniuk
USB (both host and device), Networking, MMC/SD work. Testing: ----------------------------------------------- U-Boot 2020.04-00119-g9dc5e94cb0-dirty (Jul 30 2020 - 22:36:54 +0300) CPU: NXP i.MX8QXP RevB A35 at 1200 MHz at 47C DRAM: 2 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1 Loading Environment from MMC... OK In: serial@5a090000 Out: serial@5a090000 Err: serial@5a090000 Model: Toradex Colibri iMX8 QuadXPlus 2GB Wi-Fi / BT IT V1.0B, Serial# 06494331 Net: eth0: ethernet@5b040000 [PRIME] Boot from USB for mfgtools Hit any key to stop autoboot: 0 ----------------------------------------------- Was tested with: imx-mkimage: imx_5.4.24_2.1.0 imx-scfw: ab182211e("Update .gitignore to ignore our built files and files from vscode") imx-atf: imx_5.4.24_2.1.0 imx-seco: 3.6.3 [1] ----------------------------------------------- Dropped patches from toradex_imx_v2018.03_4.14.98_2.3.0_bringup as they have come in from mainline v2020.04 or just not relevant anymore: 9bfdda4f ("tdx-cfg-block.c: correct colibri imx8 string") ae52342b ("colibri-imx8qxp: initial add") 9b950998 ("colibri-imx8qxp: move debug uart to lpuart3") f9b0065b ("colibri-imx8qxp: synchronize with imx8qxp-mek from beta2") 982b4667 ("colibri-imx8qxp: forward port to 2018.03") 5c80880d ("colibri-imx8qxp: add unused pins as gpio") 30b37a6a ("colibri-imx8qxp: adjust copyright/licensing headers) 873a9561 ("colibri-imx8qxp: fix top-level compatible") 0e0f095d ("colibri-imx8qxp: clean-up device tree") f61187df ("colibri-imx8qxp: clean-up configuration") 85a5d16b ("colibri-imx8qxp: clean-up board file") a5a9bb4b ("colibri-imx8qxp: fused modules boot from emmc") 39c20ddd ("colibri-imx8qxp: default to dsihdmi device tree") 7443a6e5 ("colibri-imx8qxp: fix usb device/host functionality") c721083a ("colibri-imx8qxp: fix ethernet functionality") 9f40db9d ("colibri-imx8qxp: adjust copyright/licensing headers some more") 9070b6f0 ("colibri-imx8qxp: dts: clean-up whitespace") 257470ac ("colibri-imx8x: enable FDT relocation") a9272336 ("colibri-imx8qxp: change default device tree") 8470fb25 ("colibri-imx8x/apalis-imx8: converge scriptaddr for distroboot") 62493440 ("apalis-imx8/colibri-imx8x: use proper distroboot script") f1993901 ("apalis-imx8/colibri-imx8x: set fdtfile since it is used by distro bootcmd") 890d03ae ("colibri-imx8qxp: sync with MEK platform") eeb1d9b8 ("colibri-imx8qxp: move environment into first boot area") c8c562ea ("colibri-imx8qxp: do not undef configs configured using Kconfig") 12489199 ("colibri-imx8qxp: make sure config block fdt fix-ups are called") 6a84ffaa ("colibri-imx8qxp: modify default ramdisk loading address") [1] https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/imx-seco-3.6.3.bin Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-07-21toradex: imx8: enable BOOTCOUNT featureIgor Opaniuk
This introduces automatic boot counter that increases after every reset. After a power-on reset, it will be initialized with 1, and each reboot will increment the value by 1. By default it's disabled if bootlimit isn't set. To enable this feature you have set bootcount limit ("bootlimit"), alternate boot action ("altbootcmd") that will be performed if the new value of bootcount exceeds the value of bootlimit, and "upgrade_available" to let U-Boot automatically increase and save the counter value after every reset: > setenv bootlimit 5 > setenv upgrade_available 1 > setenv altbootcmd "bootm ..." In case the bootlimit exceeds, the message will be shown and albootcmd executed: Warning: Bootlimit (5) exceeded. Using altbootcmd. To reset bootcount run: > bootcount reset Print current value: > bootcount print Relates-to: ELB-2703 Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> (cherry picked from commit e40c8a3daa5820b984752197636a13b7599c053b)
2020-07-21verdin-imx8mm: choose correct devicetree with configblockPhilippe Schenker
This commit makes u-boot choose the right variant wifi or nonwifi of the devicetree with the information stored in toradex configblock. Related-to: ELB-2642 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> (cherry picked from commit 099bc1b8ef7994781fc0ad1ed2abdc1dd8d5b6e3)
2020-07-21tdx-cfg-block: change verdin imx8m nano namingPhilippe Schenker
This changes the define from VERDIN_IMX8MNSL to VERDIN_IMX8MNQ_WIFI_BT in order to have a related naming to VERDIN_IMX8MMQ_WIFI_BT_IT and also have the information in for wifi bluetooth. This as well changes to the final decided naming. Related-to: ELB-2642 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> (cherry picked from commit 7d872c04cc4d6da4e7f322c9591e79939661f368)
2020-07-21board: toradex: up-port verdin imx8mm module supportIgor Opaniuk
This patch introduces changes on top of existing Verdin iMX8MM support in the mainline U-Boot v2020.04. Some patches were already upstreamed, some were squashed and included into this commit: 78e80d3f ("board: toradex: add verdin imx8mm 2gb wb it v1.0a module support") a6c18891 ("verdin-imx8mm: lpddr4_timing.c: intial lpddr4 calibration data") b16da3d6 ("verdin-imx8mm: fix usb_1 device aka peripheral operation") 6451e680 ("verdin-imx8: do not undef configs configured using Kconfig") d5382436 ("fsl-imx8mm-verdin.dts: remove fsl,rgmii_rxc_dly et. al.") c24fe844 ("fsl-imx8mm-verdin.dts: fix eth phy power up") b07ae5f3 ("verdin-imx8mm.c: set eth phy skew") 4eb91e6e ("tdx-cfg-block: adjust verdin naming") 569703d4 ("verdin-imx8mm: sync with EVK board") 8c8b56a5 ("tdx-cfg-block: add proper defines for other Verdin SKUs") Relates-to: ELB-2771 Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-07-21ARM: dts: imx8mm-pinfunc: add additional muxingsIgor Opaniuk
Add alternative UART muxings. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-07-21mach-imx: spl_sd: drop config includeIgor Opaniuk
Drop config.h include as it leads to compilation issues. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-07-21imx: dt-bindings: clock: add additional definesIgor Opaniuk
Add IMX8MM_CLK_SAI2_SRC and IMX8MM_CLK_SAI2_DIV. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-07-09verdin-imx8mm: fallback to non-DM PMIC driver usageIgor Opaniuk
This fixes compilation issues because of wrong PMIC definitions. Relates-to: ELB-2771 Fixes: 7c52ab30("MLK-18387 pmic: Add Non-DM pmic driver for BD71837") Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-07-09verdin-imx8mm: drop dram_init and use common oneIgor Opaniuk
Drop dram_init(), which leads to linking issues and use the common one introduced in 90cbeb06("TEE-502 imx8m: Refactor the OPTEE memory removal"). Relates-to: ELB-2771 Fixes: 90cbeb06("TEE-502 imx8m: Refactor the OPTEE memory removal") Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
2020-05-30MLK-24149 arm: imx8mp: update i.MX8MP pin headerPeng Fan
Update i.mx8mp pinfunc.h according to RM REV C. Reviewed-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit ba3bbb67f512400d9b67304d04cbfb7327fc4f35)
2020-05-28MLK-24192-3 pci: pcie_imx: Enable some LPCG clocks for iMX8Ye Li
Align the kernel's clocks enablement to enable the phy_per, misc_per clocks for all iMX8, and enable pciex2_per and pcie_phy_pclk for pcieb controller of iMX8QM. Signed-off-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 97b8d1c613f56b539328e421ba205f2221fc658e)
2020-05-28MLK-24192-2 DTS: imx8qm/qxp/dxl: Update PCIE clocksYe Li
Update PCIE clocks to align with latest v5.4 kernel, otherwise we may miss some LPCG clocks in u-boot and have potential problem if they have been disabled in kernel during partition reboot. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 76ebe2016c2ab7199cb6a6b83f8bc97fe0140549)
2020-05-28MLK-24192-1 lpuart: Enable IPG clockYe Li
Current codes only ennable the PER clock. However on iMX8 the LPUART also needs IPG clock which is an LPCG. Should not depend on the default LPCG setting. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit aa984f5f4029b743842ea7928d0af8da06b1b25d)
2020-05-28MLK-23820 imx8mq/mm: Add config to support secondary image bootYe Li
When primary image boot is failed, ROM will select secondary image to boot if SIT (secondary image table) exists. However, SPL does not know the secondary boot, still loads the FIT from the position of primary image. Introduce a config to add secondary image sector offset to FIT sector offset. This config is default set to 0. Secondary image should configure it to the same value of firstSectorNumber field in SIT. Signed-off-by: Ye Li <ye.li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 665972355dfe8156b3aa7bce52845722b15d9922)
2020-05-28MLK-24189-2 arm: imx: optee: ignore node create for xenPeng Fan
Ignore node create for xen, currently we not have valid registers when booting in xen, it might have garbage value and cause kernel hang. Reviewed-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 0c6cc66b1181c72b8f9165875b9db075a1de89de)
2020-05-28MLK-24189-1 arm: dts: xen: drop power domain for gpio4/1Peng Fan
gpio4/1 is handled by dom0, but shared with domu. without dropping the power domain, probe will fail. Reviewed-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit aad3cccd54acdbb1f96df12189be9e8bc03a3a93)
2020-05-28MLK-24188-2 mmc: fsl_esdhc_imx: enable AHB/IPG clkPeng Fan
Only enable PER clk is not enough, we also need to enable AHB/IPG clk. Reviewed-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 867c5f2a706e6ee72fd263de02125c97acde89e1)
2020-05-28MLK-24188-1 imx8: add AHB clk for SDHCPeng Fan
Add AHB clk for SDHC, without AHB clock, sdhc cmd will not finish. Reviewed-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 3ea6b86eecbfd5a1e082b86c99e411af1310afa1)
2020-05-27MLK-24185: dts: imx8qxp: include the u-boot dtsi in gpmi dtsHan Xu
include the fsl-imx8qxp-lpddr4-val-u-boot.dtsi explicitly in imx8qxp-lpddr4-val-gpmi-nand.dts, otherwise boot image failed to boot due to some power domains were not enabled. Signed-off-by: Han Xu <han.xu@nxp.com> (cherry picked from commit 06ddd9e78bcad974fc4f0f05c6dcfacf8551d2d5)
2020-05-27MLK-24179 imx8/8x: Enable u-boot EXT4/EXT2 relevant commandsYe Li
Need these EXT filesystem commands for i.MX Debian/ubuntu distro enablement. And have enabled them on other imx8m/mx6/mx7 platforms Signed-off-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit b118d558a2d68105fd9c772d18193cee9f355bbb)
2020-05-27MLK-24178 imx8: Fix build warning in sciYe Li
Find below warning on some boards, because sci.h does not include log.h. Fix the issue by replacing linux/errno.h to common.h ./arch/arm/include/asm/arch/sci/sci.h: In function ‘sc_err_to_linux’: ./arch/arm/include/asm/arch/sci/sci.h:56:2: warning: implicit declaration of function ‘debug’ [-Wimplicit-function-declaration] 56 | debug("%s %d %d\n", _func_, err, ret); Signed-off-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 29509c2104e6820f6618074fd1f109c7ff70bdd2)
2020-05-27MLK-24172-2 configs: imx8qm: disable SPL DM serial for domuPeng Fan
Disable SPL DM SERIAL for domu, there is no mmu setup, paravirtual console not work. Reviewed-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 63b1c6cde4368ad765f9a1d84e61aa566acd319f)
2020-05-27MLK-24172-1 imx8qm: update xen defconfig/dts for 2020.04Peng Fan
Update xen defconfig Update dts to let xen serial could be used in early stage, but seems without mmu enabled, it output nothing. It only output data after mmu enabled. Reviewed-by: Ye Li <ye.li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit c1ac080ab69b27e4a66aaf10a9b801d2a3c7b8d0)
2020-05-27MA-14318-1 Support dual bootloader for xenJi Luo
Trusty is not supported for xen so we don't need to check the keyslot package or rollback index in spl. Reassign the dram address for spl and u-boot to avoid conflicts. Support serial init functions to enable debug console in spl when xen is running. Test: Boot and A/B slot switch on imx8qm_mek. Change-Id: If6829252f1ec2e32255f951715c8747181951fd0 Signed-off-by: Ji Luo <ji.luo@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 30beee3fe6d4b35166c6e17203909231d33bc2db) (cherry picked from commit a4ffa905d90d14ccdd146e4b38a69d40a568b747) (cherry picked from commit 4729a057e8ad699ec01357dd219abdf296afe354)
2020-05-27MLK-20955 imx8qm: delete power-domains for lpuart0 on xenPeng Fan
To U-Boot on DomU, the lpuart0 is replaced with a xen paravirtual consol driver, but reused the previous lpuart node. However there is an power-domains entry in lpuart0 which will call power_domain_on and failed to probe xen paravirtual driver, because of recent change: commit 8524ca764d8f("MLK-20945-2 dm: device: Check the power up result in probe ") So remove the power-domains entry in lpuart0 to let DomU U-Boot could output again. Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Flynn xu <flynn.xu@nxp.com> (cherry picked from commit 38155100481a07e961f375052241d9d03e20a899) (cherry picked from commit 92104edf74363ab1a322e186887bf4515d47aa9c) (cherry picked from commit 75074ecb28d47cb1064d10e3d0b85defd7fb3c87) (cherry picked from commit 87b6d6158dcd4132328a4891f6446a4b565e5ab6)
2020-05-27MLK-20383 imx8qm: xen: enable dm usbPeng Fan
Enable dm usb using the base board otg usb port for fastboot usage Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 88a1718aa7096782e9cf538e391762aaef631bb2) (cherry picked from commit 279e82b731e7671536b729934e1dc88b760ea05a) (cherry picked from commit b874dc0882e329af07de4f6bb0d01573d4e02da2)
2020-05-27MLK-20373-6 imx8qm: xen: enable dm serialPeng Fan
Enable dm serial for xen uboot. Log as below: #xl console 1 MMC: FSL_SDHC: 0 Loading Environment from <NULL>... *** Warning - bad CRC, using default environment Failed (-5) In: serial@5a060000 Out: serial@5a060000 Err: serial@5a060000 flash target is MMC:0 Fastboot: Normal Normal Boot => Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Flynn xu <flynn.xu@nxp.com> (cherry picked from commit 132cb6f74bcd963b180de83279f00aef31bbbdca) (cherry picked from commit 38313a6f8e437568dbc15075251d344fa67fd14b) (cherry picked from commit 653f877b1beb4779ef0c24b81ba428503ce8ae3d)
2020-05-27MLK-20373-5 serial: serial_xen: support normal uboot consolePeng Fan
Support output/input using `xl console [domid]`. Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Flynn xu <flynn.xu@nxp.com> (cherry picked from commit 75a9833506aa13c1d5a8641c81ac951c41ced55e) (cherry picked from commit 5a495c39679b6641d369fc0c9cfdadafd8a408f6) (cherry picked from commit 6f3cc8513ac1afe0cf679422ae82c4a5930a8c64)
2020-05-27MLK-20373-4 imx8: update mem map tablePeng Fan
Update mem map table for xen uboot. xen console and some magic pages needs to be mappe as normal memory. Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Flynn xu <flynn.xu@nxp.com> (cherry picked from commit c96a9844cd3342f6e31627ccc4f3e63544ffd78e) (cherry picked from commit 30b2d9f4a7c0cfc9b3f999f1c3a1a8c466d66a68) (cherry picked from commit 152de9a5752881e43dd7afc9b47afa56b3b230e8)
2020-05-27MLK-20373-3 armv8: xen: introduce new hypercallsPeng Fan
Introduce new hypercalls Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Flynn xu <flynn.xu@nxp.com> (cherry picked from commit e1610fa574b20794c184e00d86c9d0f7505672f1) (cherry picked from commit 6e9e957e8d0891e4ec3bfb4b6c2bbef747eb8812) (cherry picked from commit 46a34b4456fb895786d25721b54a10e0182cb312)
2020-05-27MLK-20373-1 Intrdouce xen header filesPeng Fan
Introduce xen header files from Linux Kernel commit e2b623fbe6a3("Merge tag 's390-4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux") Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Flynn xu <flynn.xu@nxp.com> (cherry picked from commit ddb393c45158f6114bd53c83dcd8397a6c2acbdc) (cherry picked from commit 8591f37af6345695a98216c136e9209a880901f1) (cherry picked from commit b93308506902dd30b84640f59fa75ada21d8775a)
2020-05-27MLK-20134 imx8qm: xen: correct DRAM SIZE and loadaddrPeng Fan
The first DRAM BANK size should be 2GB and the load addr are 0x80080000. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 56c9ac9734a59c68cb85125b7047087d00d141e8) (cherry picked from commit fd9689b3a2bcd0de26594afa161c4e4acb4c7f58) (cherry picked from commit ee0733cca541a9a47d833e70d273268d2ed29653)
2020-05-27MLK-19552 imx8qm: xen: fix memory mapPeng Fan
Fixes 9486251ced24("MLK-19494 configs: imx8qm mek android audo: correct xen physical memory") correct text base, IPC address, memmap. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit 884cada50b9a9fcda09d259cf145d87a29122cac) (cherry picked from commit 55822e16786817f843d32c1347d705c2a2a435dd) (cherry picked from commit f13108a1842a2819489975f0d0040c9c65c3856c)