Commit 649b5b92 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

bootloaders: move bootloader build code to boot/ 



Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 7c709f4a

Config.in

+2 −0
Original line number Diff line number Diff line
@@ -293,4 +293,6 @@ source "package/Config.in" 


source "fs/Config.in"



source "boot/Config.in"



source "target/Config.in"

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -320,8 +320,9 @@ ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) 
TARGETS+=target-purgelocales

endif



# target stuff is last so it can override anything else

include boot/common.mk

include target/Makefile.in

include fs/common.mk



TARGETS+=erase-fakeroots

boot/Config.in

0 → 100644
+12 −0
Original line number Diff line number Diff line 
menu "Bootloaders"



source "boot/grub/Config.in"

source "boot/grub2/Config.in"

source "boot/syslinux/Config.in"

source "boot/yaboot/Config.in"

source "boot/u-boot/Config.in"

source "boot/at91bootstrap/Config.in"

source "boot/at91dataflashboot/Config.in"



endmenu

target/device/Atmel/at91bootstrap/Config.in→boot/at91bootstrap/Config.in

+2 −3
Original line number Diff line number Diff line 
menuconfig BR2_TARGET_AT91BOOTSTRAP

	depends on BR2_TARGET_AT91SAM9260EK || BR2_TARGET_AT91SAM9260DFC || BR2_TARGET_AT91SAM9260PF || \

	BR2_TARGET_AT91SAM9261EK || BR2_TARGET_AT91SAM9263EK || BR2_TARGET_AT91SAM9XEEK || BR2_TARGET_AT91SAM9G20DFC

	bool "Build AT91 Bootstrap for selected chip"

	depends on BR2_arm

	bool "AT91 Bootstrap"



if	BR2_TARGET_AT91BOOTSTRAP

target/device/Atmel/at91bootstrap/at91bootstrap.mk→boot/at91bootstrap/at91bootstrap.mk

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE): 
$(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)

	mkdir -p $(BUILD_DIR)

	$(AT91BOOTSTRAP_ZCAT) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch

	toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) boot/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch

	touch $(AT91BOOTSTRAP_DIR)/.unpacked



$(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config