Patchwork filo: trivial compilation fix and a remark about USB support

login
register
about
Submitter Aurélien
Date 2010-09-09 18:39:10
Message ID <AANLkTinUiNnk3RrYHusfzKMxZMcRGd2BW2GFYKpHEmwi@mail.gmail.com>
Download mbox | patch
Permalink /patch/1900/
State Accepted
Headers show

Comments

Aurélien - 2010-09-09 18:39:10
Hi,

Below is a trivial patch for filo. filo does not compile with the grub
interface right out of the SVN:

coreboot/payloads/filo/build/main/grub/completions.o: In function
`print_completions':
completions.c:(.text+0x2f2): undefined reference to `IS_PC_SLICE_TYPE_BSD'

This patch defines this macro to 0 (false), like what is done in
fs/filesys.h, which fixes the problem. However, this may not be the right
way to fix it. Please do check before applying.

---

I also have a remark about USB support in filo: The default configuration
for filo enables support for USB, although the default configuration for
libpayload does not. There's no harm done, since you have to configure both,
but it appears more logical to have USB disabled in both config. Anyways,
that's not really a problem :)

---

Signed-off-by: Aurelien Guillaume <aurelien@iwi.me>
Marc Jones - 2010-09-09 21:52:19
On Thu, Sep 9, 2010 at 12:39 PM, Aurélien <footplus@gmail.com> wrote:
> Hi,
> Below is a trivial patch for filo. filo does not compile with the grub
> interface right out of the SVN:
> coreboot/payloads/filo/build/main/grub/completions.o: In function
> `print_completions':
> completions.c:(.text+0x2f2): undefined reference to `IS_PC_SLICE_TYPE_BSD'
> This patch defines this macro to 0 (false), like what is done in
> fs/filesys.h, which fixes the problem. However, this may not be the right
> way to fix it. Please do check before applying.
> ---
> I also have a remark about USB support in filo: The default configuration
> for filo enables support for USB, although the default configuration for
> libpayload does not. There's no harm done, since you have to configure both,
> but it appears more logical to have USB disabled in both config. Anyways,
> that's not really a problem :)
> ---
> Signed-off-by: Aurelien Guillaume <aurelien@iwi.me>
> Index: main/grub/completions.c
> ===================================================================
> --- main/grub/completions.c (revision 138)
> +++ main/grub/completions.c (working copy)
> @@ -23,6 +23,7 @@
>  #include <config.h>
>  #include <grub/shared.h>
>  #define current_slice 0
> +#define IS_PC_SLICE_TYPE_BSD(type) 0
>
>  static int do_completion;
>  static int unique;
> --
> Aurélien Guillaume


We should check in a lipayload config into filo that matches the
default filo config.


Marc

Patch

Index: main/grub/completions.c
===================================================================
--- main/grub/completions.c (revision 138)
+++ main/grub/completions.c (working copy)
@@ -23,6 +23,7 @@ 
 #include <config.h>
 #include <grub/shared.h>
 #define current_slice 0
+#define IS_PC_SLICE_TYPE_BSD(type) 0

 static int do_completion;
 static int unique;