google-crosshatch: fix build with downstream kernel (!1016)

The downstream kernel doesn't provide a separate dtb file,
but the experimental mainline kernel does.

Previously, the deviceinfo specified a dtb file for both kernels,
and pmbootstrap ignored the missing file for downstream kernel.

pmbootstrap now errors when the dtb file is missing, so this
fixes the downstream kernel by specifying a dtb file only for
the upstream kernel.

device/device-google-crosshatch/APKBUILD

@@ -3,7 +3,7 @@
 pkgname="device-google-crosshatch"
 pkgdesc="Google Pixel 3 XL"
 pkgver=0.1
-pkgrel=5
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -27,13 +27,13 @@ package() {
 kernel_downstream() {
 	pkgdesc="LineageOS downstream kernel (recommended)"
 	depends="linux-google-crosshatch"
-	mkdir "$subpkgdir"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
 kernel_mainline() {
 	pkgdesc="Attempt at mainlining. DO NOT USE: doesn't work (only USB networking is supported)"
 	depends="linux-google-crosshatch-mainline firmware-google-crosshatch-mainline-dtbo"
-	mkdir "$subpkgdir"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
-sha512sums="0d275efe4d79d2a9fecbfa1d4ebe7da3647bdca607c7b20171082a4c832df9c76112749ada36895c13902acbea2ddeacf95279755a1d072998a387c898499e5b  deviceinfo"
+sha512sums="e59ef716e7bac49db418a913babd7b49017d24ee7fedb39767de7c9cf7be57a03c6f9d4dc0eaa79dac6042eb6a6c120e28a92ce6c90b16b7d289b823aa42feeb  deviceinfo"

device/device-google-crosshatch/deviceinfo

@@ -6,8 +6,9 @@ deviceinfo_name="Google Pixel 3 XL"
 deviceinfo_manufacturer="Google"
 deviceinfo_codename="google-crosshatch"
 deviceinfo_date=""
-deviceinfo_dtb="qcom/sdm845-crosshatch"
-deviceinfo_append_dtb="true"
+deviceinfo_dtb_downstream=""
+deviceinfo_dtb_mainline="qcom/sdm845-crosshatch"
+deviceinfo_append_dtb_mainline="true"
 deviceinfo_modules_initfs=""
 deviceinfo_arch="aarch64"