From c659b13a2fc07188f716327364f6080e9486f3de Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Sat, 29 Mar 2008 23:09:46 +0000
Subject: Remove duplicate AVR32 patches, and add support for ARCH and
 conditional AVR32 patches

---
 target/linux/Makefile.in.advanced | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'target/linux/Makefile.in.advanced')

diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 0c4ee7610..d57f52a21 100644
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -77,6 +77,13 @@ ifeq ($(strip $(LINUX26_PATCH_DIR)),)
 LINUX26_PATCH_DIR:=$(BOARD_PATH)/kernel-patches/
 endif
 
+# kernel architecture patches provided by buildroot
+KERNEL_ARCH_PATCH_DIR:=$(strip $(subst ",,$(BR2_KERNEL_ARCH_PATCH_DIR)))
+#"))
+
+
+
+
 # -----------------------------------------------------------------------------
 # Linux kernel configuration file
 # This is used if BR2_PACKAGE_LINUX_USE_KCONFIG is set
@@ -267,6 +274,18 @@ ifeq ($(BR2_PACKAGE_OPENSWAN),y)
 	toolchain/patch-kernel.sh $(LINUX26_DIR) package/openswan \
 		linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
 endif
+	touch $@
+
+$(LINUX26_DIR)/.patched.arch: $(LINUX26_DIR)/.patched
+ifneq ($(BR2_KERNEL_ARCH_PATCH_DIR),)
+	if [ -d $(KERNEL_ARCH_PATCH_DIR) ] ; then \
+	toolchain/patch-kernel.sh $(LINUX26_DIR) $(KERNEL_ARCH_PATCH_DIR) \
+		linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2} ; \
+	fi
+endif
+	touch $@
+
+$(LINUX26_DIR)/.patched.board: $(LINUX26_DIR)/.patched.arch $(KERNEL_COND_PATCHES)
 ifneq ($(LINUX26_PATCH_DIR),)
 	if [ -d $(LINUX26_PATCH_DIR) ] ; then \
 	toolchain/patch-kernel.sh $(LINUX26_DIR) $(LINUX26_PATCH_DIR) \
@@ -274,9 +293,11 @@ ifneq ($(LINUX26_PATCH_DIR),)
 	fi
 endif
 	touch $@
+
 # =============================================================================
+linux_patch: $(LINUX26_DIR)/.patched.board
 
-$(LINUX26_DIR)/.config:	$(LINUX26_DIR)/.patched
+$(LINUX26_DIR)/.config:	$(LINUX26_DIR)/.patched.board
 ifeq ($(BR2_PACKAGE_LINUX_USE_DEFCONFIG),y)
 	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(BOARD_NAME)_defconfig 
 endif
@@ -454,6 +475,7 @@ linux-status:
 	@echo BR2_KERNEL_SITE=$(BR2_KERNEL_SITE)
 	@echo BR2_KERNEL_PATCH_SITE=$(BR2_KERNEL_PATCH_SITE)
 	@echo BR2_KERNEL_PATCH=$(BR2_KERNEL_PATCH)
+	@echo KERNEL_COND_PATCHES=$(KERNEL_COND_PATCHES)
 	@echo BR2_LINUX26_CUSTOM=$(BR2_LINUX26_CUSTOM)
 	@echo BR2_CUSTOM_LINUX26_PATCH_SITE=$(BR2_CUSTOM_LINUX26_PATCH_SITE)
 	@echo BR2_CUSTOM_LINUX26_PATCH=$(BR2_CUSTOM_LINUX26_PATCH)
-- 
cgit v1.2.3