On 05/10/2020 07:39, Jan Kiszka wrote: > The primary functional enhancement of this series is support for the > newer Ultra96 v2. > > In addition, the series refactors the Trusted Firmware A integration, > using a soon to-be-upstreamed Isar patch. The refactoring also bumps the > version of TF-A and U-Boot on affected boards, namely Ultra96, RPi4, > Pine64+, MACCHIATObin. For the last two, I'd need some test feedback as > I do not have them in reach.
For the MACCHIATObin, please find the log attached. Early stage bootloaders seem to run, while u-boot gets some abt while trying to load the device tree. Test on jailhouse-images/next, 6d797f1f59d. Ralf > > There is still some room for improvement, but none that should delay the > first integration: > - revision-specific PMU firmware for Ultra96 (primarily changes the > power button IIUC) > - wilc3000 wifi driver clean-up (lengthy story, but I'd like to move > closerto the official downstream repo, which should move us closer to > a potential upstreamed one (wilc1000 is already in 5.9) > > Jan > > > CC: Ralf Ramsauer <[email protected]> > CC: Vijai Kumar K <[email protected]> > > Jan Kiszka (19): > ultra96: Rename to ultra96-v1 > u-boot-ultra96: Set fsbl config explicitly > u-boot: Add specifics for Ultra96-v2 > linux-jailhouse: Drop unused patch > linux-jailhouse: Add patches for Ultra96-v2 > wilc: Add out-of-tree wifi driver for Ultra96-v2 > customizations: Add Ultra96-v2 > Hook up Ultra96-v2 support > README: Add Ultra96-v2 support > ultra96: Disable initrd usage > ultra96: Add rootwait kernel parameter > pine64-plus: Disable initrd > Consolidate PREFERRED_PROVIDER_u-boot > Add new TF-A build infrastructure > rpi4: Convert to stand-alone TF-A recipe and update to 2.3 > pine64: Convert to stand-alone TF-A recipe and update versions > ultra96: Convert to stand-alone TF-A recipe and update versions > macchiatobin: Convert to stand-alone TF-A recipe and update versions > arm-trusted-firmware: Remove now unused artifacts > > README.md | 10 +- > conf/distro/jailhouse-demo.conf | 5 +- > conf/machine/macchiatobin.conf | 6 +- > conf/machine/pine64-plus.conf | 1 - > conf/machine/rpi4.conf | 4 +- > .../ultra96-v1.conf} | 6 +- > .../ultra96-v2.conf} | 8 +- > conf/machine/{ultra96.conf => ultra96.inc} | 11 +- > ...mo.conf => ultra96-v1-jailhouse-demo.conf} | 2 +- > ...mo.conf => ultra96-v2-jailhouse-demo.conf} | 2 +- > images.list | 3 +- > ...de-for-building-custom-Trusted-Firmw.patch | 127 ++++++++ > kas.yml | 4 + > .../arm-trusted-firmware-rpi4_2.2.bb | 28 -- > .../arm-trusted-firmware_2.2.inc | 20 -- > ...-Prepare-for-skipping-initialisation.patch | 127 -------- > ...2-plat-rpi4-Skip-UART-initialisation.patch | 109 ------- > ...pi3-4-Add-support-for-offlining-CPUs.patch | 47 --- > .../arm-trusted-firmware/files/rpi-rules | 23 -- > ...se-abspath-to-dereference-BUILD_BASE.patch | 144 ++++++++ > ...-fix-gcc-warning-about-uninitialized.patch | 0 > .../trusted-firmware-a-macchiatobin_2.3.bb | 34 ++ > .../trusted-firmware-a-pine64-plus_2.3.bb | 6 +- > .../trusted-firmware-a-rpi4_2.3.bb | 6 +- > .../trusted-firmware-a-ultra96_2.3.bb | 17 + > .../trusted-firmware-a_2.3.inc | 19 ++ > ...efile-fix-HOSTCFLAGS-with-CROSS_BUIL.patch | 31 -- > recipes-bsp/u-boot/files/macchiatobin-rules | 40 --- > recipes-bsp/u-boot/files/pine64-plus-rules | 10 +- > recipes-bsp/u-boot/files/ultra96-rules | 5 +- > ...a96-fsbl.elf.xz => ultra96-v1-fsbl.elf.xz} | Bin > .../{ultra96.bit.xz => ultra96-v1.bit.xz} | Bin > .../u-boot/files/ultra96-v2-fsbl.elf.xz | Bin 0 -> 44040 bytes > recipes-bsp/u-boot/files/ultra96-v2.bit.xz | Bin 0 -> 58072 bytes > ...lf.LICENSE => ultra96-vX-fsbl.elf.LICENSE} | 0 > ...a96.bit.LICENSE => ultra96-vX.bit.LICENSE} | 0 > recipes-bsp/u-boot/files/ultra96.bif.tmpl | 7 +- > recipes-bsp/u-boot/u-boot-2020.07.inc | 17 + > .../u-boot-macchiatobin_2019.10-atf2.2.bb | 43 --- > .../u-boot/u-boot-macchiatobin_2020.07.bb | 7 +- > .../u-boot-pine64-plus_2019.10-atf2.2.bb | 33 -- > .../u-boot/u-boot-pine64-plus_2020.07.bb | 25 ++ > .../u-boot/u-boot-ultra96-v1_2020.07.bb | 40 +++ > .../u-boot/u-boot-ultra96-v2_2020.07.bb | 1 + > .../u-boot/u-boot-ultra96_2019.10-atf2.2.bb | 43 --- > ...story-ultra96 => .bash_history-ultra96-v1} | 0 > .../files/.bash_history-ultra96-v2 | 1 + > .../{postinst-ultra96 => postinst-ultra96-v1} | 0 > .../customizations/files/postinst-ultra96-v2 | 1 + > ...-revC-Give-wifi-some-time-after-powe.patch | 38 --- > ...san-Separate-out-clk-related-data-to.patch | 99 ++++++ > ...san-Add-sampling-clock-for-a-phy-to-.patch | 232 +++++++++++++ > ...03-arm64-zynqmp-Add-firmware-DT-node.patch | 37 +++ > ...zynqmp-Add-Node-IDs-in-xlnx-zynqmp.h.patch | 109 +++++++ > ...san-Add-support-to-set-clock-phase-d.patch | 160 +++++++++ > ...ware-xilinx-Add-SDIO-Tap-Delay-nodes.patch | 44 +++ > ...san-Add-support-for-ZynqMP-Platform-.patch | 308 ++++++++++++++++++ > ...irmware-xilinx-Add-DLL-reset-support.patch | 57 ++++ > ...san-Add-support-for-DLL-reset-for-Zy.patch | 99 ++++++ > ...p-Add-ZynqMP-SDHCI-compatible-string.patch | 52 +++ > ...san-Modified-SD-default-speed-to-19M.patch | 64 ++++ > ...support-for-Avnet-Ultra96-rev2-board.patch | 83 +++++ > .../linux/files/arm64_defconfig_5.4 | 2 +- > recipes-kernel/linux/linux-jailhouse_5.4.inc | 12 + > recipes-kernel/wilc/files/debian/wilc.install | 1 + > recipes-kernel/wilc/wilc_15.2-avnet.bb | 33 ++ > wic/macchiatobin.wks | 2 +- > wic/pine64-plus.wks | 2 +- > wic/ultra96.wks | 4 +- > 69 files changed, 1877 insertions(+), 634 deletions(-) > copy conf/{multiconfig/ultra96-jailhouse-demo.conf => > machine/ultra96-v1.conf} (64%) > copy conf/{multiconfig/ultra96-jailhouse-demo.conf => > machine/ultra96-v2.conf} (54%) > rename conf/machine/{ultra96.conf => ultra96.inc} (52%) > copy conf/multiconfig/{ultra96-jailhouse-demo.conf => > ultra96-v1-jailhouse-demo.conf} (89%) > copy conf/multiconfig/{ultra96-jailhouse-demo.conf => > ultra96-v2-jailhouse-demo.conf} (89%) > create mode 100644 > isar-patches/0001-Add-recipe-include-for-building-custom-Trusted-Firmw.patch > delete mode 100644 > recipes-bsp/arm-trusted-firmware/arm-trusted-firmware-rpi4_2.2.bb > delete mode 100644 > recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.inc > delete mode 100644 > recipes-bsp/arm-trusted-firmware/files/0001-console-16550-Prepare-for-skipping-initialisation.patch > delete mode 100644 > recipes-bsp/arm-trusted-firmware/files/0002-plat-rpi4-Skip-UART-initialisation.patch > delete mode 100644 > recipes-bsp/arm-trusted-firmware/files/0003-rpi3-4-Add-support-for-offlining-CPUs.patch > delete mode 100644 recipes-bsp/arm-trusted-firmware/files/rpi-rules > create mode 100644 > recipes-bsp/trusted-firmware-a/files/0001-Use-abspath-to-dereference-BUILD_BASE.patch > rename recipes-bsp/{u-boot => > trusted-firmware-a}/files/0001-mv_ddr4_training-fix-gcc-warning-about-uninitialized.patch > (100%) > create mode 100644 > recipes-bsp/trusted-firmware-a/trusted-firmware-a-macchiatobin_2.3.bb > copy conf/multiconfig/ultra96-jailhouse-demo.conf => > recipes-bsp/trusted-firmware-a/trusted-firmware-a-pine64-plus_2.3.bb (58%) > copy conf/multiconfig/ultra96-jailhouse-demo.conf => > recipes-bsp/trusted-firmware-a/trusted-firmware-a-rpi4_2.3.bb (59%) > create mode 100644 > recipes-bsp/trusted-firmware-a/trusted-firmware-a-ultra96_2.3.bb > create mode 100644 recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.inc > delete mode 100644 > recipes-bsp/u-boot/files/0001-Revert-tools-Makefile-fix-HOSTCFLAGS-with-CROSS_BUIL.patch > delete mode 100644 recipes-bsp/u-boot/files/macchiatobin-rules > rename recipes-bsp/u-boot/files/{ultra96-fsbl.elf.xz => > ultra96-v1-fsbl.elf.xz} (100%) > rename recipes-bsp/u-boot/files/{ultra96.bit.xz => ultra96-v1.bit.xz} (100%) > create mode 100644 recipes-bsp/u-boot/files/ultra96-v2-fsbl.elf.xz > create mode 100644 recipes-bsp/u-boot/files/ultra96-v2.bit.xz > rename recipes-bsp/u-boot/files/{ultra96-fsbl.elf.LICENSE => > ultra96-vX-fsbl.elf.LICENSE} (100%) > rename recipes-bsp/u-boot/files/{ultra96.bit.LICENSE => > ultra96-vX.bit.LICENSE} (100%) > create mode 100644 recipes-bsp/u-boot/u-boot-2020.07.inc > delete mode 100644 recipes-bsp/u-boot/u-boot-macchiatobin_2019.10-atf2.2.bb > rename conf/multiconfig/ultra96-jailhouse-demo.conf => > recipes-bsp/u-boot/u-boot-macchiatobin_2020.07.bb (51%) > delete mode 100644 recipes-bsp/u-boot/u-boot-pine64-plus_2019.10-atf2.2.bb > create mode 100644 recipes-bsp/u-boot/u-boot-pine64-plus_2020.07.bb > create mode 100644 recipes-bsp/u-boot/u-boot-ultra96-v1_2020.07.bb > create mode 120000 recipes-bsp/u-boot/u-boot-ultra96-v2_2020.07.bb > delete mode 100644 recipes-bsp/u-boot/u-boot-ultra96_2019.10-atf2.2.bb > rename recipes-core/customizations/files/{.bash_history-ultra96 => > .bash_history-ultra96-v1} (100%) > create mode 120000 recipes-core/customizations/files/.bash_history-ultra96-v2 > rename recipes-core/customizations/files/{postinst-ultra96 => > postinst-ultra96-v1} (100%) > create mode 120000 recipes-core/customizations/files/postinst-ultra96-v2 > delete mode 100644 > recipes-kernel/linux/files/0001-arm64-dts-zcu100-revC-Give-wifi-some-time-after-powe.patch > create mode 100644 > recipes-kernel/linux/files/0001-mmc-sdhci-of-arasan-Separate-out-clk-related-data-to.patch > create mode 100644 > recipes-kernel/linux/files/0002-mmc-sdhci-of-arasan-Add-sampling-clock-for-a-phy-to-.patch > create mode 100644 > recipes-kernel/linux/files/0003-arm64-zynqmp-Add-firmware-DT-node.patch > create mode 100644 > recipes-kernel/linux/files/0004-firmware-zynqmp-Add-Node-IDs-in-xlnx-zynqmp.h.patch > create mode 100644 > recipes-kernel/linux/files/0005-mmc-sdhci-of-arasan-Add-support-to-set-clock-phase-d.patch > create mode 100644 > recipes-kernel/linux/files/0006-firmware-xilinx-Add-SDIO-Tap-Delay-nodes.patch > create mode 100644 > recipes-kernel/linux/files/0007-mmc-sdhci-of-arasan-Add-support-for-ZynqMP-Platform-.patch > create mode 100644 > recipes-kernel/linux/files/0008-firmware-xilinx-Add-DLL-reset-support.patch > create mode 100644 > recipes-kernel/linux/files/0009-mmc-sdhci-of-arasan-Add-support-for-DLL-reset-for-Zy.patch > create mode 100644 > recipes-kernel/linux/files/0010-arm64-zynqmp-Add-ZynqMP-SDHCI-compatible-string.patch > create mode 100644 > recipes-kernel/linux/files/0011-mmc-sdhci-of-arasan-Modified-SD-default-speed-to-19M.patch > create mode 100644 > recipes-kernel/linux/files/0012-arm64-dts-Add-support-for-Avnet-Ultra96-rev2-board.patch > create mode 100644 recipes-kernel/wilc/files/debian/wilc.install > create mode 100644 recipes-kernel/wilc/wilc_15.2-avnet.bb > -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/f13614cc-920a-e8f9-8a36-e6992b736698%40oth-regensburg.de.
(0x29) SD - wait_for_sd_interrupt: Error interrupt - 00008000 SD - wait_for_sd_interrupt: Error interrupt status 00000003 SD - sd_get_cmd_response: Get command response failed. SD - sd_init: Failed - ret = 00000081 Error: Failed initializing interface Error: Failed boot attempt 01. error = 0x0C1 BootROM - 2.03 Starting CP-0 IOROM 1.07 Booting from SD 0 (0x29) SD - wait_for_sd_interrupt: Error interrupt - 00008000 SD - wait_for_sd_interrupt: Error interrupt status 00000003 SD - sd_get_cmd_response: Get command response failed. SD - sd_init: Failed - ret = 00000081 Error: Failed initializing interface Found valid image at boot postion 0x002 lNOTICE: Starting binary extension NOTICE: SVC: SW Revision 0x0. SVC is not supported mv_ddr: mv_ddr-devel-18.08.0-ga881467-dirty (Oct 05 2020 - 12:19:08) mv_ddr: completed successfully NOTICE: Cold boot NOTICE: Booting Trusted Firmware NOTICE: BL1: v2.3(): (Marvell-devel-18.12.0) NOTICE: BL1: Built : 11:44:10, Oct 5 2020 NOTICE: BL1: Booting BL2 NOTICE: BL2: v2.3(): (Marvell-devel-18.12.0) NOTICE: BL2: Built : 11:44:10, Oct 5 2020 NOTICE: SCP_BL2 contains 5 concatenated images NOTICE: Skipping MSS CP3 related image NOTICE: Skipping MSS CP2 related image NOTICE: Load image to CP1 MSS AP0 NOTICE: Loading MSS image from addr. 0x40269f4 Size 0x1cd8 to MSS at 0xf4280000 NOTICE: Done NOTICE: Load image to CP0 MSS AP0 NOTICE: Loading MSS image from addr. 0x40286cc Size 0x1cd8 to MSS at 0xf2280000 NOTICE: Done NOTICE: Load image to AP0 MSS NOTICE: Loading MSS image from addr. 0x402a3a4 Size 0x5420 to MSS at 0xf0580000 NOTICE: Done NOTICE: SCP Image doesn't contain PM firmware NOTICE: BL1: Booting BL31 lNOTICE: MSS PM is not supported in this build NOTICE: BL31: v2.3(): (Marvell-devel-18.12.0) NOTICE: BL31: Built : 11:44:10, Oct 5 2020 U-Boot 2020.07 (Jul 06 2020 - 19:22:53 +0000) DRAM: 4 GiB Comphy chip #0: Comphy-0: PEX0 Comphy-1: PEX0 Comphy-2: PEX0 Comphy-3: PEX0 Comphy-4: SFI Comphy-5: SATA1 Comphy chip #1: Comphy-0: SGMII1 1.25 Gbps Comphy-1: SATA0 Comphy-2: USB3_HOST0 Comphy-3: SATA1 Comphy-4: SFI Comphy-5: UNCONNECTED UTMI PHY 0 initialized to USB Host0 UTMI PHY 1 initialized to USB Host1 UTMI PHY 2 initialized to USB Host0 SATA link 0 timeout. SATA link 1 timeout. AHCI 0001.0000 32 slots 2 ports 6 Gbps 0x3 impl SATA mode flags: 64bit ncq led only pmp fbss pio slum part sxs PCIE-0: Link down MMC: sdhci@6e0000: 0, sdhci@780000: 1 Loading Environment from SPI Flash... SF: Detected w25q32 with page size 256 Bytes, erase size 4 KiB, total 4 MiB *** Warning - bad CRC, using default environment Model: MACCHIATOBin-8040 Net: Warning: mvpp2-1 (eth0) using random MAC address - c2:ee:7a:2f:89:3d eth0: mvpp2-1 Hit any key to stop autoboot: 2 1 0 switch to partitions #0, OK mmc1 is current device Scanning mmc 1:1... Found U-Boot script /boot/boot.scr 342 bytes read in 16 ms (20.5 KiB/s) ## Executing script at 04d00000 32132 bytes read in 41 ms (764.6 KiB/s) 18942464 bytes read in 1883 ms (9.6 MiB/s) ## Flattened Device Tree blob at 04f00000 Booting using the fdt blob at 0x4f00000 Loading Device Tree to 00000000bfff5000, end 00000000bffffd83 ... "Synchronous Abort" handler, esr 0x96000045 elr: 000000000006b5dc lr : 0000000000066568 (reloc) elr: 000000007ffaa5dc lr : 000000007ffa5568 x0 : ffffffffffffffff x1 : 00000000bfffcd84 x2 : 0000000000000000 x3 : ffffffffffff827b x4 : 0000000004f07d84 x5 : 00000000bfff5000 x6 : 00000000bfff5000 x7 : 000000000000000f x8 : 000000007fb270f0 x9 : 0000000000000008 x10: 00000000bffffd83 x11: 00000000bffffd83 x12: 00000000c0000000 x13: 0000000000000000 x14: 00000000bfff5000 x15: 0000000000000010 x16: 0000000000000020 x17: 0000000000000000 x18: 000000007fb2edd0 x19: 00000000bfff5000 x20: 0000000004f00000 x21: 00000000847d0000 x22: 0000000000007d84 x23: 000000000000ad84 x24: 0000000000000010 x25: 000000007fb272b8 x26: 00000000c0000000 x27: 0000000000000000 x28: 000000007fc4f3a0 x29: 000000007fb271d0 Code: 54000061 aa0603e0 d65f03c0 38606882 (38206822) Resetting CPU ... resetting ... (0x29) Found valid image at boot postion 0x002 lNOTICE: Starting binary extension NOTICE: SVC: SW Revision 0x0. SVC is not supported mv_ddr: mv_ddr-devel-18.08.0-ga881467-dirty (Oct 05 2020 - 12:19:08)
