net: fec_mxc: use simpler runtime cpu dection macros

[u-boot] / Kconfig

diff --git a/Kconfig b/Kconfig
index a9a4938401d6daefcb622dce2d4334c041880cec..f53759a48e1f72b07533093be48073cbb3747255 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -1,6 +1,7 @@
 #
 # For a description of the syntax of this configuration file,
 #
 # For a description of the syntax of this configuration file,

-# see Documentation/kbuild/kconfig-language.txt.
+# see the file Documentation/kbuild/kconfig-language.txt in the
+# Linux kernel source tree.

 #
 mainmenu "U-Boot $UBOOTVERSION Configuration"
 
 #
 mainmenu "U-Boot $UBOOTVERSION Configuration"
 


@@ -17,7 +18,7 @@ config LOCALVERSION
        string "Local version - append to U-Boot release"
        help
          Append an extra string to the end of your U-Boot version.
        string "Local version - append to U-Boot release"
        help
          Append an extra string to the end of your U-Boot version.

-         This will show up on your boot log, for example.
+         This will show up in your boot log, for example.

          The string you set here will be appended after the contents of
          any files with a filename matching localversion* in your
          object and source tree, in that order.  Your total string can
          The string you set here will be appended after the contents of
          any files with a filename matching localversion* in your
          object and source tree, in that order.  Your total string can


@@ -28,11 +29,11 @@ config LOCALVERSION_AUTO
        default y
        help
          This will try to automatically determine if the current tree is a
        default y
        help
          This will try to automatically determine if the current tree is a

-         release tree by looking for git tags that belong to the current
+         release tree by looking for Git tags that belong to the current

          top of tree revision.
 
          A string of the format -gxxxxxxxx will be added to the localversion
          top of tree revision.
 
          A string of the format -gxxxxxxxx will be added to the localversion

-         if a git-based tree is found.  The string generated by this will be
+         if a Git-based tree is found.  The string generated by this will be

          appended after any matching localversion* files, and after the value
          set in CONFIG_LOCALVERSION.
 
          appended after any matching localversion* files, and after the value
          set in CONFIG_LOCALVERSION.
 


@@ -56,7 +57,7 @@ config SYS_MALLOC_F
        bool "Enable malloc() pool before relocation"
        default y if DM
        help
        bool "Enable malloc() pool before relocation"
        default y if DM
        help

-         Before relocation memory is very limited on many platforms. Still,
+         Before relocation, memory is very limited on many platforms. Still,

          we can provide a small malloc() pool if needed. Driver model in
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.
          we can provide a small malloc() pool if needed. Driver model in
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.


@@ -66,7 +67,7 @@ config SYS_MALLOC_F_LEN
        depends on SYS_MALLOC_F
        default 0x400
        help
        depends on SYS_MALLOC_F
        default 0x400
        help

-         Before relocation memory is very limited on many platforms. Still,
+         Before relocation, memory is very limited on many platforms. Still,

          we can provide a small malloc() pool if needed. Driver model in
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.
          we can provide a small malloc() pool if needed. Driver model in
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.


@@ -78,7 +79,7 @@ menuconfig EXPERT
          This option allows certain base U-Boot options and settings
          to be disabled or tweaked. This is for specialized
          environments which can tolerate a "non-standard" U-Boot.
          This option allows certain base U-Boot options and settings
          to be disabled or tweaked. This is for specialized
          environments which can tolerate a "non-standard" U-Boot.

-         Only use this if you really know what you are doing.
+         Use this only if you really know what you are doing.

 
 if EXPERT
        config SYS_MALLOC_CLEAR_ON_INIT
 
 if EXPERT
        config SYS_MALLOC_CLEAR_ON_INIT


@@ -95,7 +96,7 @@ if EXPERT
          Then the boot time can be significantly reduced.
          Warning:
          When disabling this, please check if malloc calls, maybe
          Then the boot time can be significantly reduced.
          Warning:
          When disabling this, please check if malloc calls, maybe

-         should be replaced by calloc - if expects zeroed memory.
+         should be replaced by calloc - if one expects zeroed memory.

 endif
 endmenu                # General setup
 
 endif
 endmenu                # General setup
 


@@ -117,10 +118,10 @@ config SPL
 config SPL_SYS_MALLOC_SIMPLE
        bool
        depends on SPL
 config SPL_SYS_MALLOC_SIMPLE
        bool
        depends on SPL

-       prompt "Only use malloc_simple functions in the spl"
+       prompt "Only use malloc_simple functions in the SPL"

        help
          Say Y here to only use the *_simple malloc functions from
        help
          Say Y here to only use the *_simple malloc functions from

-         malloc_simple.c, rather then using the versions from dlmalloc.c
+         malloc_simple.c, rather then using the versions from dlmalloc.c;

          this will make the SPL binary smaller at the cost of more heap
          usage as the *_simple malloc functions do not re-use free-ed mem.
 
          this will make the SPL binary smaller at the cost of more heap
          usage as the *_simple malloc functions do not re-use free-ed mem.
 


@@ -273,6 +274,17 @@ config SYS_TEXT_BASE
        help
          TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
 
        help
          TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
 

+config SPL_LOAD_FIT
+       bool "Enable SPL loading U-Boot as a FIT"
+       depends on FIT
+       help
+         Normally with the SPL framework a legacy image is generated as part
+         of the build. This contains U-Boot along with information as to
+         where it should be loaded. This option instead enables generation
+         of a FIT (Flat Image Tree) which provides more flexibility. In
+         particular it can handle selecting from multiple device tree
+         and passing the correct one to U-Boot.
+

 config SYS_CLK_FREQ
        depends on ARC || ARCH_SUNXI
        int "CPU clock frequency"
 config SYS_CLK_FREQ
        depends on ARC || ARCH_SUNXI
        int "CPU clock frequency"