hardware:boot/{l-loader,arm-trusted-firmware}-hikey960 are no longer properly
booting after Guillaume's replacement of my downstream edk2-hikey960 package
and update of arm-trusted-firmware package.

New serial output:

NOTICE:  BL2: v2.1(debug):
NOTICE:  BL2: Built : 13:51:40OURCE, Apr  9 2019
INFO:    BL2: Doing platform setup
INFO:    UFS LUN0 contains 1024 blocks with 4096-byte size
INFO:    UFS LUN1 contains 1024 blocks with 4096-byte size
INFO:    UFS LUN2 contains 2048 blocks with 4096-byte size
INFO:    UFS LUN3 contains 7805952 blocks with 4096-byte size
INFO:    ufs: change power mode success
INFO:    BL2: Loading image id 2
INFO:    Loading image id=2 at address 0x89c80000
INFO:    Image id=2 loaded: 0x89c80000 - 0x89cb5100
INFO:    BL2: Initiating SCP_BL2 transfer to SCP
INFO:    BL2: SCP_BL2: 0x89c80000@0x35100
INFO:    BL2: SCP_BL2 HEAD:
INFO:    BL2: SCP_BL2 0x7000 0x179 0x159 0x149
INFO:    BL2: SCP_BL2 0x189 0x18b 0x18d 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x18f
INFO:    BL2: SCP_BL2 0x191 0x0 0x193 0x195
INFO:    BL2: SCP_BL2 0x18fd 0x18fd 0x18fd 0x18fd
INFO:    BL2: SCP_BL2 0x18fd 0x18fd 0x18fd 0x18fd
INFO:    BL2: SCP_BL2 0x18fd 0x18fd 0x18fd 0x18fd
INFO:    BL2: SCP_BL2 0x4d454355 0x43494741 0x424d554e 0x21215245
INFO:    BL2: SCP_BL2 0x4a054904 0x42912000 0xf841bfbc 0xe7fa0b04
INFO:    BL2: SCP_BL2 0xb88cf000 0x3b18 0x3d1c 0x6809493e
INFO:    BL2: SCP_BL2 0x4613680a 0x201f102 0xf0002a04 0x600a804c
INFO:    BL2: SCP_BL2 0x204f04f 0xf203fb02 0xf102440a 0x60100204
INFO:    BL2: SCP_BL2 0x160f04f 0xf103fb01 0x68004834 0x61044408
INFO:    BL2: SCP_BL2 0x61866145 0xf8c061c7 0xf8c08020 0xf8c09024
INFO:    BL2: SCP_BL2 0xf8c0a028 0xf3efb02c 0xf3ef8208 0x68118309
INFO:    BL2: SCP_BL2 0xf1026401 0xf0110204 0xbf070f04 0x46113220
INFO:    BL2: SCP_BL2 TAIL:
INFO:    BL2: SCP_BL2 0x19cad091 0x19cad091 0x19cad5a9 0x19cad0ed
INFO:    BL2: SCP_BL2 0x19cad195 0x19cad1cd 0x19cad001 0x19cad2e5
INFO:    BL2: SCP_BL2 0x19cad003 0x19cad209 0x0 0x19cad6a9
INFO:    BL2: SCP_BL2 0x19cad469 0x19cad27d 0x19cad2b9 0x19cad005
INFO:    BL2: SCP_BL2 0x19cad17d 0x19cad7e9 0x19cad809 0x19cad9a5
INFO:    BL2: SCP_BL2 0x19cad015 0x19cad049 0x19b80040 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 transferred to SCP
INFO:    start fw loading
INFO:    fw load success
WARNING: BL2: Platform setup already done!!
INFO:    BL2: Loading image id 3
INFO:    Loading image id=3 at address 0x1ac58000
INFO:    Image id=3 loaded: 0x1ac58000 - 0x1ac63024
INFO:    BL2: Loading image id 4
INFO:    Loading image id=4 at address 0x3f000000
INFO:    Image id=4 loaded: 0x3f000000 - 0x3f00001c
INFO:    OPTEE ep=0x3f000000
INFO:    OPTEE header info:
INFO:          magic=0x4554504f
INFO:          version=0x2
INFO:          arch=0x1
INFO:          flags=0x0
INFO:          nb_images=0x1
INFO:    BL2: Loading image id 21
INFO:    Loading image id=21 at address 0x3f000000
INFO:    Image id=21 loaded: 0x3f000000 - 0x3f044270
INFO:    BL2: Skip loading image id 22
INFO:    BL2: Loading image id 5
INFO:    Loading image id=5 at address 0x1ac98000
INFO:    Image id=5 loaded: 0x1ac98000 - 0x1ad88000
NOTICE:  BL2: Booting BL31
INFO:    Entry point address = 0x1ac58000
INFO:    SPSR = 0x3cd
NOTICE:  BL31: v2.1(debug):
NOTICE:  BL31: Built : 13:51:40OURCE, Apr  9 2019
INFO:    ARM GICv2 driver initialized

Previous output:

NOTICE:  BL2: v1.5(debug):
NOTICE:  BL2: Built : 18:48:01OURCE, Jun  3 2018
INFO:    BL2: Doing platform setup
INFO:    UFS LUN0 contains 1024 blocks with 4096-byte size
INFO:    UFS LUN1 contains 1024 blocks with 4096-byte size
INFO:    UFS LUN2 contains 2048 blocks with 4096-byte size
INFO:    UFS LUN3 contains 7805952 blocks with 4096-byte size
INFO:    ufs: change power mode success
INFO:    BL2: Loading image id 2
INFO:    Loading image id=2 at address 0x89c80000
INFO:    Image id=2 loaded: 0x89c80000 - 0x89cb5100
INFO:    BL2: Initiating SCP_BL2 transfer to SCP
INFO:    BL2: SCP_BL2: 0x89c80000@0x35100
INFO:    BL2: SCP_BL2 HEAD:
INFO:    BL2: SCP_BL2 0x7000 0x179 0x159 0x149
INFO:    BL2: SCP_BL2 0x189 0x18b 0x18d 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x18f
INFO:    BL2: SCP_BL2 0x191 0x0 0x193 0x195
INFO:    BL2: SCP_BL2 0x18fd 0x18fd 0x18fd 0x18fd
INFO:    BL2: SCP_BL2 0x18fd 0x18fd 0x18fd 0x18fd
INFO:    BL2: SCP_BL2 0x18fd 0x18fd 0x18fd 0x18fd
INFO:    BL2: SCP_BL2 0x4d454355 0x43494741 0x424d554e 0x21215245
INFO:    BL2: SCP_BL2 0x4a054904 0x42912000 0xf841bfbc 0xe7fa0b04
INFO:    BL2: SCP_BL2 0xb88cf000 0x3b18 0x3d1c 0x6809493e
INFO:    BL2: SCP_BL2 0x4613680a 0x201f102 0xf0002a04 0x600a804c
INFO:    BL2: SCP_BL2 0x204f04f 0xf203fb02 0xf102440a 0x60100204
INFO:    BL2: SCP_BL2 0x160f04f 0xf103fb01 0x68004834 0x61044408
INFO:    BL2: SCP_BL2 0x61866145 0xf8c061c7 0xf8c08020 0xf8c09024
INFO:    BL2: SCP_BL2 0xf8c0a028 0xf3efb02c 0xf3ef8208 0x68118309
INFO:    BL2: SCP_BL2 0xf1026401 0xf0110204 0xbf070f04 0x46113220
INFO:    BL2: SCP_BL2 TAIL:
INFO:    BL2: SCP_BL2 0x19cad091 0x19cad091 0x19cad5a9 0x19cad0ed
INFO:    BL2: SCP_BL2 0x19cad195 0x19cad1cd 0x19cad001 0x19cad2e5
INFO:    BL2: SCP_BL2 0x19cad003 0x19cad209 0x0 0x19cad6a9
INFO:    BL2: SCP_BL2 0x19cad469 0x19cad27d 0x19cad2b9 0x19cad005
INFO:    BL2: SCP_BL2 0x19cad17d 0x19cad7e9 0x19cad809 0x19cad9a5
INFO:    BL2: SCP_BL2 0x19cad015 0x19cad049 0x19b80040 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 0x0 0x0 0x0 0x0
INFO:    BL2: SCP_BL2 transferred to SCP
INFO:    start fw loading
INFO:    fw load success
WARNING: BL2: Platform setup already done!!
INFO:    BL2: Loading image id 3
INFO:    Loading image id=3 at address 0x1ac58000
INFO:    Image id=3 loaded: 0x1ac58000 - 0x1ac63028
INFO:    BL2: Loading image id 4
INFO:    Loading image id=4 at address 0x3f000000
INFO:    Image id=4 loaded: 0x3f000000 - 0x3f00001c
INFO:    OPTEE ep=0x3f000000
INFO:    OPTEE header info:
INFO:          magic=0x4554504f
INFO:          version=0x2
INFO:          arch=0x1
INFO:          flags=0x0
INFO:          nb_images=0x1
INFO:    BL2: Loading image id 21
INFO:    Loading image id=21 at address 0x3f000000
INFO:    Image id=21 loaded: 0x3f000000 - 0x3f045270
INFO:    BL2: Skip loading image id 22
INFO:    BL2: Loading image id 5
INFO:    Loading image id=5 at address 0x1ac98000
INFO:    Image id=5 loaded: 0x1ac98000 - 0x1ad88000
NOTICE:  BL2: Booting BL31
INFO:    Entry point address = 0x1ac58000
INFO:    SPSR = 0x3cd
NOTICE:  BL31: v1.5(debug):
NOTICE:  BL31: Built : 18:48:01OURCE, Jun  3 2018
WARNING: Using deprecated integer interrupt array in gicv2_driver_data_t
WARNING: Please migrate to using an interrupt_prop_t array
INFO:    ARM GICv2 driver initialized
INFO:    BL31: Initializing runtime services
WARNING: BL31: cortex_a53: CPU workaround for 835769 was missing!
INFO:    BL31: cortex_a53: CPU workaround for 843419 was applied
INFO:    BL31: cortex_a53: CPU workaround for 855873 was applied
INFO:    plat_setup_psci_ops: INFO:    BL31: Preparing for EL3 exit to normal
world
INFO:    Entry point address = 0x1ac98000
INFO:    SPSR = 0x3c9
UEFI firmware (version Alpha built at 12:00:00 on May 31 2018)