[coreboot-gerrit] Patch set updated for filo: Rename Config.in to Kconfig

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Tue Jul 7 22:57:34 CEST 2015


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10746

-gerrit

commit 7240ee342322fd7dea63bb92790dccaa92a16fd4
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Tue Jun 30 17:05:02 2015 -0700

    Rename Config.in to Kconfig
    
    This is the standard name for all other Kconfig based
    projects surrounding coreboot. Let's adopt this in FILO, too.
    
    Change-Id: I6366468bd127485cc6f5fdbba216b55a593e062a
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 Config.in             | 382 --------------------------------------------------
 Kconfig               | 382 ++++++++++++++++++++++++++++++++++++++++++++++++++
 util/kconfig/Makefile |   2 +-
 3 files changed, 383 insertions(+), 383 deletions(-)

diff --git a/Config.in b/Config.in
deleted file mode 100644
index cc48bd3..0000000
--- a/Config.in
+++ /dev/null
@@ -1,382 +0,0 @@
-##
-## Copyright (C) 2008-2009 coresystems GmbH
-##
-
-mainmenu "FILO Configuration"
-
-# When (if) we support multiple architectures, this will become an option.
-config TARGET_I386
-	bool
-	default y
-
-config MULTIBOOT_IMAGE
-	bool "Include a MultiBoot header"
-	default y
-	help
-	  Including a MultiBoot header makes FILO chainloadable by MultiBoot
-	  compliant boot loaders like GRUB.
-
-menu "Interface Options"
-
-config USE_GRUB
-	bool "Use GRUB like interface"
-	default y
-	help
-	  Use GRUB legacy like interface instead of autoboot?
-
-config NON_INTERACTIVE
-	bool "non-interactive interface"
-	default n
-	help
-	  Build a non-interactive interface to disallow modifications of
-	  the boot options, e.g. the kernel to load or the command line.
-
-config PROMPT
-	string "Command line prompt"
-	default "filo"
-	depends on USE_GRUB
-	help
-	  Per default, the FILO shell comes up with the prompt
-	    filo>
-	  If you want better GRUB compatibility (ie to pass through
-	  your automated test system, specify 'grub' here instead of
-	  'filo' to get a prompt of
-	    grub>
-
-config MENULST_FILE
-	string "GRUB menu.lst filename"
-	default "hda3:/boot/filo/menu.lst"
-	depends on USE_GRUB
-	help
-	  For VIA Epia-MII CF use:
-	    hde1:/boot/filo/menu.lst
-	
-config MENULST_TIMEOUT
-	int "Timeout for loading menu.lst"
-	default 0
-	depends on USE_GRUB
-	help
-	  Set to 0 to ignore
-
-config USE_MD5_PASSWORDS
-	bool "Use MD5 passwords in menu.lst?"
-	default y
-	depends on USE_GRUB
-	help
-	  Enable this option if your menu.lst passwords are MD5 encrypted.
-
-config USE_AUTOBOOT
-	bool "Autoboot a command line after timeout?"
-	depends on !USE_GRUB
-	default y
-
-config AUTOBOOT_FILE
-	string "Kernel filename and parameters"
-	default "hda1:/vmlinuz root=/dev/hda1 console=tty0 console=ttyS0,115200"
-	depends on !USE_GRUB
-	depends on USE_AUTOBOOT
-	help
-	  #AUTOBOOT_FILE = "mem at 0xfff80000"
-	  #AUTOBOOT_FILE = "hde1 at 0"
-	  #AUTOBOOT_FILE = "uda1:/vmlinuz.elf"
-	  #AUTOBOOT_FILE = "flashb at 0x00400000,0x154a00 console=tty0 console=ttyS0,115200"
-
-config AUTOBOOT_DELAY
-	int "Time in seconds before booting"
-	default 2
-	depends on !USE_GRUB
-	depends on USE_AUTOBOOT
-	help
-	  Time in second before booting AUTOBOOT_FILE
-
-config ISOLINUX_PARSER
-	bool "Support for parsing isolinux.cfg config files"
-	default n
-	depends on USE_GRUB
-	help
-	  If you enable this function, FILO will be able to parse isolinux.cfg
-	  config files in addition to filo.lst/menu.lst files.
-
-endmenu
-
-menu "Drivers"
-
-config IDE_DISK
-	bool "IDE DISK support"
-	default y
-	help
-	  Driver for hard disk, CompactFlash, and CD-ROM on IDE bus
-
-config IDE_DISK_POLL_DELAY
-	int "IDE disk poll delay"
-	default 0
-	depends on IDE_DISK
-	help
-	  Add a short delay when polling status registers 
-	  (required on some broken SATA controllers)
-	  NOTE: Slows down access significantly, so disable 
-	  whenever possible. Set to 1 if you require this.
-
-config SLOW_SATA
-	bool "Extra delay for SATA"
-	default n
-	depends on IDE_DISK
-	help
-	  SATA drives seem to have problems reporting their spinup.
-	  This will delay FILO start by 5s so the disks have some time to settle.
-	  (required on some broken SATA controllers)
-	  NOTE: Slows down access significantly, so disable 
-	  whenever possible.
-
-config PCMCIA_CF
-	bool "PCMCIA CF (Epia) support"
-	default n
-	depends on IDE_DISK
-	help
-	  Use PCMCIA compact flash on Via Epia MII10000 and MII6000E
-	  This device is referred to as hde.
-
-config IDE_NEW_DISK
-	bool "New IDE driver"
-	default n
-	depends on !IDE_DISK
-	help
-	  Jens Axboe's fine IDE driver
-
-config LIBPAYLOAD_STORAGE
-	bool "Use libpayload's storage drivers"
-	default n
-	help
-	  If selected, libpayloads storage drivers will be used to access
-	  hard disk and optical drives.
-
-config USB_DISK
-	bool "USB Stack"
-	default y
-	help
-	  Driver for USB Storage
-
-config FLASH_DISK
-	bool "NAND Flash support"
-	default n
-	help
-	  Driver for Geode NAND flash storage
-
-config SUPPORT_PCI
-	bool "PCI support"
-	default y
-
-config PCI_BRUTE_SCAN
-	bool "Scan all PCI busses"
-	default n
-	depends on SUPPORT_PCI
-	help
-	  Enable this to scan PCI busses above bus 0
-	  AMD64 based boards do need this.
-
-config SUPPORT_SOUND
-	bool "Sound Support"
-	default n
-	depends on SUPPORT_PCI
-
-config VIA_SOUND
-	bool "VIA sound"
-	default n
-	depends on SUPPORT_SOUND
-
-config FLASHROM_LOCKDOWN
-	bool "Flash memory lockdown"
-	default n
-	help
-	  Enable system flash memory write protections and lock them down prior
-	  starting the kernel. Flash memory lockdown can be disabled per boot
-	  entry with the new command 'flashrom_unlock'.
-
-	  NOTE: Only supported on selected hardware:
-
-	        o Intel ICH7 (FWH)
-	        o Intel ICH9 (FWH + SPI)
-	        o Intel Cougar Point / Panther Point PCH (FWH + SPI)
-	        o AMD SB600 (SPI by locking the flash chip itself)
-
-endmenu
-
-menu "Filesystems"
-
-config FSYS_EXT2FS
-	bool "EXT2 filesystem"
-	default y
-
-config FSYS_FAT
-	bool "FAT (MSDOS) filesystem"
-	default y
-
-config FSYS_JFS
-	bool "JFS"
-	default n
-
-config FSYS_MINIX
-	bool "Minix filesystem"
-	default n
-
-config FSYS_REISERFS
-	bool "ReiserFS"
-	default y
-
-config FSYS_XFS
-	bool "XFS"
-	default n
-
-config FSYS_ISO9660
-	bool "ISO9660 filesystem"
-	default y
-
-config ELTORITO
-	bool "El Torito bootable CDROMs"
-	default y
-	depends on FSYS_ISO9660
-	help
-	  Support for boot disk image in bootable CD-ROM (El Torito)
-
-config FSYS_CRAMFS
-	bool "Compressed RAM filesystem (CRAMFS)"
-	default n
-
-config FSYS_SQUASHFS
-	bool "Squash filesystem"
-	default n
-
-config FSYS_CBFS
-	bool "CBFS ROM Image filesystem"
-	default y
-
-endmenu
-
-menu "Loaders"
-
-config LINUX_LOADER
-	bool "Standard Linux Loader"
-	default y
-	depends on TARGET_I386
-	help
-	  Loader for standard Linux kernel image, a.k.a. /vmlinuz
-
-config WINCE_LOADER
-	bool "Windows CE Loader"
-	default n
-	depends on TARGET_I386
-	help
-	  Loader for Windows CE image
-
-config ARTEC_BOOT
-	bool "Artec Loader"
-	default n
-	depends on TARGET_I386
-	help
-	  Artecboot Loader Support
-
-endmenu
-
-menu "Debugging & Experimental"
-
-config EXPERIMENTAL
-	bool "Enable experimental features"
-	default n
-	help
-	  Select this option to enable experimental code. This may
-	  cause FILO to stop compiling. Enable if you wish to develop
-	  for FILO.
-
-config DEBUG_ALL
-	bool "DEBUG_ALL"
-	select DEBUG_ELFBOOT
-	select DEBUG_SEGMENT
-	select DEBUG_SYS_INFO
-	select DEBUG_BLOCKDEV
-	select DEBUG_VFS
-	select DEBUG_FSYS_EXT2FS
-	select DEBUG_PCI
-	select DEBUG_VIA_SOUND
-	select DEBUG_LINUXLOAD
-	select DEBUG_IDE
-	select DEBUG_USB
-	select DEBUG_ELTORITO
-	select DEBUG_FLASH
-	select DEBUG_ARTECBOOT
-	default n
-
-config DEBUG_ELFBOOT
-	bool "DEBUG_ELFBOOT"
-	default n
-
-config DEBUG_SEGMENT
-	bool "DEBUG_SEGMENT"
-	default n
-
-config DEBUG_SYS_INFO
-	bool "DEBUG_SYS_INFO"
-	default n
-
-config DEBUG_BLOCKDEV
-	bool "DEBUG_BLOCKDEV"
-	default n
-
-config DEBUG_VFS
-	bool "DEBUG_VFS"
-	default n
-
-config DEBUG_FSYS_EXT2FS
-	bool "DEBUG_FSYS_EXT2FS"
-	depends on FSYS_EXT2FS
-	default n
-
-config DEBUG_PCI
-	bool "DEBUG_PCI"
-	depends on SUPPORT_PCI
-	default n
-
-config DEBUG_VIA_SOUND
-	bool "DEBUG_VIA_SOUND"
-	depends on VIA_SOUND
-	default n
-
-config DEBUG_LINUXLOAD
-	bool "DEBUG_LINUXLOAD"
-	depends on LINUX_LOADER
-	default n
-
-config DEBUG_IDE
-	bool "DEBUG_IDE"
-	depends on IDE_DISK||IDE_NEW_DISK
-	default n
-
-config DEBUG_USB
-	bool "DEBUG_USB"
-	depends on USB_DISK
-	default n
-
-config DEBUG_ELTORITO
-	bool "DEBUG_ELTORITO"
-	depends on ELTORITO
-	default n
-
-config DEBUG_FLASH
-	bool "DEBUG_FLASH"
-	depends on FLASH_DISK
-	default n
-
-config DEBUG_ARTECBOOT
-	bool "DEBUG_ARTECBOOT"
-	depends on ARTEC_BOOT
-	default n
-
-config DEVELOPER_TOOLS
-	bool "Developer Tools"
-	depends on USE_GRUB
-	default y
-	help
-	  Add commands useful for hardware development to the GRUB
-	  interface. These are lspci, setpci, io.
-
-endmenu
-
diff --git a/Kconfig b/Kconfig
new file mode 100644
index 0000000..cc48bd3
--- /dev/null
+++ b/Kconfig
@@ -0,0 +1,382 @@
+##
+## Copyright (C) 2008-2009 coresystems GmbH
+##
+
+mainmenu "FILO Configuration"
+
+# When (if) we support multiple architectures, this will become an option.
+config TARGET_I386
+	bool
+	default y
+
+config MULTIBOOT_IMAGE
+	bool "Include a MultiBoot header"
+	default y
+	help
+	  Including a MultiBoot header makes FILO chainloadable by MultiBoot
+	  compliant boot loaders like GRUB.
+
+menu "Interface Options"
+
+config USE_GRUB
+	bool "Use GRUB like interface"
+	default y
+	help
+	  Use GRUB legacy like interface instead of autoboot?
+
+config NON_INTERACTIVE
+	bool "non-interactive interface"
+	default n
+	help
+	  Build a non-interactive interface to disallow modifications of
+	  the boot options, e.g. the kernel to load or the command line.
+
+config PROMPT
+	string "Command line prompt"
+	default "filo"
+	depends on USE_GRUB
+	help
+	  Per default, the FILO shell comes up with the prompt
+	    filo>
+	  If you want better GRUB compatibility (ie to pass through
+	  your automated test system, specify 'grub' here instead of
+	  'filo' to get a prompt of
+	    grub>
+
+config MENULST_FILE
+	string "GRUB menu.lst filename"
+	default "hda3:/boot/filo/menu.lst"
+	depends on USE_GRUB
+	help
+	  For VIA Epia-MII CF use:
+	    hde1:/boot/filo/menu.lst
+	
+config MENULST_TIMEOUT
+	int "Timeout for loading menu.lst"
+	default 0
+	depends on USE_GRUB
+	help
+	  Set to 0 to ignore
+
+config USE_MD5_PASSWORDS
+	bool "Use MD5 passwords in menu.lst?"
+	default y
+	depends on USE_GRUB
+	help
+	  Enable this option if your menu.lst passwords are MD5 encrypted.
+
+config USE_AUTOBOOT
+	bool "Autoboot a command line after timeout?"
+	depends on !USE_GRUB
+	default y
+
+config AUTOBOOT_FILE
+	string "Kernel filename and parameters"
+	default "hda1:/vmlinuz root=/dev/hda1 console=tty0 console=ttyS0,115200"
+	depends on !USE_GRUB
+	depends on USE_AUTOBOOT
+	help
+	  #AUTOBOOT_FILE = "mem at 0xfff80000"
+	  #AUTOBOOT_FILE = "hde1 at 0"
+	  #AUTOBOOT_FILE = "uda1:/vmlinuz.elf"
+	  #AUTOBOOT_FILE = "flashb at 0x00400000,0x154a00 console=tty0 console=ttyS0,115200"
+
+config AUTOBOOT_DELAY
+	int "Time in seconds before booting"
+	default 2
+	depends on !USE_GRUB
+	depends on USE_AUTOBOOT
+	help
+	  Time in second before booting AUTOBOOT_FILE
+
+config ISOLINUX_PARSER
+	bool "Support for parsing isolinux.cfg config files"
+	default n
+	depends on USE_GRUB
+	help
+	  If you enable this function, FILO will be able to parse isolinux.cfg
+	  config files in addition to filo.lst/menu.lst files.
+
+endmenu
+
+menu "Drivers"
+
+config IDE_DISK
+	bool "IDE DISK support"
+	default y
+	help
+	  Driver for hard disk, CompactFlash, and CD-ROM on IDE bus
+
+config IDE_DISK_POLL_DELAY
+	int "IDE disk poll delay"
+	default 0
+	depends on IDE_DISK
+	help
+	  Add a short delay when polling status registers 
+	  (required on some broken SATA controllers)
+	  NOTE: Slows down access significantly, so disable 
+	  whenever possible. Set to 1 if you require this.
+
+config SLOW_SATA
+	bool "Extra delay for SATA"
+	default n
+	depends on IDE_DISK
+	help
+	  SATA drives seem to have problems reporting their spinup.
+	  This will delay FILO start by 5s so the disks have some time to settle.
+	  (required on some broken SATA controllers)
+	  NOTE: Slows down access significantly, so disable 
+	  whenever possible.
+
+config PCMCIA_CF
+	bool "PCMCIA CF (Epia) support"
+	default n
+	depends on IDE_DISK
+	help
+	  Use PCMCIA compact flash on Via Epia MII10000 and MII6000E
+	  This device is referred to as hde.
+
+config IDE_NEW_DISK
+	bool "New IDE driver"
+	default n
+	depends on !IDE_DISK
+	help
+	  Jens Axboe's fine IDE driver
+
+config LIBPAYLOAD_STORAGE
+	bool "Use libpayload's storage drivers"
+	default n
+	help
+	  If selected, libpayloads storage drivers will be used to access
+	  hard disk and optical drives.
+
+config USB_DISK
+	bool "USB Stack"
+	default y
+	help
+	  Driver for USB Storage
+
+config FLASH_DISK
+	bool "NAND Flash support"
+	default n
+	help
+	  Driver for Geode NAND flash storage
+
+config SUPPORT_PCI
+	bool "PCI support"
+	default y
+
+config PCI_BRUTE_SCAN
+	bool "Scan all PCI busses"
+	default n
+	depends on SUPPORT_PCI
+	help
+	  Enable this to scan PCI busses above bus 0
+	  AMD64 based boards do need this.
+
+config SUPPORT_SOUND
+	bool "Sound Support"
+	default n
+	depends on SUPPORT_PCI
+
+config VIA_SOUND
+	bool "VIA sound"
+	default n
+	depends on SUPPORT_SOUND
+
+config FLASHROM_LOCKDOWN
+	bool "Flash memory lockdown"
+	default n
+	help
+	  Enable system flash memory write protections and lock them down prior
+	  starting the kernel. Flash memory lockdown can be disabled per boot
+	  entry with the new command 'flashrom_unlock'.
+
+	  NOTE: Only supported on selected hardware:
+
+	        o Intel ICH7 (FWH)
+	        o Intel ICH9 (FWH + SPI)
+	        o Intel Cougar Point / Panther Point PCH (FWH + SPI)
+	        o AMD SB600 (SPI by locking the flash chip itself)
+
+endmenu
+
+menu "Filesystems"
+
+config FSYS_EXT2FS
+	bool "EXT2 filesystem"
+	default y
+
+config FSYS_FAT
+	bool "FAT (MSDOS) filesystem"
+	default y
+
+config FSYS_JFS
+	bool "JFS"
+	default n
+
+config FSYS_MINIX
+	bool "Minix filesystem"
+	default n
+
+config FSYS_REISERFS
+	bool "ReiserFS"
+	default y
+
+config FSYS_XFS
+	bool "XFS"
+	default n
+
+config FSYS_ISO9660
+	bool "ISO9660 filesystem"
+	default y
+
+config ELTORITO
+	bool "El Torito bootable CDROMs"
+	default y
+	depends on FSYS_ISO9660
+	help
+	  Support for boot disk image in bootable CD-ROM (El Torito)
+
+config FSYS_CRAMFS
+	bool "Compressed RAM filesystem (CRAMFS)"
+	default n
+
+config FSYS_SQUASHFS
+	bool "Squash filesystem"
+	default n
+
+config FSYS_CBFS
+	bool "CBFS ROM Image filesystem"
+	default y
+
+endmenu
+
+menu "Loaders"
+
+config LINUX_LOADER
+	bool "Standard Linux Loader"
+	default y
+	depends on TARGET_I386
+	help
+	  Loader for standard Linux kernel image, a.k.a. /vmlinuz
+
+config WINCE_LOADER
+	bool "Windows CE Loader"
+	default n
+	depends on TARGET_I386
+	help
+	  Loader for Windows CE image
+
+config ARTEC_BOOT
+	bool "Artec Loader"
+	default n
+	depends on TARGET_I386
+	help
+	  Artecboot Loader Support
+
+endmenu
+
+menu "Debugging & Experimental"
+
+config EXPERIMENTAL
+	bool "Enable experimental features"
+	default n
+	help
+	  Select this option to enable experimental code. This may
+	  cause FILO to stop compiling. Enable if you wish to develop
+	  for FILO.
+
+config DEBUG_ALL
+	bool "DEBUG_ALL"
+	select DEBUG_ELFBOOT
+	select DEBUG_SEGMENT
+	select DEBUG_SYS_INFO
+	select DEBUG_BLOCKDEV
+	select DEBUG_VFS
+	select DEBUG_FSYS_EXT2FS
+	select DEBUG_PCI
+	select DEBUG_VIA_SOUND
+	select DEBUG_LINUXLOAD
+	select DEBUG_IDE
+	select DEBUG_USB
+	select DEBUG_ELTORITO
+	select DEBUG_FLASH
+	select DEBUG_ARTECBOOT
+	default n
+
+config DEBUG_ELFBOOT
+	bool "DEBUG_ELFBOOT"
+	default n
+
+config DEBUG_SEGMENT
+	bool "DEBUG_SEGMENT"
+	default n
+
+config DEBUG_SYS_INFO
+	bool "DEBUG_SYS_INFO"
+	default n
+
+config DEBUG_BLOCKDEV
+	bool "DEBUG_BLOCKDEV"
+	default n
+
+config DEBUG_VFS
+	bool "DEBUG_VFS"
+	default n
+
+config DEBUG_FSYS_EXT2FS
+	bool "DEBUG_FSYS_EXT2FS"
+	depends on FSYS_EXT2FS
+	default n
+
+config DEBUG_PCI
+	bool "DEBUG_PCI"
+	depends on SUPPORT_PCI
+	default n
+
+config DEBUG_VIA_SOUND
+	bool "DEBUG_VIA_SOUND"
+	depends on VIA_SOUND
+	default n
+
+config DEBUG_LINUXLOAD
+	bool "DEBUG_LINUXLOAD"
+	depends on LINUX_LOADER
+	default n
+
+config DEBUG_IDE
+	bool "DEBUG_IDE"
+	depends on IDE_DISK||IDE_NEW_DISK
+	default n
+
+config DEBUG_USB
+	bool "DEBUG_USB"
+	depends on USB_DISK
+	default n
+
+config DEBUG_ELTORITO
+	bool "DEBUG_ELTORITO"
+	depends on ELTORITO
+	default n
+
+config DEBUG_FLASH
+	bool "DEBUG_FLASH"
+	depends on FLASH_DISK
+	default n
+
+config DEBUG_ARTECBOOT
+	bool "DEBUG_ARTECBOOT"
+	depends on ARTEC_BOOT
+	default n
+
+config DEVELOPER_TOOLS
+	bool "Developer Tools"
+	depends on USE_GRUB
+	default y
+	help
+	  Add commands useful for hardware development to the GRUB
+	  interface. These are lspci, setpci, io.
+
+endmenu
+
diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile
index 1d519b2..1482afa 100644
--- a/util/kconfig/Makefile
+++ b/util/kconfig/Makefile
@@ -11,7 +11,7 @@ ifeq ($(_OS),MINGW32)
        regex-objs=regex.o
 endif
 
-Kconfig := Config.in
+Kconfig := Kconfig
 
 FILO_CONFIG := $(src)/.config
 LIB_CONFIG  := $(src)/lib.config



More information about the coreboot-gerrit mailing list