Commit b0d446de authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

Improve TARGETS handling for bootloaders and kernel 



As the kernel and bootloaders do not use the normal BR2_PACKAGE_*
Kconfig options, their target name was not automatically added to the
global TARGETS variable. Each bootloader .mk and the linux.mk had to
add their own target manually to TARGETS, and the package
infrastructure was making tests on non-existing Kconfig variables.

This commit improves the package infrastructure so that it looks at
BR2_PACKAGE_<pkg> for packages, BR2_TARGET_<pkg> for bootloaders and
at the special BR2_LINUX_KERNEL for the linux package.

This allows to simplify a little bit the bootloaders and linux .mk
files.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent a4ca9593

boot/at91bootstrap/at91bootstrap.mk

+0 −8
Original line number Diff line number Diff line
@@ -31,19 +31,11 @@ endef 


$(eval $(call GENTARGETS,boot,at91bootstrap))



#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)

TARGETS+=at91bootstrap



# we NEED a board name unless we're at make source

ifeq ($(filter source,$(MAKECMDGOALS)),)

ifeq ($(AT91BOOTSTRAP_BOARD),)

$(error No AT91Bootstrap board name set. Check your BR2_TARGET_AT91BOOTSTRAP_BOARD setting)

endif

endif



endif

boot/at91dataflashboot/at91dataflashboot.mk

+0 −9
Original line number Diff line number Diff line
@@ -20,12 +20,3 @@ define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS 
endef



$(eval $(call GENTARGETS,boot,at91dataflashboot))
 


#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_TARGET_AT91DATAFLASHBOOT),y)

TARGETS+=at91dataflashboot

endif

boot/barebox/barebox.mk

+0 −3
Original line number Diff line number Diff line
@@ -54,13 +54,10 @@ endif 
$(eval $(call GENTARGETS,boot,barebox))



ifeq ($(BR2_TARGET_BAREBOX),y)

TARGETS+=barebox



# we NEED a board defconfig file unless we're at make source

ifeq ($(filter source,$(MAKECMDGOALS)),)

ifeq ($(BAREBOX_BOARD_DEFCONFIG),)

$(error No Barebox defconfig file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG setting)

endif

endif



endif

boot/grub/grub.mk

+0 −9
Original line number Diff line number Diff line
@@ -83,12 +83,3 @@ define GRUB_UNINSTALL_TARGET_CMDS 
endef



$(eval $(call AUTOTARGETS,boot,grub))
 


#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_TARGET_GRUB),y)

TARGETS+=grub

endif

boot/syslinux/syslinux.mk

+0 −9
Original line number Diff line number Diff line
@@ -27,12 +27,3 @@ define SYSLINUX_INSTALL_IMAGES_CMDS 
endef



$(eval $(call GENTARGETS,boot,syslinux))
 


#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_TARGET_SYSLINUX),y)

TARGETS+=syslinux

endif