diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2018-05-02 18:51:00 +0200 |
|---|---|---|
| committer | Gogs <gogs@fake.local> | 2018-05-02 18:51:00 +0200 |
| commit | 9722540f2e540875fbd4bdb93f73611267cd8aef (patch) | |
| tree | b8bbe8b606626180583c87d7eb3fce5289f77cbc | |
| parent | 2773eda14966d7eb0db71f0452aeb649b9d9ec42 (diff) | |
| parent | 682240a04779f6ae24144940acbf6e640f56cac2 (diff) | |
Merge branch 'fix-ADK_TARGET_KERNEL_USE_CUSTOMCONFIG' of stk/openadk into master
| -rw-r--r-- | mk/build.mk | 8 | ||||
| -rw-r--r-- | mk/kernel-build.mk | 2 | ||||
| -rw-r--r-- | target/Makefile | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mk/build.mk b/mk/build.mk index 5680a5be9..014ba470c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -249,13 +249,13 @@ kernelconfig: ${KERNEL_MAKE_OPTS} \ menuconfig -ifeq ($(ADK_TARGET_KERNEL_USE_CUSTOMCONFIG),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) savekconfig: - @echo "Saving kernel configuration to $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH)" - $(CP) $(LINUX_DIR)/.config $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH) + @echo "Saving kernel configuration to $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH)" + $(CP) $(LINUX_DIR)/.config $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH) else savekconfig: - @echo "You have to enable ADK_TARGET_KERNEL_USE_CUSTOMCONFIG to be able to save the current kernel configuration." + @echo "You have to enable ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG to be able to save the current kernel configuration." endif diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index fb43cd930..fb7ffc955 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -80,7 +80,7 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG)$(ADK_TARGET_WALDUX_KERNEL_USE_DEFCONFIG),y) ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} $(ADK_TARGET_KERNEL_DEFCONFIG) $(MAKE_TRACE) else ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) - @if [ ! -f $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH) ];then \ + @if [ ! -f $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH) ];then \ echo "no kernel configuration found in $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH)"; \ exit 1; \ fi diff --git a/target/Makefile b/target/Makefile index 1ecb58501..846620d6c 100644 --- a/target/Makefile +++ b/target/Makefile @@ -4,8 +4,8 @@ include $(ADK_TOPDIR)/rules.mk include $(ADK_TOPDIR)/mk/rootfs.mk -ifeq ($(ADK_TARGET_KERNEL_USE_CUSTOMCONFIG),y) -KERNEL_MODULES_USED:=$(shell grep -s =m $(ADK_TOPDIR)/$(ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH)) +ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) +KERNEL_MODULES_USED:=$(shell grep -s =m $(ADK_TOPDIR)/$(ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH)) else KERNEL_MODULES_USED:=$(shell grep ^ADK_$(ADK_TARGET_OS)_KERNEL $(ADK_TOPDIR)/.config|grep =m) endif |