Remove duplicate AVR32 patches, and add support for ARCH and conditional AVR32 patches

This commit is contained in:
Ulf Samuelsson
2008-03-29 23:09:46 +00:00
parent 230723920a
commit c659b13a2f
34 changed files with 622 additions and 111389 deletions

View File

@@ -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 $@
# =============================================================================
$(LINUX26_DIR)/.config: $(LINUX26_DIR)/.patched
# =============================================================================
linux_patch: $(LINUX26_DIR)/.patched.board
$(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)