commit a3400945f7fa994db558e914de6cb37173248348
author Dmitry Shmidt <dimitrysh@google.com> Thu Aug 24 22:55:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 24 22:55:46 2017 +0000
tree 7fb999bb346866761e3ecca375186c26ee4371be
parent 7b519e663f43ea6a7eb31e6415d9054793f766b4
parent 6b1e94ab2f9f4e107583aa6af30f1e6c3e283ffa

Merge "hikey: hikey960: Add TARGET_BOOTLOADER_BOARD_NAME" am: 0ac1c5c5c4
am: 6b1e94ab2f

Change-Id: Ia7260a5f51b2193615a73266195bb217029ab3d7

hikey/BoardConfig.mk

diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
index b490a1f..0cf3527 100644
--- a/hikey/BoardConfig.mk
+++ b/hikey/BoardConfig.mk
@@ -1,9 +1,11 @@
 include device/linaro/hikey/BoardConfigCommon.mk
 
+TARGET_BOOTLOADER_BOARD_NAME := hikey
+TARGET_BOARD_PLATFORM := hikey
+
 TARGET_CPU_VARIANT := cortex-a53
 TARGET_2ND_CPU_VARIANT := cortex-a53
 
-TARGET_BOARD_PLATFORM := hikey
 ifeq ($(TARGET_KERNEL_USE), 3.18)
 BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime
 else

hikey960/BoardConfig.mk

diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk
index ca6dec9..00598e7 100644
--- a/hikey960/BoardConfig.mk
+++ b/hikey960/BoardConfig.mk
@@ -1,10 +1,11 @@
 include device/linaro/hikey/BoardConfigCommon.mk
 
+TARGET_BOOTLOADER_BOARD_NAME := hikey960
+TARGET_BOARD_PLATFORM := hikey960
+
 TARGET_CPU_VARIANT := cortex-a73
 TARGET_2ND_CPU_VARIANT := cortex-a73
 
-TARGET_BOARD_PLATFORM := hikey960
-
 TARGET_NO_DTIMAGE := false
 
 BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey960 console=ttyFIQ0 androidboot.console=ttyFIQ0