diff options
| -rw-r--r-- | platforms/grub.in | 5 | ||||
| -rw-r--r-- | rules/grub.make | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/platforms/grub.in b/platforms/grub.in index d70e770a3..e23fa6f92 100644 --- a/platforms/grub.in +++ b/platforms/grub.in @@ -4,11 +4,10 @@ menuconfig GRUB help Grub - The GRand Unified Bootloader -comment "Config Options" - depends on GRUB - if GRUB +comment "Config Options" + config GRUB_MENU_LST string prompt "menu.lst to install" diff --git a/rules/grub.make b/rules/grub.make index fcf171eab..a99bc2518 100644 --- a/rules/grub.make +++ b/rules/grub.make @@ -1,7 +1,6 @@ # -*-makefile-*- -# $Id$ # -# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany +# Copyright (C) 2002-2009 by Pengutronix e.K., Hildesheim, Germany # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -22,7 +21,6 @@ GRUB_URL := ftp://alpha.gnu.org/gnu/grub/$(GRUB).tar.gz GRUB_SOURCE := $(SRCDIR)/$(GRUB).tar.gz GRUB_DIR := $(BUILDDIR)/$(GRUB) - # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- @@ -43,11 +41,11 @@ GRUB_PATH := PATH=$(CROSS_PATH) GRUB_ENV := $(CROSS_ENV) CFLAGS='' -GRUB_AUTOCONF := $(CROSS_AUTOCONF_USR) \ - --without-curses -GRUB_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) -# FIXME FIXME FIXME -GRUB_AUTOCONF += --prefix=$(PTXCONF_SYSROOT_TARGET) +GRUB_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --without-curses \ + --target=$(PTXCONF_GNU_TARGET) \ + --prefix=$(PTXCONF_SYSROOT_TARGET) ifdef PTXCONF_GRUB_EXT2FS GRUB_AUTOCONF += --enable-ext2fs |