From 649b5b92509dba021ed47ef4c04f358de83ba36f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 14 Mar 2010 18:20:45 +0100 Subject: bootloaders: move bootloader build code to boot/ Signed-off-by: Thomas Petazzoni --- boot/Config.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 boot/Config.in (limited to 'boot/Config.in') diff --git a/boot/Config.in b/boot/Config.in new file mode 100644 index 000000000..6f2796f0c --- /dev/null +++ b/boot/Config.in @@ -0,0 +1,12 @@ +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 + -- cgit v1.2.3 From afd77256c9914663af7684792051fee74c610fb9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 24 Mar 2010 22:37:40 +0100 Subject: yaboot: drop support Yaboot does not build, hasn't been updated since a long time, and isn't very common these days on embedded PowerPC platforms. Signed-off-by: Thomas Petazzoni --- boot/Config.in | 1 - boot/yaboot/Config.in | 5 ----- boot/yaboot/yaboot.mk | 44 -------------------------------------------- 3 files changed, 50 deletions(-) delete mode 100644 boot/yaboot/Config.in delete mode 100644 boot/yaboot/yaboot.mk (limited to 'boot/Config.in') diff --git a/boot/Config.in b/boot/Config.in index 6f2796f0c..78ff82c96 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -3,7 +3,6 @@ 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" diff --git a/boot/yaboot/Config.in b/boot/yaboot/Config.in deleted file mode 100644 index 75da815ab..000000000 --- a/boot/yaboot/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_TARGET_YABOOT - bool "yaboot" - depends on BR2_powerpc - help - The yaboot bootloader for new world powerpc systems. diff --git a/boot/yaboot/yaboot.mk b/boot/yaboot/yaboot.mk deleted file mode 100644 index cbeae5086..000000000 --- a/boot/yaboot/yaboot.mk +++ /dev/null @@ -1,44 +0,0 @@ -ifeq ($(ARCH),powerpc) - -############################################################# -# -# yaboot -# -############################################################# - -YABOOT_SOURCE:=yaboot-1.3.13.tar.gz -YABOOT_SITE:=http://penguinppc.org/bootloaders/yaboot -YABOOT_DIR:=$(BUILD_DIR)/yaboot-1.3.13 - -$(DL_DIR)/$(YABOOT_SOURCE): - $(call DOWNLOAD,$(YABOOT_SITE),$(YABOOT_SOURCE)) - -yaboot-source: $(DL_DIR)/$(YABOOT_SOURCE) - -$(YABOOT_DIR)/Makefile: $(DL_DIR)/$(YABOOT_SOURCE) - $(ZCAT) $(DL_DIR)/$(YABOOT_SOURCE) | tar -C $(BUILD_DIR) -xvf - - touch -c $(YABOOT_DIR)/Makefile - -$(YABOOT_DIR)/second/yaboot: $(YABOOT_DIR)/Makefile - $(MAKE) -C $(YABOOT_DIR) CROSS=$(TARGET_CROSS) - touch -c $(YABOOT_DIR)/second/yaboot - -yaboot: $(YABOOT_DIR)/second/yaboot - -yaboot-clean: - $(MAKE) -C $(YABOOT_DIR) clean - -yaboot-dirclean: - rm -rf $(YABOOT_DIR) - -endif - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_TARGET_YABOOT),y) -TARGETS+=yaboot -endif - -- cgit v1.2.3 From 6cc9d936a978d558211a0553ba3cdf9113ab9c96 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 30 May 2010 22:46:45 +0200 Subject: Add support for the Barebox bootloader Signed-off-by: Thomas Petazzoni --- boot/Config.in | 1 + boot/barebox/Config.in | 14 ++++++++++++ boot/barebox/barebox.mk | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 boot/barebox/Config.in create mode 100644 boot/barebox/barebox.mk (limited to 'boot/Config.in') diff --git a/boot/Config.in b/boot/Config.in index 78ff82c96..6bcc98af5 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -1,5 +1,6 @@ menu "Bootloaders" +source "boot/barebox/Config.in" source "boot/grub/Config.in" source "boot/grub2/Config.in" source "boot/syslinux/Config.in" diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in new file mode 100644 index 000000000..0c90f0382 --- /dev/null +++ b/boot/barebox/Config.in @@ -0,0 +1,14 @@ +menuconfig BR2_TARGET_BAREBOX + bool "Barebox" + help + The Barebox bootloader, formerly known as U-Boot v2. + + http://www.barebox.org + +if BR2_TARGET_BAREBOX +config BR2_TARGET_BAREBOX_BOARD_DEFCONFIG + string "board defconfig" + help + Name of the board for which Barebox should be built, without + the _defconfig suffix. +endif diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk new file mode 100644 index 000000000..7c2cbc123 --- /dev/null +++ b/boot/barebox/barebox.mk @@ -0,0 +1,61 @@ +############################################################# +# +# Barebox +# +############################################################# + +BAREBOX_VERSION:=2010.05.0 +BAREBOX_SOURCE:=barebox-$(BAREBOX_VERSION).tar.bz2 +BAREBOX_SITE:=http://www.barebox.org/download/ +BAREBOX_DIR:=$(BUILD_DIR)/barebox-$(BAREBOX_VERSION) +BAREBOX_CAT:=$(BZCAT) +BAREBOX_BOARD_DEFCONFIG:=$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG)) + +ifeq ($(KERNEL_ARCH),i386) +BAREBOX_ARCH=x86 +else ifeq ($(KERNEL_ARCH),powerpc) +BAREBOX_ARCH=ppc +else +BAREBOX_ARCH=$(KERNEL_ARCH) +endif + +BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE=$(TARGET_CROSS) + +$(DL_DIR)/$(BAREBOX_SOURCE): + $(call DOWNLOAD,$(BAREBOX_SITE),$(BAREBOX_SOURCE)) + +$(BAREBOX_DIR)/.unpacked: $(DL_DIR)/$(BAREBOX_SOURCE) + mkdir -p $(@D) + $(INFLATE$(suffix $(BAREBOX_SOURCE))) $(DL_DIR)/$(BAREBOX_SOURCE) \ + | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - + touch $@ + +$(BAREBOX_DIR)/.patched: $(BAREBOX_DIR)/.unpacked + toolchain/patch-kernel.sh $(BAREBOX_DIR) boot/barebox \ + barebox-$(BAREBOX_VERSION)-\*.patch \ + barebox-$(BAREBOX_VERSION)-\*.patch.$(ARCH) + touch $@ + +$(BAREBOX_DIR)/.configured: $(BAREBOX_DIR)/.patched + $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) $(BAREBOX_BOARD_DEFCONFIG)_defconfig + touch $@ + +$(BAREBOX_DIR)/.built: $(BAREBOX_DIR)/.configured + $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) + touch $@ + +$(BAREBOX_DIR)/.installed: $(BAREBOX_DIR)/.built + cp $(BAREBOX_DIR)/barebox.bin $(BINARIES_DIR) + touch $@ + +barebox: $(BAREBOX_DIR)/.installed + +ifeq ($(BR2_TARGET_BAREBOX),y) +TARGETS+=barebox + +# we NEED a board defconfig file +ifeq ($(BAREBOX_BOARD_DEFCONFIG),) +$(error No Barebox defconfig file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG setting) +endif + +endif -- cgit v1.2.3