diff options
| author | Jake Weinstein <jake@aospa.co> | 2020-10-30 17:41:23 +0100 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2022-01-13 16:38:27 +0800 |
| commit | dbfc554e6a874b9c406518165ec5010a78612c1e (patch) | |
| tree | 093ccc1ebed485259660bf0e71b9ad1ca48bbf7d | |
| parent | b0b6e17542dfec7ad2a0e90e9d3150751e4440b2 (diff) | |
kernelscripts: Make DTB/DTBO building vendor-agnostic.
* No need to hardcode qcom without a way to change it.
Change-Id: Ifd69ca2b58bf708ec590615557bfd615acf3e5ef
| -rwxr-xr-x | buildkernel.sh | 18 | ||||
| -rw-r--r-- | kernel_definitions.mk | 5 | ||||
| -rw-r--r-- | legacy_definitions.mk | 2 |
3 files changed, 14 insertions, 11 deletions
diff --git a/buildkernel.sh b/buildkernel.sh index 27b2cd1..fc629d4 100755 --- a/buildkernel.sh +++ b/buildkernel.sh @@ -224,13 +224,13 @@ copy_all_to_prebuilt() #copy dtbo images to prebuilt echo "=============" echo "Copying target dtb/dtbo files to prebuilt" - if [ ! -e ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/qcom ]; then - mkdir -p ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/qcom + if [ ! -e ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR} ]; then + mkdir -p ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR} fi - cp -p -r ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/qcom/*.dtb ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/qcom/ + cp -p -r ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtb ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/ - if [ -f ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/qcom/*.dtbo ]; then - cp -p -r ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/qcom/*.dtbo ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/qcom/ + if [ -f ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtbo ]; then + cp -p -r ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtbo ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/ fi #copy arch generated headers @@ -297,11 +297,11 @@ copy_from_prebuilt() #copy dtbo images from prebuilt echo "=============" echo "Copying dtb/dtbo files from prebuilt" - if [ ! -e ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/qcom ]; then - mkdir -p ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/qcom + if [ ! -e ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR} ]; then + mkdir -p ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR} fi - cp -p -r ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/qcom/*.dtb ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/qcom/ - cp -p -r ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/qcom/*.dtbo ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/qcom/ + cp -p -r ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtb ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/ + cp -p -r ${PREBUILT_OUT}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/*.dtbo ${OUT_DIR}/${IMAGE_FILE_PATH}/dts/vendor/${DTS_VENDOR}/ #copy arch generated headers, and kernel generated headers echo "============" diff --git a/kernel_definitions.mk b/kernel_definitions.mk index f4a29f0..07100c9 100644 --- a/kernel_definitions.mk +++ b/kernel_definitions.mk @@ -273,6 +273,7 @@ define build-kernel VENDOR_RAMDISK_KERNEL_MODULES_ARCHIVE=$(VENDOR_RAMDISK_KERNEL_MODULES_ARCHIVE) \ VENDOR_RAMDISK_KERNEL_MODULES="$(VENDOR_RAMDISK_KERNEL_MODULES)" \ TARGET_PRODUCT=$(TARGET_BOARD_PLATFORM) \ + DTS_VENDOR=$(TARGET_DTS_VENDOR) \ device/qcom/kernelscripts/buildkernel.sh \ $(real_cc) \ $(TARGET_KERNEL_MAKE_ENV) @@ -324,7 +325,7 @@ $(RTIC_DTB): $(INSTALLED_KERNEL_TARGET) # Creating a dtb.img once the kernel is compiled if TARGET_KERNEL_APPEND_DTB is set to be false $(INSTALLED_DTBIMAGE_TARGET): $(INSTALLED_KERNEL_TARGET) $(RTIC_DTB) ifneq (,$(wildcard $(TARGET_KERNEL_SOURCE)/arch/arm64/boot/dts/vendor)) - cat $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom/*.dtb $(RTIC_DTB) > $@ + cat $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/$(TARGET_DTS_VENDOR)/*.dtb $(RTIC_DTB) > $@ else - cat $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/qcom/*.dtb $(RTIC_DTB) > $@ + cat $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/$(TARGET_DTS_VENDOR)/*.dtb $(RTIC_DTB) > $@ endif diff --git a/legacy_definitions.mk b/legacy_definitions.mk index 55dc520..ea14511 100644 --- a/legacy_definitions.mk +++ b/legacy_definitions.mk @@ -19,3 +19,5 @@ endif ifneq ($(TARGET_KERNEL_CONFIG),) KERNEL_DEFCONFIG := $(TARGET_KERNEL_CONFIG) endif + +TARGET_DTS_VENDOR ?= qcom |