aboutsummaryrefslogtreecommitdiff
path: root/target/Makefile.in
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-06-22 23:43:08 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-06-22 23:43:08 +0200
commitf3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a (patch)
tree2b1e7628b5bad58c4b4065b9de30321bd02ff502 /target/Makefile.in
parentb10197dcf2ca1d6afbdf8f131560a3a0a8b9c72d (diff)
parent7b7b4260966a5d991b1dabc82c792fbecd77c63a (diff)
downloadbuildroot-f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a.tar.gz
buildroot-f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a.tar.bz2
Merge branch 'linux-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
Conflicts: target/Makefile.in
Diffstat (limited to 'target/Makefile.in')
-rw-r--r--target/Makefile.in15
1 files changed, 0 insertions, 15 deletions
diff --git a/target/Makefile.in b/target/Makefile.in
index 83dc4a5a03..475cd6e5b4 100644
--- a/target/Makefile.in
+++ b/target/Makefile.in
@@ -1,6 +1,3 @@
-BR2_PACKAGE_LINUX_FORMAT:=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT))
-BR2_PACKAGE_LINUX_KCONFIG:=$(call qstrip,$(BR2_PACKAGE_LINUX_KCONFIG))
-
# make sure to put everything that is board-specific before the tarroot targets
include target/generic/Makefile.in
@@ -8,16 +5,4 @@ include target/generic/Makefile.in
include target/device/Makefile.in
include target/xtensa/Makefile.in
-# kernel rules
-# We already did add the kernel target to TARGETS and now just pull in the rules
-# to actually build this target.
-
-ifeq ($(BR2_KERNEL_LINUX),y)
-include target/linux/Makefile.in
-endif
-
-ifeq ($(BR2_KERNEL_LINUX_ADVANCED),y)
-include target/linux/Makefile.in.advanced
-endif
-
include target/device/Makefile.in.linux