summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2008-03-29 23:09:46 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2008-03-29 23:09:46 +0000
commitc659b13a2fc07188f716327364f6080e9486f3de (patch)
tree27e7d039a80625c01afa917d831057b2d684a69d /target/linux
parent230723920abcc27128ba271d0b20428e81fc9515 (diff)
downloadbuildroot-novena-c659b13a2fc07188f716327364f6080e9486f3de.tar.gz
buildroot-novena-c659b13a2fc07188f716327364f6080e9486f3de.zip
Remove duplicate AVR32 patches, and add support for ARCH and conditional AVR32 patches
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/Config.in.advanced56
-rw-r--r--target/linux/Makefile.in.advanced24
2 files changed, 63 insertions, 17 deletions
diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
index d0a1045fd..cd5f52cdf 100644
--- a/target/linux/Config.in.advanced
+++ b/target/linux/Config.in.advanced
@@ -32,7 +32,7 @@ if BR2_KERNEL_LINUX_ADVANCED
# --- These 'constants' requires regular maintenance, so put them first
config BR2_KERNEL_PATCH_LEVEL
string
- default "3" if BR2_LINUX_2_6_24 && BR2_KERNEL_ADD_LATEST_MINORPATCH
+ default "4" if BR2_LINUX_2_6_24 && BR2_KERNEL_ADD_LATEST_MINORPATCH
default "17" if BR2_LINUX_2_6_23 && BR2_KERNEL_ADD_LATEST_MINORPATCH
default "19" if BR2_LINUX_2_6_22 && BR2_KERNEL_ADD_LATEST_MINORPATCH
default "7" if BR2_LINUX_2_6_21 && BR2_KERNEL_ADD_LATEST_MINORPATCH
@@ -41,7 +41,7 @@ config BR2_KERNEL_PATCH_LEVEL
config BR2_KERNEL_CURRENT_VERSION
string
- default "2.6.24.3"
+ default "2.6.24.4"
config BR2_KERNEL_NEXT_VERSION
string
@@ -63,15 +63,15 @@ config BR2_KERNEL_THIS_VERSION
config LINUX26_LATEST_RC_VERSION
string
- default "2.6.25" if BR2_KERNEL_ADD_LATEST_RC_PATCH
+ default "2.6.25-rc7" if BR2_KERNEL_ADD_LATEST_RC_PATCH
-config LINUX26_LATEST_MM_VERSION
+config LINUX26_LATEST_GIT_VERSION
string
- default "2.6.25-rc5-mm1" if BR2_KERNEL_ADD_LATEST_MM_PATCH
+ default "2.6.25-rc7-git5" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
-config LINUX26_LATEST_GIT_VERSION
+config LINUX26_LATEST_MM_VERSION
string
- default "2.6.25-rc6-git3" if BR2_KERNEL_ADD_LATEST_SNAPSHOT
+ default "2.6.25-rc5-mm1" if BR2_KERNEL_ADD_LATEST_MM_PATCH
config BR2_KERNEL_SITE
string
@@ -129,9 +129,9 @@ choice
Select the specific Linux version you want to use
config BR2_LINUX_2_6_STABLE
- bool "The latest stable Linux kernel (2.6.24.3)"
+ bool "The latest stable Linux kernel (2.6.24.4)"
help
- Linux 2.6.24.3
+ Linux 2.6.24.4
config BR2_LINUX_2_6_24
bool "Linux 2.6.24"
@@ -233,47 +233,66 @@ endif
menu "Patches"
depends on BR2_PACKAGE_LINUX
+config BR2_KERNEL_ADD_KERNEL_ORG_PATCH
+ bool "Add kernel.org patch"
+ depends on BR2_KERNEL_BASE
+ help
+ Add pre, snapshot or -mm patches
+ from http://www.kernel.org/
+
+config BR2_KERNEL_ADD_LATEST
+ bool "Use only the latest patch version"
+ default y
+ depends on BR2_KERNEL_ADD_KERNEL_ORG_PATCH
+ help
+ Restrict the choices to the latest versions
+
choice
- prompt "Add a patch to the Linux Kernel"
+ prompt "Add a kernel.org patch to the Linux Kernel"
depends on BR2_PACKAGE_LINUX
depends on !BR2_KERNEL_PREPATCHED
- default BR2_KERNEL_ADD_NO_PATCH
+ depends on BR2_KERNEL_ADD_KERNEL_ORG_PATCH
help
Select a patch to add to the Linux kernel
-config BR2_KERNEL_ADD_NO_PATCH
- bool "Do not add a patch"
-
config BR2_KERNEL_ADD_LATEST_MINORPATCH
bool "Add _latest_ '.#' minor patch"
+ depends on BR2_KERNEL_ADD_LATEST
select BR2_KERNEL_ADD_PATCH
config BR2_KERNEL_ADD_MINORPATCH
bool "Add a '.#' minor patch"
+ depends on !BR2_KERNEL_ADD_LATEST
select BR2_KERNEL_ADD_PATCH
config BR2_KERNEL_ADD_LATEST_RC_PATCH
bool "Add _latest_ '-rc#' patch"
+ depends on BR2_KERNEL_ADD_LATEST
select BR2_KERNEL_ADD_PATCH
config BR2_KERNEL_ADD_RC_PATCH
bool "Add an '-rc#' patch"
+ depends on !BR2_KERNEL_ADD_LATEST
select BR2_KERNEL_ADD_PATCH
config BR2_KERNEL_ADD_LATEST_SNAPSHOT
bool "Add _latest_ 'snapshot' patch"
+ depends on BR2_KERNEL_ADD_LATEST
select BR2_KERNEL_ADD_PATCH
config BR2_KERNEL_ADD_SNAPSHOT
bool "Add a 'snapshot' patch (linux-2.6.X-rc#-git#)"
+ depends on !BR2_KERNEL_ADD_LATEST
select BR2_KERNEL_ADD_PATCH
config BR2_KERNEL_ADD_LATEST_MM_PATCH
- bool "Add latest '-mm' patch for the stable linux kernel"
+ bool "Add _latest_ '-mm' patch for the stable linux kernel"
+ depends on BR2_KERNEL_ADD_LATEST
select BR2_KERNEL_ADD_PATCH
config BR2_KERNEL_ADD_MM_PATCH
bool "Add an '-mm#' patch for the stable linux kernel"
+ depends on !BR2_KERNEL_ADD_LATEST
select BR2_KERNEL_ADD_PATCH
endchoice
@@ -282,7 +301,6 @@ config BR2_KERNEL_ADD_PATCH
bool
default n
-
config BR2_KERNEL_MINORLEVEL
string "patch level"
default ""
@@ -303,6 +321,12 @@ config BR2_KERNEL_MM_LEVEL
default ""
depends on BR2_KERNEL_ADD_MM_PATCH
+source "target/device/Config.in.linux.patches"
+
+config BR2_LINUX_BOARD_PATCH
+ bool "Add board specific patch"
+ default y
+
config BR2_LINUX_BSP_PATCH
string "Additional patch to apply (from \$(DL_DIR))"
default ""
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)