projects
/
librecmc
/
librecmc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up recursive dependency handling, use timestamp.pl again, because it saves...
[librecmc/librecmc.git]
/
include
/
kernel-build.mk
diff --git
a/include/kernel-build.mk
b/include/kernel-build.mk
index a89d9d9f2500be28f80e1d4c4fb8e0ee60bc11af..0d3b40e16f44f73fcaf5e05b9c36876dd79200b6 100644
(file)
--- a/
include/kernel-build.mk
+++ b/
include/kernel-build.mk
@@
-6,31
+6,33
@@
#
KERNEL_BUILD:=1
#
KERNEL_BUILD:=1
-include $(INCLUDE_DIR)/kernel-version.mk
include $(INCLUDE_DIR)/host.mk
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/prereq.mk
include $(INCLUDE_DIR)/host.mk
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/prereq.mk
-LINUX_CONFIG ?= ./config/default
+override MAKEFLAGS=
--include $(TOPDIR)/target/linux/generic-$(KERNEL)/config-template
--include $(LINUX_CONFIG)
+GENERIC_LINUX_CONFIG:=$(GENERIC_PLATFORM_DIR)/config-$(shell [ -f "$(GENERIC_PLATFORM_DIR)/config-$(KERNEL_PATCHVER)" ] && echo "$(KERNEL_PATCHVER)" || echo template )
+LINUX_CONFIG_DIR ?= ./config$(shell [ -d "./config-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
+LINUX_CONFIG ?= $(LINUX_CONFIG_DIR)/default
-ifneq ($(CONFIG_ATM),)
- FEATURES += atm
+ifneq ($(DUMP),)
+ TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(BOARD)-$(KERNEL)
+ $(TMP_CONFIG): $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG)
+ $(SCRIPT_DIR)/config.pl + $^ > $@
+ -include $(TMP_CONFIG)
+ .SILENT: $(TMP_CONFIG)
endif
endif
+
ifneq ($(CONFIG_PCI),)
FEATURES += pci
endif
ifneq ($(CONFIG_USB),)
FEATURES += usb
endif
ifneq ($(CONFIG_PCI),)
FEATURES += pci
endif
ifneq ($(CONFIG_USB),)
FEATURES += usb
endif
-ifneq ($(CONFIG_PCMCIA),)
+ifneq ($(CONFIG_PCMCIA)
$(CONFIG_PCCARD)
,)
FEATURES += pcmcia
endif
FEATURES += pcmcia
endif
-ifneq ($(CONFIG_VIDEO_DEV),)
- FEATURES += video
-endif
# remove duplicates
FEATURES:=$(sort $(FEATURES))
# remove duplicates
FEATURES:=$(sort $(FEATURES))
@@
-53,6
+55,9
@@
else
)
endif
)
endif
+STAMP_PREPARED:=$(LINUX_DIR)/.prepared
+STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
+include $(INCLUDE_DIR)/quilt.mk
include $(INCLUDE_DIR)/kernel-defaults.mk
define Kernel/Prepare
include $(INCLUDE_DIR)/kernel-defaults.mk
define Kernel/Prepare
@@
-82,24
+87,21
@@
define BuildKernel
$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
endif
$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
endif
- $(
LINUX_DIR)/.prepared
: $(DL_DIR)/$(LINUX_SOURCE)
+ $(
STAMP_PREPARED)
: $(DL_DIR)/$(LINUX_SOURCE)
-rm -rf $(KERNEL_BUILD_DIR)
-mkdir -p $(KERNEL_BUILD_DIR)
$(call Kernel/Prepare)
touch $$@
-rm -rf $(KERNEL_BUILD_DIR)
-mkdir -p $(KERNEL_BUILD_DIR)
$(call Kernel/Prepare)
touch $$@
- $(
LINUX_DIR)/.configured: $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
+ $(
STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config
$(call Kernel/Configure)
touch $$@
$(call Kernel/Configure)
touch $$@
- $(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured
- rm -rf $(KERNEL_BUILD_DIR)/modules
- @rm -f $(BUILD_DIR)/linux
- ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
+ $(LINUX_DIR)/.modules: $(STAMP_CONFIGURED) $(LINUX_DIR)/.config FORCE
$(call Kernel/CompileModules)
touch $$@
$(call Kernel/CompileModules)
touch $$@
- $(LINUX_DIR)/.image: $(
LINUX_DIR)/.configured
FORCE
+ $(LINUX_DIR)/.image: $(
STAMP_CONFIGURED)
FORCE
$(call Kernel/CompileImage)
touch $$@
$(call Kernel/CompileImage)
touch $$@
@@
-162,15
+164,18
@@
endef
$(eval $(call shexport,Target/Description))
download: $(DL_DIR)/$(LINUX_SOURCE)
$(eval $(call shexport,Target/Description))
download: $(DL_DIR)/$(LINUX_SOURCE)
-prepare: $(
LINUX_DIR)/.configured $(TMP_DIR)/.kernel.mk
+prepare: $(
STAMP_CONFIGURED)
compile: $(LINUX_DIR)/.modules
compile: $(LINUX_DIR)/.modules
-menuconfig: $(LINUX_DIR)/.prepared FORCE
+ $(MAKE) -C image compile
+
+oldconfig menuconfig: $(STAMP_PREPARED) FORCE
$(call Kernel/Configure)
$(call Kernel/Configure)
- $(SCRIPT_DIR)/config.pl '+' $(GENERIC_
PLATFORM_DIR)/config-template
$(LINUX_CONFIG) > $(LINUX_DIR)/.config
- $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS)
menuconfig
- $(SCRIPT_DIR)/config.pl '>' $(GENERIC_
PLATFORM_DIR)/config-template
$(LINUX_DIR)/.config > $(LINUX_CONFIG)
+ $(SCRIPT_DIR)/config.pl '+' $(GENERIC_
LINUX_CONFIG)
$(LINUX_CONFIG) > $(LINUX_DIR)/.config
+ $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS)
$@
+ $(SCRIPT_DIR)/config.pl '>' $(GENERIC_
LINUX_CONFIG)
$(LINUX_DIR)/.config > $(LINUX_CONFIG)
install: $(LINUX_DIR)/.image
install: $(LINUX_DIR)/.image
+ $(MAKE) -C image compile install
clean: FORCE
rm -f $(STAMP_DIR)/.linux-compile
clean: FORCE
rm -f $(STAMP_DIR)/.linux-compile
@@
-183,4
+188,7
@@
rebuild: FORCE
fi
@$(MAKE) compile
fi
@$(MAKE) compile
+image-prereq:
+ $(SUBMAKE) -s -C image prereq
+prereq: image-prereq