From d8e3e939694c4777c5287e44e67772f4e5c043aa Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 7 Jun 2020 09:21:12 +0200 Subject: [PATCH] linux: rename config option Commit a4eef9a3959 (linux: introduce BR2_KERNEL_DTB_KEEP_DIRNAME) introduced a new config option, but its name was not matching the naming-scheme of the other config options. Rename it. We don't need legacy handling, because that config option was added very recently and was never part of a release. Signed-off-by: Yann E. MORIN --- linux/Config.in | 2 +- linux/linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 61e84f00b4..2af3a00352 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -407,7 +407,7 @@ config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH You can provide a list of dts paths to copy and build, separated by spaces. -config BR2_KERNEL_DTB_KEEP_DIRNAME +config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME bool "Keep the directory name of the Device Tree" help If enabled, the device tree blobs keep their diff --git a/linux/linux.mk b/linux/linux.mk index c3859a59d5..b90b032bb9 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -381,7 +381,7 @@ define LINUX_INSTALL_DTB $(foreach dtb,$(LINUX_DTBS), \ install -D \ $(or $(wildcard $(LINUX_ARCH_PATH)/boot/dts/$(dtb)),$(LINUX_ARCH_PATH)/boot/$(dtb)) \ - $(1)/$(if $(BR2_KERNEL_DTB_KEEP_DIRNAME),$(dtb),$(notdir $(dtb))) + $(1)/$(if $(BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME),$(dtb),$(notdir $(dtb))) ) endef endif # BR2_LINUX_KERNEL_APPENDED_DTB -- 2.30.2