From: Francesco Lavra <francescolavra.fl@gmail.com>
To: grub-devel@gnu.org
Subject: [PATCH]: Add EFI conditional
Date: Sat, 26 Jan 2013 20:42:42 +0100 [thread overview]
Message-ID: <510431B2.9010409@gmail.com> (raw)
This patch adds the automake conditional COND_efi, which is true for
every configuration using the EFI platform. This conditional is used in
grub-core/Makefile.am to remove some duplicated entries in
KERNEL_HEADER_FILES.
As the EFI platform is expected to be used in more architectures (work
is in progress to port GRUB to ARM using EFI), this patch will allow
not to have even more duplicated code in the future.
2013-01-26 Francesco Lavra <francescolavra.fl@gmail.com>
* configure.ac (COND_efi): New condition.
* grub-core/Makefile.am (KERNEL_HEADER_FILES): Add EFI files under
COND_efi and remove duplicated entries.
=== modified file 'configure.ac'
--- configure.ac 2013-01-12 13:30:37 +0000
+++ configure.ac 2013-01-26 19:33:43 +0000
@@ -1132,6 +1132,7 @@
#
AM_CONDITIONAL([COND_emu], [test x$platform = xemu])
+AM_CONDITIONAL([COND_efi], [test x$platform = xefi])
AM_CONDITIONAL([COND_i386_pc], [test x$target_cpu = xi386 -a x$platform = xpc])
AM_CONDITIONAL([COND_i386_efi], [test x$target_cpu = xi386 -a x$platform = xefi])
AM_CONDITIONAL([COND_ia64_efi], [test x$target_cpu = xia64 -a x$platform = xefi])
=== modified file 'grub-core/Makefile.am'
--- grub-core/Makefile.am 2012-10-12 13:04:02 +0000
+++ grub-core/Makefile.am 2013-01-26 19:38:28 +0000
@@ -102,8 +102,6 @@
endif
if COND_i386_efi
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
endif
@@ -132,17 +130,10 @@
endif
if COND_x86_64_efi
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
endif
-if COND_ia64_efi
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
-endif
-
if COND_mips
KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/kernel.h
endif
@@ -225,6 +216,11 @@
endif
endif
+if COND_efi
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+endif
+
symlist.h: $(top_builddir)/config.h $(KERNEL_HEADER_FILES)
@list='$^'; \
for p in $$list; do \
--
Francesco Lavra
next reply other threads:[~2013-01-26 19:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-26 19:42 Francesco Lavra [this message]
2013-01-27 15:20 ` [PATCH]: Add EFI conditional Vladimir 'φ-coder/phcoder' Serbinenko
2013-01-27 16:41 ` Francesco Lavra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=510431B2.9010409@gmail.com \
--to=francescolavra.fl@gmail.com \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.