[Buildroot] [PATCH 9/9] boot/syslinux: add an option to install an MBR blob

[Arnout Vandecappelle <arnout@mind.be>]

On 25/04/14 00:30, Yann E. MORIN wrote:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> 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>
> ---
>  boot/syslinux/Config.in   | 13 ++++++++++++-
>  boot/syslinux/syslinux.mk |  1 +
>  2 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
> index d556c55..7d4dd08 100644
> --- a/boot/syslinux/Config.in
> +++ b/boot/syslinux/Config.in
> @@ -15,7 +15,7 @@ choice
>  
>  config BR2_TARGET_SYSLINUX_LEGACY_BIOS
>  	bool "bios (legacy)"
> -	select BR2_TARGET_SYSLINUX_ISOLINUX if !BR2_TARGET_SYSLINUX_PXELINUX
> +	select BR2_TARGET_SYSLINUX_ISOLINUX if !BR2_TARGET_SYSLINUX_HAS_BIOS_IMG

 Hm, I don't really like this very much. Adding complexity like this for
behaviour which is not even really perfect...

 Maybe we should just have

comment "please select one or more images to generate"

config BR2_TARGET_SYSLINUX_ISOLINUX

config BR2_TARGET_SYSLINUX_PXELINUX

config BR2_TARGET_SYSLINUX_MBR


and drop all checking. I mean, if the user selects syslinux I guess he'll
be smart enough to also select the actual tool(s) he needs. It's like
util-linux: if you just select the package without selecting anything
else, you'll also just end up with nothing. And I've never heard anyone
complain about that. Let's keep things simple.

 Peter, judgement call on this one?


 Note: this invalidates my comments on 3/9, of course.


>  	help
>  	  Install one or more of the the legacy BIOS images:
>  	    - isolinux
> @@ -31,6 +31,9 @@ endchoice
>  
>  if BR2_TARGET_SYSLINUX_LEGACY_BIOS
>  
> +config BR2_TARGET_SYSLINUX_HAS_BIOS_IMG
> +	bool
> +
>  config BR2_TARGET_SYSLINUX_ISOLINUX
>  	bool "isolinux"
>  	default y
> @@ -40,10 +43,18 @@ config BR2_TARGET_SYSLINUX_ISOLINUX
>  
>  config BR2_TARGET_SYSLINUX_PXELINUX
>  	bool "pxelinux"
> +	select BR2_TARGET_SYSLINUX_HAS_BIOS_IMG
>  	help
>  	  Install the legacy BIOS 'pxelinux' image, to boot off
>  	  the network using PXE.
>  
> +config BR2_TARGET_SYSLINUX_MBR
> +	bool "mbr"
> +	select BR2_TARGET_SYSLINUX_HAS_BIOS_IMG
> +	help
> +	  Install the legacy BIOS 'mbr' image, to boot off a

 See my comment in 4/9 about "legacy".


 BTW, while you're at it, perhaps you can add options for syslinux (=fat)
and extlinux?


 Regards,
 Arnout

> +	  local MBR-partition.
> +
>  endif # BR2_TARGET_SYSLINUX_LEGACY_BIOS
>  
>  endif # BR2_TARGET_SYSLINUX
> diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
> index bf0bae5..c614b1d 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
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F