packages: uboot-sunxi: fix SATA powerup on Bananapro

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 0b7b54fdd8797ff60fd171f8dc96630a26c4ea0d..a52c90d9e7f84e6057d93fe89a99ff215f8e0a68 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -32,6 +32,7 @@ endef
 
 define Kernel/CompileImage
        $(call Kernel/CompileImage/Default)
+       $(call Kernel/CompileImage/Initramfs)
 endef
 
 define Kernel/Clean
@@ -53,7 +54,9 @@ ifdef CONFIG_COLLECT_KERNEL_DEBUG
                $(STAGING_DIR_ROOT)/lib/modules/$(LINUX_VERSION)/* \
                $(KERNEL_BUILD_DIR)/debug/modules/
        $(FIND) $(KERNEL_BUILD_DIR)/debug -type f | $(XARGS) $(KERNEL_CROSS)strip --only-keep-debug
-       $(TAR) c -C $(KERNEL_BUILD_DIR) debug | bzip2 -c -9 > $(BIN_DIR)/kernel-debug.tar.bz2
+       $(TAR) c -C $(KERNEL_BUILD_DIR) debug \
+               $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
+               | bzip2 -c -9 > $(BIN_DIR)/kernel-debug.tar.bz2
   endef
 endif
 
@@ -61,6 +64,8 @@ define BuildKernel
   $(if $(QUILT),$(Build/Quilt))
   $(if $(LINUX_SITE),$(call Download,kernel))
 
+  .NOTPARALLEL:
+
   $(STAMP_PREPARED): $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
        -rm -rf $(KERNEL_BUILD_DIR)
        -mkdir -p $(KERNEL_BUILD_DIR)
@@ -75,21 +80,17 @@ define BuildKernel
                xargs $(TARGET_CROSS)nm | \
                awk '$$$$1 == "U" { print $$$$2 } ' | \
                sort -u > $(KERNEL_BUILD_DIR)/mod_symtab.txt
-       $(TARGET_CROSS)nm -n $(LINUX_DIR)/vmlinux.o | grep ' r __ksymtab' | sed -e 's,........ r __ksymtab_,,' > $(KERNEL_BUILD_DIR)/kernel_symtab.txt
-       grep -f $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_include.txt
-       grep -vf $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_exclude.txt
+       $(TARGET_CROSS)nm -n $(LINUX_DIR)/vmlinux.o | grep ' [rR] __ksymtab' | sed -e 's,........ [rR] __ksymtab_,,' > $(KERNEL_BUILD_DIR)/kernel_symtab.txt
+       grep -Ff $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_include.txt
+       grep -Fvf $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_exclude.txt
        ( \
                echo '#define SYMTAB_KEEP \'; \
                cat $(KERNEL_BUILD_DIR)/sym_include.txt | \
-                       awk '{print "*(___ksymtab+" $$$$1 ") \\" }'; \
+                       awk '{print "KEEP(*(___ksymtab+" $$$$1 ")) \\" }'; \
                echo; \
                echo '#define SYMTAB_KEEP_GPL \'; \
                cat $(KERNEL_BUILD_DIR)/sym_include.txt | \
-                       awk '{print "*(___ksymtab_gpl+" $$$$1 ") \\" }'; \
-               echo; \
-               echo '#define SYMTAB_KEEP_STR \'; \
-               cat $(KERNEL_BUILD_DIR)/sym_include.txt | \
-                       awk '{print "*(__ksymtab_strings." $$$$1 ") \\" }'; \
+                       awk '{print "KEEP(*(___ksymtab_gpl+" $$$$1 ")) \\" }'; \
                echo; \
                echo '#define SYMTAB_DISCARD \'; \
                cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
@@ -99,10 +100,6 @@ define BuildKernel
                cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
                        awk '{print "*(___ksymtab_gpl+" $$$$1 ") \\" }'; \
                echo; \
-               echo '#define SYMTAB_DISCARD_STR \'; \
-               cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
-                       awk '{print "*(__ksymtab_strings." $$$$1 ") \\" }'; \
-               echo; \
        ) > $$@
 
   $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_KCONFIG_LIST) $(TOPDIR)/.config
@@ -124,12 +121,13 @@ define BuildKernel
   define BuildKernel
   endef
 
-  download: $(DL_DIR)/$(LINUX_SOURCE)
+  download: $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
   prepare: $(STAMP_CONFIGURED)
   compile: $(LINUX_DIR)/.modules
        $(MAKE) -C image compile TARGET_BUILD=
 
   oldconfig menuconfig nconfig: $(STAMP_PREPARED) $(STAMP_CHECKED) FORCE
+       rm -f $(LINUX_DIR)/.config.prev
        rm -f $(STAMP_CONFIGURED)
        $(LINUX_RECONF_CMD) > $(LINUX_DIR)/.config
        $(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@