kernel: Better x86 support
- Mention the right kernel image on documentation
- Build dtbs only when the dts folder exists, Google enables CONFIG_OF
on x86_64 GKI config, this is also the same check done on Linux
Makefile
Change-Id: I1b0f7a39b0b00f2a4516d2cff79e591136ee3af8
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index cfc5d69..863289f 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -34,6 +34,7 @@
# BOARD_KERNEL_IMAGE_NAME = Built image name
# for ARM use: zImage
# for ARM64 use: Image.gz
+# for x86 use: bzImage
# for uncompressed use: Image
# If using an appended DT, append '-dtb'
# to the end of the image name.
@@ -470,7 +471,7 @@
$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) $(KERNEL_MODULES_PARTITION_FILE_LIST) $(SYSTEM_KERNEL_MODULES_PARTITION_FILE_LIST)
@echo "Building Kernel Image ($(BOARD_KERNEL_IMAGE_NAME))"
$(call make-kernel-target,$(BOARD_KERNEL_IMAGE_NAME))
- $(hide) if grep -q '^CONFIG_OF=y' $(KERNEL_CONFIG); then \
+ $(hide) if [ -d "$(KERNEL_SRC)/arch/$(KERNEL_ARCH)/boot/dts/" ]; then \
echo "Building DTBs"; \
$(call make-kernel-target,dtbs); \
fi