upgrade the ixp4xx ethernet driver to v0.3.1, split the Gateway 7001 support to two...

[openwrt.git] / include / kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 24e7e85..93bf66d 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -6,9 +6,16 @@
 #
 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)/prereq.mk
 

--include ./config
+LINUX_CONFIG ?= ./config/default
+
+-include $(TOPDIR)/target/linux/generic-$(KERNEL)/config-template
+-include $(LINUX_CONFIG)
+

 ifneq ($(CONFIG_ATM),)
   FEATURES += atm
 endif
 ifneq ($(CONFIG_ATM),)
   FEATURES += atm
 endif


@@ -37,12 +44,6 @@ else
   all: compile
 endif
 
   all: compile
 endif
 

-include $(INCLUDE_DIR)/kernel-version.mk
-include $(INCLUDE_DIR)/host.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-LINUX_CONFIG:=./config
-

 ifneq (,$(findstring uml,$(BOARD)))
   LINUX_KARCH:=um
 else
 ifneq (,$(findstring uml,$(BOARD)))
   LINUX_KARCH:=um
 else


@@ -91,8 +92,11 @@ define Kernel/Configure/2.6
        $(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig prepare scripts
 endef
 define Kernel/Configure/Default
        $(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig prepare scripts
 endef
 define Kernel/Configure/Default

-       @$(CP) $(LINUX_CONFIG) $(LINUX_DIR)/.config
-       $(call Kernel/Configure/$(KERNEL))
+       @if [ -f "./config/profile-$(PROFILE)" ]; then \
+               $(SCRIPT_DIR)/config.pl '+' $(GENERIC_PLATFORM_DIR)/config-template '+' $(LINUX_CONFIG) ./config/profile-$(PROFILE) > $(LINUX_DIR)/.config; \
+       else \
+               $(SCRIPT_DIR)/config.pl '+' $(GENERIC_PLATFORM_DIR)/config-template $(LINUX_CONFIG) > $(LINUX_DIR)/.config; \
+       fi

 endef
 define Kernel/Configure
        $(call Kernel/Configure/Default)
 endef
 define Kernel/Configure
        $(call Kernel/Configure/Default)


@@ -132,6 +136,7 @@ define Kernel/CompileImage/Default
        $(call Kernel/SetInitramfs)
        $(MAKE) -j$(CONFIG_JLEVEL) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" $(KERNELNAME)
        $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)
        $(call Kernel/SetInitramfs)
        $(MAKE) -j$(CONFIG_JLEVEL) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" $(KERNELNAME)
        $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)

+       $(KERNEL_CROSS)objcopy -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux.elf

 endef
 define Kernel/CompileImage
        $(call Kernel/CompileImage/Default)
 endef
 define Kernel/CompileImage
        $(call Kernel/CompileImage/Default)


@@ -163,6 +168,7 @@ define BuildKernel
 
   $(LINUX_DIR)/.configured: $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
        $(call Kernel/Configure)
 
   $(LINUX_DIR)/.configured: $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
        $(call Kernel/Configure)

+       $(call Kernel/Configure/$(KERNEL))

        touch $$@
 
   $(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured
        touch $$@
 
   $(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured


@@ -207,6 +213,7 @@ define Profile/Default
   PACKAGES:=
 endef
 
   PACKAGES:=
 endef
 

+confname=$(subst .,_,$(subst -,_,$(1)))

 define Profile
   $(eval $(call Profile/Default))
   $(eval $(call Profile/$(1)))
 define Profile
   $(eval $(call Profile/Default))
   $(eval $(call Profile/$(1)))


@@ -215,10 +222,16 @@ define Profile
        echo "Target-Profile: $(1)"; \
        echo "Target-Profile-Name: $(NAME)"; \
        echo "Target-Profile-Packages: $(PACKAGES)"; \
        echo "Target-Profile: $(1)"; \
        echo "Target-Profile-Name: $(NAME)"; \
        echo "Target-Profile-Packages: $(PACKAGES)"; \

+       if [ -f ./config/profile-$(1) ]; then \
+               echo "Target-Profile-Kconfig: yes"; \
+       fi; \

        echo "Target-Profile-Description:"; \
        getvar "$(call shvar,Profile/$(1)/Description)"; \
        echo "@@"; \
        echo;
        echo "Target-Profile-Description:"; \
        getvar "$(call shvar,Profile/$(1)/Description)"; \
        echo "@@"; \
        echo;

+  ifeq ($(CONFIG_LINUX_$(call confname,$(KERNEL)_$(1))),y)
+    PROFILE=$(1)
+  endif

 endef
 
 $(eval $(call shexport,Target/Description))
 endef
 
 $(eval $(call shexport,Target/Description))


@@ -226,12 +239,11 @@ $(eval $(call shexport,Target/Description))
 download: $(DL_DIR)/$(LINUX_SOURCE)
 prepare: $(LINUX_DIR)/.configured $(TMP_DIR)/.kernel.mk
 compile: $(LINUX_DIR)/.modules
 download: $(DL_DIR)/$(LINUX_SOURCE)
 prepare: $(LINUX_DIR)/.configured $(TMP_DIR)/.kernel.mk
 compile: $(LINUX_DIR)/.modules

-menuconfig: $(LINUX_DIR)/.configured FORCE
+menuconfig: $(LINUX_DIR)/.prepared FORCE
+       $(call Kernel/Configure)
+       $(SCRIPT_DIR)/config.pl '+' $(GENERIC_PLATFORM_DIR)/config-template $(LINUX_CONFIG) > $(LINUX_DIR)/.config

        $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) menuconfig
        $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) menuconfig

-       $(SCRIPT_DIR)/config.pl $(LINUX_DIR)/.config > $(PLATFORM_DIR)/config
-ifeq ($(KERNEL),2.6)
-       $(SCRIPT_DIR)/config.pl '>' $(GENERIC_PLATFORM_DIR)/config-template $(LINUX_DIR)/.config > $(PLATFORM_DIR)/config-diff 
-endif
+       $(SCRIPT_DIR)/config.pl '>' $(GENERIC_PLATFORM_DIR)/config-template $(LINUX_DIR)/.config > $(LINUX_CONFIG)

 
 install: $(LINUX_DIR)/.image
 
 
 install: $(LINUX_DIR)/.image