summaryrefslogtreecommitdiff
path: root/boot/syslinux
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2014-05-02 19:10:36 +0200
committerPeter Korsgaard <peter@korsgaard.com>2014-05-03 22:00:00 +0200
commit6cdb0c4935cebb2d544013f33aa92df430144657 (patch)
tree66d3796b56d633973d5d0e4f63b04b6978567e27 /boot/syslinux
parent4fb1d4b3e3eb58bc6207d50d2dcfac28ff3bab03 (diff)
boot/syslinux: add an option to install a MBR blob
This MBR blob will look for an active partition, and boot the bootcode present in that partition. This can be used to boot an extlinux-prepared partition. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Lundquist <lists@zelow.no> Cc: Frank Hunleth <fhunleth@troodon-software.com> Tested-by: Frank Hunleth <fhunleth@troodon-software.com> Tested-by: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'boot/syslinux')
-rw-r--r--boot/syslinux/Config.in8
-rw-r--r--boot/syslinux/syslinux.mk1
2 files changed, 9 insertions, 0 deletions
diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
index 5f0fe978f..28c5329ca 100644
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -30,6 +30,14 @@ config BR2_TARGET_SYSLINUX_PXELINUX
Install the legacy-BIOS 'pxelinux' image, to boot off
the network using PXE.
+config BR2_TARGET_SYSLINUX_MBR
+ bool "mbr"
+ select BR2_TARGET_SYSLINUX_LEGACY_BIOS
+ help
+ Install the legacy-BIOS 'mbr' image, to boot off a
+ local MBR-partition (e.g. prepared with 'extlinux'
+ or 'syslinux').
+
config BR2_TARGET_SYSLINUX_EFI
bool "efi"
select BR2_PACKAGE_GNU_EFI
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 95ece52d3..5432d0ac3 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -60,6 +60,7 @@ endef
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += bios/core/isolinux.bin
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += bios/core/pxelinux.bin
+SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_MBR) += bios/mbr/mbr.bin
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_EFI) += $(SYSLINUX_EFI_BITS)/efi/syslinux.efi
define SYSLINUX_INSTALL_IMAGES_CMDS