flash: complete CONFIG_SYS_NO_FLASH move with renaming

[people/ms/u-boot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index 69d09ec7628f3b063af46aeecbc553b9be028f22..8f73c8f757bf7e5a0b38b3f71d374ec7cf5ff348 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -172,6 +172,12 @@ config BOOTDELAY
 
 menu "Console"
 
+config MENU
+       bool
+       help
+         This is the library functionality to provide a text-based menu of
+         choices for the user to make choices with.
+
 config CONSOLE_RECORD
        bool "Console recording"
        help
@@ -327,13 +333,29 @@ config SYS_CONSOLE_ENV_OVERWRITE
          start-up (after relocation). This causes the environment to be
          updated to match the console devices actually chosen.
 
+config SYS_CONSOLE_INFO_QUIET
+       bool "Don't display the console devices on boot"
+       help
+         Normally U-Boot displays the current settings for stdout, stdin
+         and stderr on boot when the post-relocation console is set up.
+         Enable this option to supress this output. It can be obtained by
+         calling stdio_print_current_devices() from board code.
+
+config SYS_STDIO_DEREGISTER
+       bool "Allow deregistering stdio devices"
+       default y if USB_KEYBOARD
+       help
+         Generally there is no need to deregister stdio devices since they
+         are never deactivated. But if a stdio device is used which can be
+         removed (for example a USB keyboard) then this option can be
+         enabled to ensure this is handled correctly.
+
 endmenu
 
-config SYS_NO_FLASH
-       bool "Disable support for parallel NOR flash"
-       default n
+config DEFAULT_FDT_FILE
+       string "Default fdt file"
        help
-         This option is used to disable support for parallel NOR flash.
+         This option is used to set the default fdt file to boot OS.
 
 config VERSION_VARIABLE
        bool "add U-Boot environment variable vers"
@@ -345,9 +367,19 @@ config VERSION_VARIABLE
          Any change to this variable will be reverted at the
          next reset.
 
+config BOARD_LATE_INIT
+       bool
+       help
+         Sometimes board require some initialization code that might
+         require once the actual init done, example saving board specific env,
+         boot-modes etc. which eventually done at late.
+
+         So this config enable the late init code with the help of board_late_init
+         function which should defined on respective boards.
+
 config DISPLAY_CPUINFO
        bool "Display information about the CPU during start up"
-       default y if ARM || BLACKFIN || NIOS2 || X86 || XTENSA
+       default y if ARM || BLACKFIN || NIOS2 || X86 || XTENSA || MPC5xxx
        help
          Display information about the CPU that U-Boot is running on
          when U-Boot starts up. The function print_cpuinfo() is called
@@ -361,4 +393,35 @@ config DISPLAY_BOARDINFO
          when U-Boot starts up. The board function checkboard() is called
          to do this.
 
+menu "Start-up hooks"
+
+config ARCH_EARLY_INIT_R
+       bool "Call arch-specific init soon after relocation"
+       default y if X86
+       help
+         With this option U-Boot will call arch_early_init_r() soon after
+         relocation. Driver model is running by this point, and the cache
+         is on. Note that board_early_init_r() is called first, if
+         enabled. This can be used to set up architecture-specific devices.
+
+config ARCH_MISC_INIT
+       bool "Call arch-specific init after relocation, when console is ready"
+       help
+         With this option U-Boot will call arch_misc_init() after
+         relocation to allow miscellaneous arch-dependent initialisation
+         to be performed. This function should be defined by the board
+         and will be called after the console is set up, after relocaiton.
+
+config BOARD_EARLY_INIT_F
+       bool "Call board-specific init before relocation"
+       default y if X86
+       help
+         Some boards need to perform initialisation as soon as possible
+         after boot. With this option, U-Boot calls board_early_init_f()
+         after driver model is ready in the pre-relocation init sequence.
+         Note that the normal serial console is not yet set up, but the
+         debug UART will be available if enabled.
+
+endmenu
+
 source "common/spl/Kconfig"