Merge branch 'linux-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot

Conflicts:
	target/Makefile.in
This commit is contained in:
Peter Korsgaard
2010-06-22 23:43:08 +02:00
20 changed files with 383 additions and 1619 deletions

View File

@@ -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