| commit | d2e6a3d6b7691a10d585a25da7427ab9afc1f70a | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Thu Aug 27 22:56:10 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 27 22:56:10 2015 +0000 |
| tree | 8000fb756cd3ece996fd986ce1b36ac2586f6f40 | |
| parent | 975a70c15ac09d244e23f7fa8c2454060304f13b [diff] | |
| parent | 1f9c53cccb9b25698d50fbdff52d164229041768 [diff] |
am 91e4c819: (-s ours) Merge "Upgrade 3.10 kernel images to d0f220c" automerge: 1f9c53c * commit '1f9c53cccb9b25698d50fbdff52d164229041768':
diff --git a/arm/kernel-qemu-armv7 b/arm/kernel-qemu-armv7 index 395c7c6..779a2bc 100755 --- a/arm/kernel-qemu-armv7 +++ b/arm/kernel-qemu-armv7 Binary files differ
diff --git a/arm/vmlinux-qemu-armv7 b/arm/vmlinux-qemu-armv7 index d1611f9..c635999 100755 --- a/arm/vmlinux-qemu-armv7 +++ b/arm/vmlinux-qemu-armv7 Binary files differ
diff --git a/arm64/kernel-qemu b/arm64/kernel-qemu index 3726515..7271265 100755 --- a/arm64/kernel-qemu +++ b/arm64/kernel-qemu Binary files differ
diff --git a/arm64/vmlinux-qemu b/arm64/vmlinux-qemu index 3580f67..2f0e7fe 100755 --- a/arm64/vmlinux-qemu +++ b/arm64/vmlinux-qemu Binary files differ
diff --git a/build-kernel.sh b/build-kernel.sh index beb5984..f0d25b6 100755 --- a/build-kernel.sh +++ b/build-kernel.sh
@@ -171,6 +171,9 @@ if [ "$ARCH" = "mips64" ]; then GCC_VERSION=4.9 fi + if [ "$ARCH" = "mips" ]; then + GCC_VERSION=4.9 + fi echo "Autoconfig: --gcc-version=$GCC_VERSION" fi @@ -251,7 +254,7 @@ CROSSPREFIX=x86_64-linux-android- ;; mips) - CROSSPREFIX=mipsel-linux-android- + CROSSPREFIX=mips64el-linux-android- ;; mips64) CROSSPREFIX=mips64el-linux-android-
diff --git a/mips/kernel-qemu b/mips/kernel-qemu index d33fec6..2c3185e 100755 --- a/mips/kernel-qemu +++ b/mips/kernel-qemu Binary files differ
diff --git a/mips/vmlinux-qemu b/mips/vmlinux-qemu index d33fec6..2c3185e 100755 --- a/mips/vmlinux-qemu +++ b/mips/vmlinux-qemu Binary files differ
diff --git a/mips64/kernel-qemu b/mips64/kernel-qemu index 95f2502..4291a80 100755 --- a/mips64/kernel-qemu +++ b/mips64/kernel-qemu Binary files differ
diff --git a/mips64/vmlinux-qemu b/mips64/vmlinux-qemu index 95f2502..4291a80 100755 --- a/mips64/vmlinux-qemu +++ b/mips64/vmlinux-qemu Binary files differ
diff --git a/x86/3.10/kernel-qemu b/x86/3.10/kernel-qemu new file mode 100644 index 0000000..8dc8945 --- /dev/null +++ b/x86/3.10/kernel-qemu Binary files differ
diff --git a/x86/3.10/vmlinux-qemu b/x86/3.10/vmlinux-qemu new file mode 100755 index 0000000..c3dc4a1 --- /dev/null +++ b/x86/3.10/vmlinux-qemu Binary files differ
diff --git a/x86/kernel-qemu b/x86/kernel-qemu index 74f2763..b026196 100644 --- a/x86/kernel-qemu +++ b/x86/kernel-qemu Binary files differ
diff --git a/x86/pc-bios/bios.bin b/x86/pc-bios/bios.bin index ed9b8f7..1281f42 100644 --- a/x86/pc-bios/bios.bin +++ b/x86/pc-bios/bios.bin Binary files differ
diff --git a/x86/vmlinux-qemu b/x86/vmlinux-qemu index 649d3fe..4ff4a7b 100755 --- a/x86/vmlinux-qemu +++ b/x86/vmlinux-qemu Binary files differ
diff --git a/x86_64/kernel-qemu b/x86_64/kernel-qemu index 6ca791c..fd583f4 100644 --- a/x86_64/kernel-qemu +++ b/x86_64/kernel-qemu Binary files differ
diff --git a/x86_64/vmlinux-qemu b/x86_64/vmlinux-qemu index 3f75421..c1fcd79 100755 --- a/x86_64/vmlinux-qemu +++ b/x86_64/vmlinux-qemu Binary files differ