powerpc, 5xxx, 512x: remove support for mpc5xxx and mpc512x

[platform/kernel/u-boot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index 9067d1e..27dde11 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -18,6 +18,15 @@ config BOOTSTAGE
          Calls to show_boot_progress() will also result in log entries but
          these will not have names.
 
          Calls to show_boot_progress() will also result in log entries but
          these will not have names.
 

+config SPL_BOOTSTAGE
+       bool "Boot timing and reported in SPL"
+       depends on BOOTSTAGE
+       help
+         Enable recording of boot time in SPL. To make this visible to U-Boot
+         proper, enable BOOTSTAGE_STASH as well. This will stash the timing
+         information when SPL finishes and load it when U-Boot proper starts
+         up.
+

 config BOOTSTAGE_REPORT
        bool "Display a detailed boot timing report before booting the OS"
        depends on BOOTSTAGE
 config BOOTSTAGE_REPORT
        bool "Display a detailed boot timing report before booting the OS"
        depends on BOOTSTAGE


@@ -38,7 +47,7 @@ config BOOTSTAGE_REPORT
                 30,361,327    445,160  start_kernel
 
 config BOOTSTAGE_USER_COUNT
                 30,361,327    445,160  start_kernel
 
 config BOOTSTAGE_USER_COUNT

-       hex "Number of boot ID numbers available for user use"
+       int "Number of boot ID numbers available for user use"

        default 20
        help
          This is the number of available user bootstage records.
        default 20
        help
          This is the number of available user bootstage records.


@@ -46,6 +55,13 @@ config BOOTSTAGE_USER_COUNT
          a new ID will be allocated from this stash. If you exceed
          the limit, recording will stop.
 
          a new ID will be allocated from this stash. If you exceed
          the limit, recording will stop.
 

+config BOOTSTAGE_RECORD_COUNT
+       int "Number of boot stage records to store"
+       default 30
+       help
+         This is the size of the bootstage record list and is the maximum
+         number of bootstage records that can be recorded.
+

 config BOOTSTAGE_FDT
        bool "Store boot timing information in the OS device tree"
        depends on BOOTSTAGE
 config BOOTSTAGE_FDT
        bool "Store boot timing information in the OS device tree"
        depends on BOOTSTAGE


@@ -90,7 +106,7 @@ config BOOTSTAGE_STASH_ADDR
 
 config BOOTSTAGE_STASH_SIZE
        hex "Size of boot timing stash region"
 
 config BOOTSTAGE_STASH_SIZE
        hex "Size of boot timing stash region"

-       default 4096
+       default 0x1000

        help
          This should be large enough to hold the bootstage stash. A value of
          4096 (4KiB) is normally plenty.
        help
          This should be large enough to hold the bootstage stash. A value of
          4096 (4KiB) is normally plenty.


@@ -158,6 +174,75 @@ config SPI_BOOT
 
 endmenu
 
 
 endmenu
 

+menu "Environment"
+
+if ARCH_SUNXI
+
+choice
+       prompt "Environment Device"
+       default ENV_IS_IN_MMC if ARCH_SUNXI
+
+config ENV_IS_IN_MMC
+       bool "Environment in an MMC device"
+       depends on CMD_MMC
+       help
+         Define this if you have an MMC device which you want to use for the
+         environment.
+
+config ENV_IS_IN_NAND
+       bool "Environment in a NAND device"
+       depends on CMD_NAND
+       help
+         Define this if you have a NAND device which you want to use for the
+         environment.
+
+config ENV_IS_IN_UBI
+       bool "Environment in a UBI volume"
+       depends on CMD_UBI
+       depends on CMD_MTDPARTS
+       help
+         Define this if you have a UBI volume which you want to use for the
+         environment.
+
+config ENV_IS_NOWHERE
+       bool "Environment is not stored"
+       help
+         Define this if you don't want to or can't have an environment stored
+         on a storage medium
+
+endchoice
+
+config ENV_OFFSET
+       hex "Environment Offset"
+       depends on !ENV_IS_IN_UBI
+       depends on !ENV_IS_NOWHERE
+       default 0x88000 if ARCH_SUNXI
+       help
+         Offset from the start of the device (or partition)
+
+config ENV_SIZE
+       hex "Environment Size"
+       depends on !ENV_IS_NOWHERE
+       default 0x20000 if ARCH_SUNXI
+       help
+         Size of the environment storage area
+
+config ENV_UBI_PART
+       string "UBI partition name"
+       depends on ENV_IS_IN_UBI
+       help
+         MTD partition containing the UBI device
+
+config ENV_UBI_VOLUME
+       string "UBI volume name"
+       depends on ENV_IS_IN_UBI
+       help
+         Name of the volume that you want to store the environment in.
+
+endif
+
+endmenu
+

 config BOOTDELAY
        int "delay in seconds before automatically booting"
        default 2
 config BOOTDELAY
        int "delay in seconds before automatically booting"
        default 2


@@ -357,12 +442,6 @@ config DEFAULT_FDT_FILE
        help
          This option is used to set the default fdt file to boot OS.
 
        help
          This option is used to set the default fdt file to boot OS.
 

-config SYS_NO_FLASH
-       bool "Disable support for parallel NOR flash"
-       default n
-       help
-         This option is used to disable support for parallel NOR flash.
-

 config VERSION_VARIABLE
        bool "add U-Boot environment variable vers"
        default n
 config VERSION_VARIABLE
        bool "add U-Boot environment variable vers"
        default n


@@ -385,7 +464,7 @@ config BOARD_LATE_INIT
 
 config DISPLAY_CPUINFO
        bool "Display information about the CPU during start up"
 
 config DISPLAY_CPUINFO
        bool "Display information about the CPU during start up"

-       default y if ARM || BLACKFIN || NIOS2 || X86 || XTENSA || MPC5xxx
+       default y if ARM || NIOS2 || X86 || XTENSA

        help
          Display information about the CPU that U-Boot is running on
          when U-Boot starts up. The function print_cpuinfo() is called
        help
          Display information about the CPU that U-Boot is running on
          when U-Boot starts up. The function print_cpuinfo() is called


@@ -393,7 +472,7 @@ config DISPLAY_CPUINFO
 
 config DISPLAY_BOARDINFO
        bool "Display information about the board during start up"
 
 config DISPLAY_BOARDINFO
        bool "Display information about the board during start up"

-       default y if ARM || M68K || MIPS || PPC || SPARC || XTENSA
+       default y if ARM || M68K || MIPS || PPC || XTENSA

        help
          Display information about the board that U-Boot is running on
          when U-Boot starts up. The board function checkboard() is called
        help
          Display information about the board that U-Boot is running on
          when U-Boot starts up. The board function checkboard() is called


@@ -430,4 +509,16 @@ config BOARD_EARLY_INIT_F
 
 endmenu
 
 
 endmenu
 

+menu "Security support"
+
+config HASH
+       bool # "Support hashing API (SHA1, SHA256, etc.)"
+       help
+         This provides a way to hash data in memory using various supported
+         algorithms (such as SHA1, MD5, CRC32). The API is defined in hash.h
+         and the algorithms it supports are defined in common/hash.c. See
+         also CMD_HASH for command-line access.
+
+endmenu
+

 source "common/spl/Kconfig"
 source "common/spl/Kconfig"