Merge "hikey: hikey960: Add TARGET_BOOTLOADER_BOARD_NAME"