From 61609b38713172219b7fafb048c586a303885ac2 Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Mon, 24 Aug 2020 13:30:57 +0200 Subject: [PATCH] exynos9610: adopt to new dtbo generation method Change-Id: I90b3c1c8c3e8ee19d0f99ad8a3d9ba8bdb2be55a --- BoardConfigCommon.mk | 2 +- dtbo.mk | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 dtbo.mk diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index fe7c877..339e87c 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -58,7 +58,7 @@ BOARD_BOOTIMG_HEADER_VERSION := 1 BOARD_MKBOOTIMG_ARGS := --base $(BOARD_KERNEL_BASE) --pagesize $(BOARD_KERNEL_PAGESIZE) --kernel_offset $(BOARD_KERNEL_OFFSET) --second_offset $(BOARD_SECOND_OFFSET) --ramdisk_offset $(BOARD_RAMDISK_OFFSET) --tags_offset $(BOARD_TAGS_OFFSET) --header_version $(BOARD_BOOTIMG_HEADER_VERSION) BOARD_KERNEL_SEPARATED_DTBO := true -BOARD_CUSTOM_DTBOIMG_MK := $(COMMON_PATH)/dtbo.mk +BOARD_DTBO_CFG := $(COMMON_PATH)/configs/dtboimg.cfg TARGET_BOOTLOADER_IS_2ND := true # Kernel diff --git a/dtbo.mk b/dtbo.mk deleted file mode 100644 index 6054c93..0000000 --- a/dtbo.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (C) 2020 The LineageOS Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -MKDTIMG := $(HOST_OUT_EXECUTABLES)/mkdtimg$(HOST_EXECUTABLE_SUFFIX) - -KERNEL_DTBO_DIR := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/arch/arm64/boot/dts/exynos -KERNEL_DTBO_CFG := $(COMMON_PATH)/configs/dtboimg.cfg - -define build-dtboimage-target - $(call pretty,"Target dtbo image: $(BOARD_PREBUILT_DTBOIMAGE)") - $(MKDTIMG) cfg_create $@ $(KERNEL_DTBO_CFG) -d $(KERNEL_DTBO_DIR) - $(hide) chmod a+r $@ -endef - -$(BOARD_PREBUILT_DTBOIMAGE): $(MKDTIMG) $(INSTALLED_KERNEL_TARGET) - $(build-dtboimage-target) -- 2.20.1