Rebase hammerhead on latest master

device-lg-hammerhead/90-android-touch-dev.rules

@@ -0,0 +1,5 @@
+# use 'weston-calibrator' to calibrate the touchscreen!
+SUBSYSTEM=="input", ATTRS{name}=="touch_dev", \
+ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1" \
+ENV{WL_CALIBRATION}="0.982113 -0.006129 1.983124 -0.002560 1.000800 -6.012451"
+

device-lg-hammerhead/APKBUILD

@@ -0,0 +1,24 @@
+pkgname=device-lg-hammerhead
+pkgver=1
+pkgrel=1
+pkgdesc="Google Nexus 5"
+url="https://github.com/postmarketOS"
+arch="noarch"
+license="FIXME"
+depends="linux-lg-hammerhead"
+makedepends=""
+install=""
+subpackages=""
+source="deviceinfo"
+options="!check"
+
+build() {
+	return 0
+}
+
+package() {
+	install -D -m644 "$srcdir"/deviceinfo \
+		"$pkgdir"/etc/deviceinfo
+}
+
+sha512sums="a12472500d1047361a9b5708e0a1a384e3174717c0844b4e84882de7d65e17ac48a28a5c41d26d0e0f83796a8ceadb2f461a80df94e0fbdad38c6fe9db25c240  deviceinfo"

device-lg-hammerhead/deviceinfo

@@ -0,0 +1,28 @@
+# This document format is a draft.
+# You can source it in shell scripts.
+# Use only double quotes.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Google Nexus 5"
+deviceinfo_manufacturer="LG"
+deviceinfo_date=""
+deviceinfo_keyboard="false"
+deviceinfo_nonfree="????"
+deviceinfo_dtb=""
+deviceinfo_modules=""
+deviceinfo_modules_initfs=""
+deviceinfo_external_disk="false"
+deviceinfo_external_disk_install="false"
+deviceinfo_flash_methods="fastboot"
+deviceinfo_arch="armhf"
+
+
+# You can for example extract these from an existing boot.img
+deviceinfo_flash_offset_base="0"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x2900000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x02700000"
+deviceinfo_flash_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=hammerhead user_debug=31 maxcpus=2 msm_watchdog_v2.enable=1"
+deviceinfo_flash_pagesize="2048"
+

device-lg-hammerhead/initfs-hook.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# set framebuffer resolution
+cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode

device-lg-hammerhead/profile.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# Dirty hacks, necessary to get a working demo...
+if [ -e /etc/xdg/weston/weston.ini ]; then
+	rm /etc/xdg/weston/weston.ini
+	echo "WARNING: xwayland does not work yet on lg-mako (probably"
+	echo "because of bad framebuffer drivers)"
+	echo "=> Deleted /etc/xdg/weston/weston.ini as workaround"
+fi
+if [ -e /lib/udev/v4l_id ]; then
+	mv /lib/udev/v4l_id /lib/udev/v4l_id_
+	echo "WARNING: v4l_id hangs with the current kernel."
+	echo "=> Moved it from /lib/udev/v4l_id to /lib/udev/v4l_id_"
+fi
+
+
+# Run a few weston demos, because the postmarketos-demos program depends
+# on xwayland for now (Alpine's GTK3 isn't configured for Wayland
+# support yet.)
+if [ $(tty) = "/dev/tty1" ]; then
+	(
+		sleep 3;
+		export XDG_RUNTIME_DIR=/tmp/0-runtime-dir
+		weston-smoke &
+		weston-simple-damage &
+		weston-editor &
+		weston-terminal --shell=/usr/bin/htop &
+	) > /dev/null &
+fi
+

linux-lg-hammerhead/APKBUILD

@@ -0,0 +1,108 @@
+# APKBUILD based on linux-vanilla aport. Changes:
+# - disabled module installation
+# - add !check !tracedeps
+# - package: just install zimage and kernel.release, because the kernel config
+#	does not generate modules or dtb files
+# - do not create -dev subpackage (makes no sense without module support)
+#
+# Kernel config based on: arch/arm/configs/lineageos_mako_defconfig
+# Changes:
+# - enable devtmpfs (needed for udev -> touch support in weston)
+
+_vendor=lg
+_flavor=lg-hammerhead
+_hash="1dae34efb7d2399073ca371c953aafd2ed503849"
+_config="hammerhead_defconfig"
+
+pkgname=linux-${_flavor}
+pkgver=3.4.0
+case $pkgver in
+	*.*.*)  _kernver=${pkgver%.*};;
+	*.*) _kernver=$pkgver;;
+esac
+pkgrel=3
+arch="armhf"
+pkgdesc="LineageOS kernel for Nexus 5 hammerhead"
+url="https://github.com/LineageOS/android_kernel_lge_hammerhead"
+depends="postmarketos-mkinitfs"
+makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev"
+options="!strip !check !tracedeps"
+install=
+source="
+	https://github.com/LineageOS/android_kernel_lge_hammerhead/archive/${_hash}.zip
+	compiler-gcc6.h
+	aeea3592a13bf12861943e44fc48f1f270941f8d.patch
+	gpu-msm-fix-gcc5-compile.patch
+	devtmpfs.patch
+"
+subpackages=""
+license="GPL2"
+
+_abi_release=${pkgver}
+_carch="arm"
+HOSTCC="${CC:-gcc}"
+HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
+
+ksrcdir="$srcdir/android_kernel_lge_hammerhead-${_hash}"
+
+prepare() {
+	local _patch_failed=
+	cd "$ksrcdir"
+
+	# first apply patches in specified order
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i..."
+			if ! patch -s -p1 -N -i "$srcdir"/$i; then
+				echo $i >>failed
+				_patch_failed=1
+			fi
+			;;
+		esac
+	done
+
+	if ! [ -z "$_patch_failed" ]; then
+		error "The following patches failed:"
+		cat failed
+		return 1
+	fi
+
+	# gcc6 support
+	cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/"
+
+	mkdir -p "$srcdir"/build
+	make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" CONFIG_NO_ERROR_ON_MISMATCH=y HOSTCC="$HOSTCC" CROSS_COMPILE=arm-linux-gnueabi- \
+		 ${_config}
+}
+
+
+
+# this is so we can do: 'abuild menuconfig' to reconfigure kernel
+menuconfig() {
+	cd "$srcdir"/build || return 1
+	make ARCH="$_carch" menuconfig
+	cp .config "$startdir"/$_config
+}
+
+build() {
+	cd "$srcdir"/build
+	unset LDFLAGS
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \
+		|| return 1
+}
+
+package() {
+	install -Dm644 "$srcdir/build/arch/arm/boot/zImage-dtb" \
+		"$pkgdir/boot/vmlinuz-$_flavor"
+
+	install -D "$srcdir/build/include/config/kernel.release" \
+		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
+}
+
+sha512sums="882ec7d4ce3eadb372c1279f53fab18c5c7f18109d3df2c8c4005ec5d06e6244c2c788c3183defa4d4aaf493a5c1bf905d8bd2aeb554e4b0680b0e1b45de6742  1dae34efb7d2399073ca371c953aafd2ed503849.zip
+d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
+ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  aeea3592a13bf12861943e44fc48f1f270941f8d.patch
+7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  gpu-msm-fix-gcc5-compile.patch
+71fb635ddac4faee90a2454231e50ac4ba9c273447f3e4c373034e6bce1414fd987bcfc8f7592751debe88230c4e164da7cfe339273510ec3d8f934120ab00f3  devtmpfs.patch"

linux-lg-hammerhead/aeea3592a13bf12861943e44fc48f1f270941f8d.patch

@@ -0,0 +1,49 @@
+From aeea3592a13bf12861943e44fc48f1f270941f8d Mon Sep 17 00:00:00 2001
+From: Behan Webster <behanw@converseincode.com>
+Date: Wed, 24 Sep 2014 01:06:46 +0100
+Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). In this case using static inline
+and removing the NULL version of return_address in return_address.c does
+the right thing.
+
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+Acked-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/include/asm/ftrace.h    | 2 +-
+ arch/arm/kernel/return_address.c | 5 -----
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
+index 39eb16b0066f2..bfe2a2f5a644e 100644
+--- a/arch/arm/include/asm/ftrace.h
++++ b/arch/arm/include/asm/ftrace.h
+@@ -45,7 +45,7 @@ void *return_address(unsigned int);
+ 
+ #else
+ 
+-extern inline void *return_address(unsigned int level)
++static inline void *return_address(unsigned int level)
+ {
+ 	return NULL;
+ }
+diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
+index fafedd86885dd..f6aa84d5b93c9 100644
+--- a/arch/arm/kernel/return_address.c
++++ b/arch/arm/kernel/return_address.c
+@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
+ #warning "TODO: return_address should use unwind tables"
+ #endif
+ 
+-void *return_address(unsigned int level)
+-{
+-	return NULL;
+-}
+-
+ #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
+ 
+ EXPORT_SYMBOL_GPL(return_address);

linux-lg-hammerhead/compiler-gcc6.h

@@ -0,0 +1,69 @@
+// SOURCE:
+// https://github.com/NextThingCo/CHIP-u-boot/issues/10#issuecomment-287515505
+
+#ifndef __LINUX_COMPILER_H
+#error "Please don't include <linux/compiler-gcc6.h> directly, include <linux/compiler.h> instead."
+#endif
+
+#define __used				__attribute__((__used__))
+#define __must_check			__attribute__((warn_unused_result))
+#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
+
+/* Mark functions as cold. gcc will assume any path leading to a call
+   to them will be unlikely.  This means a lot of manual unlikely()s
+   are unnecessary now for any paths leading to the usual suspects
+   like BUG(), printk(), panic() etc. [but let's keep them for now for
+   older compilers]
+
+   Early snapshots of gcc 4.3 don't support this and we can't detect this
+   in the preprocessor, but we can live with this because they're unreleased.
+   Maketime probing would be overkill here.
+
+   gcc also has a __attribute__((__hot__)) to move hot functions into
+   a special section, but I don't see any sense in this right now in
+   the kernel context */
+#define __cold			__attribute__((__cold__))
+
+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
+
+#ifndef __CHECKER__
+# define __compiletime_warning(message) __attribute__((warning(message)))
+# define __compiletime_error(message) __attribute__((error(message)))
+#endif /* __CHECKER__ */
+
+/*
+ * Mark a position in code as unreachable.  This can be used to
+ * suppress control flow warnings after asm blocks that transfer
+ * control elsewhere.
+ *
+ * Early snapshots of gcc 4.5 don't support this and we can't detect
+ * this in the preprocessor, but we can live with this because they're
+ * unreleased.  Really, we need to have autoconf for the kernel.
+ */
+#define unreachable() __builtin_unreachable()
+
+/* Mark a function definition as prohibited from being cloned. */
+#define __noclone	__attribute__((__noclone__))
+
+/*
+ * Tell the optimizer that something else uses this function or variable.
+ */
+#define __visible __attribute__((externally_visible))
+
+/*
+ * GCC 'asm goto' miscompiles certain code sequences:
+ *
+ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
+ *
+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
+ *
+ * (asm goto is automatically volatile - the naming reflects this.)
+ */
+#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
+
+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
+#define __HAVE_BUILTIN_BSWAP32__
+#define __HAVE_BUILTIN_BSWAP64__
+#define __HAVE_BUILTIN_BSWAP16__
+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+

linux-lg-hammerhead/devtmpfs.patch

@@ -0,0 +1,11 @@
+diff --git a/arch/arm/configs/hammerhead_defconfig b/arch/arm/configs/hammerhead_defconfig
+index f94bb7e..51e5323 100644
+--- a/arch/arm/configs/hammerhead_defconfig
++++ b/arch/arm/configs/hammerhead_defconfig
+@@ -1,4 +1,5 @@
+ # CONFIG_ARM_PATCH_PHYS_VIRT is not set
++CONFIG_DEVTMPFS=y
+ CONFIG_EXPERIMENTAL=y
+ # CONFIG_SWAP is not set
+ CONFIG_AUDIT=y
+

linux-lg-hammerhead/gpu-msm-fix-gcc5-compile.patch

@@ -0,0 +1,33 @@
+source:
+https://github.com/ShinySide/HispAsian_Lollipop_G6/commit/b7756b6fc4bb728722b14d2dfdbaf1dc843812e9
+
+* These need to be static to avoid these errors:
+
+drivers/built-in.o: In function `.LANCHOR1':
+msm_iommu_sec.c:(.data+0x9298): undefined reference to `kgsl_iommu_sync_lock'
+msm_iommu_sec.c:(.data+0x929c): undefined reference to `kgsl_iommu_sync_unlock'
+Makefile:877: recipe for target '.tmp_vmlinux1' failed
+make: *** [.tmp_vmlinux1] Error 1
+
+Signed-off-by: Chet Kener <Cl3Kener@gmail.com>
+
+--- a/drivers/gpu/msm/kgsl_iommu.c
++++ b/drivers/gpu/msm/kgsl_iommu.c
+@@ -1010,7 +1010,7 @@ static int kgsl_iommu_init_sync_lock(struct kgsl_mmu *mmu)
+  *
+  * Return - int - number of commands.
+  */
+-inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu,
++static inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu,
+ 						unsigned int *cmds)
+ {
+ 	struct kgsl_device *device = mmu->device;
+@@ -1080,7 +1080,7 @@ inline unsigned int kgsl_iommu_sync_lock(struct kgsl_mmu *mmu,
+  *
+  * Return - int - number of commands.
+  */
+-inline unsigned int kgsl_iommu_sync_unlock(struct kgsl_mmu *mmu,
++static inline unsigned int kgsl_iommu_sync_unlock(struct kgsl_mmu *mmu,
+ 					unsigned int *cmds)
+ {
+ 	struct kgsl_device *device = mmu->device;