diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-05-02 19:10:35 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-05-03 21:57:40 +0200 |
| commit | 4fb1d4b3e3eb58bc6207d50d2dcfac28ff3bab03 (patch) | |
| tree | b0454f411d6b4b90c33928b7af7129142e87df3c /boot/syslinux/syslinux.mk | |
| parent | 93be225d928cf659c7a2dffd9bb3ce165a1b50b5 (diff) | |
| download | buildroot-4fb1d4b3e3eb58bc6207d50d2dcfac28ff3bab03.tar.gz buildroot-4fb1d4b3e3eb58bc6207d50d2dcfac28ff3bab03.zip | |
boot/syslinux: add option to install the EFI image
syslinux can now also build an EFI application.
If the target is 64-bit, we build the 64-bit EFI app,
otherwise we build the 32-bit EFI app.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
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/syslinux.mk')
| -rw-r--r-- | boot/syslinux/syslinux.mk | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index 2c197df0cb..95ece52d3b 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -15,6 +15,20 @@ SYSLINUX_INSTALL_IMAGES = YES SYSLINUX_DEPENDENCIES = host-nasm host-util-linux host-upx +ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y) +SYSLINUX_TARGET = bios +endif + +ifeq ($(BR2_TARGET_SYSLINUX_EFI),y) +ifeq ($(BR2_ARCH_IS_64),y) +SYSLINUX_EFI_BITS = efi64 +else +SYSLINUX_EFI_BITS = efi32 +endif # 64-bit +SYSLINUX_DEPENDENCIES += gnu-efi +SYSLINUX_TARGET = $(SYSLINUX_EFI_BITS) +endif # EFI + # The syslinux tarball comes with pre-compiled binaries. # Since timestamps might not be in the correct order, a rebuild is # not always triggered for all the different images. @@ -30,7 +44,7 @@ SYSLINUX_POST_PATCH_HOOKS += SYSLINUX_CLEANUP # be used. define SYSLINUX_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" \ - AR="$(HOSTAR)" -C $(@D) bios + AR="$(HOSTAR)" SYSROOT=$(STAGING_DIR) -C $(@D) $(SYSLINUX_TARGET) endef # While the actual bootloader is compiled for the target, several @@ -40,12 +54,13 @@ endef # install time define SYSLINUX_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE1) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" \ - AR="$(HOSTAR)" INSTALLROOT=$(HOST_DIR) \ - -C $(@D) bios install + AR="$(HOSTAR)" SYSROOT=$(STAGING_DIR) INSTALLROOT=$(HOST_DIR) \ + -C $(@D) $(SYSLINUX_TARGET) install 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_EFI) += $(SYSLINUX_EFI_BITS)/efi/syslinux.efi define SYSLINUX_INSTALL_IMAGES_CMDS for i in $(SYSLINUX_IMAGES-y); do \ |
