summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-06-07 03:15:25 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-06-07 03:15:25 +0000
commit307dc6063dd2256246f3793d66e0433a2251e8d5 (patch)
tree066e592b713449860d412b75dae898aac35c955c
parent52ebc4660f29cfd88f36da2811870754e9b3b3ed (diff)
parente00892e72ac935507759264f8e923fed435b3998 (diff)
downloadhikey-307dc6063dd2256246f3793d66e0433a2251e8d5.tar.gz
Merge changes Ia61aab73,Ic5c00211android-n-preview-4
* changes: hikey: Fix README about kernel version hikey: Use Image-dtb-4.1 for kernel 4.1
-rw-r--r--README2
-rw-r--r--hikey.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/README b/README
index b4c97c6c..034d0aeb 100644
--- a/README
+++ b/README
@@ -39,7 +39,7 @@ Remove jumper 5-6 and power the board
* Building kernel
$ git clone https://android.googlesource.com/kernel/hikey-linaro
$ cd hikey-linaro
-$ git checkout -b android-hikey-linaro-4.1 origin/android-hikey-linaro-4.1
+$ git checkout -b android-hikey-linaro-4.4 origin/android-hikey-linaro-4.4
$ make ARCH=arm64 hikey_defconfig
$ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-android- -j24
Output: arch/arm64/boot/Image & arch/arm64/boot/dts/hisilicon/hi6220-hikey.dtb
diff --git a/hikey.mk b/hikey.mk
index c5923e00..575b428a 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -1,5 +1,5 @@
ifeq ($(TARGET_KERNEL_USE_4_1), true)
-TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image-4.1
+TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image-dtb-4.1
TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb-4.1
TARGET_FSTAB := fstab.hikey-4.1
endif