arm: lib: Fix uldivmod.S build on Thumb2

[u-boot] / Kconfig

diff --git a/Kconfig b/Kconfig
index 9af31e3e77a2e36e7b0cd72384b6d4081c132a54..4b462166656074d5979dee513b80c5c1c1deac02 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"
 


@@ -8,18 +9,16 @@ config UBOOTVERSION
        string
        option env="UBOOTVERSION"
 
        string
        option env="UBOOTVERSION"
 

-config KCONFIG_OBJDIR
-       string
-       option env="KCONFIG_OBJDIR"
+# Allow defaults in arch-specific code to override any given here
+source "arch/Kconfig"

 
 menu "General setup"
 
 config LOCALVERSION
        string "Local version - append to U-Boot release"
 
 menu "General setup"
 
 config LOCALVERSION
        string "Local version - append to U-Boot release"

-       depends on !SPL_BUILD

        help
          Append an extra string to the end of your U-Boot version.
        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


@@ -27,15 +26,14 @@ config LOCALVERSION
 
 config LOCALVERSION_AUTO
        bool "Automatically append version information to the version string"
 
 config LOCALVERSION_AUTO
        bool "Automatically append version information to the version string"

-       depends on !SPL_BUILD

        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.
 


@@ -48,7 +46,6 @@ config LOCALVERSION_AUTO
 
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size"
 
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size"

-       depends on !SPL_BUILD

        default y
        help
          Enabling this option will pass "-Os" instead of "-O2" to gcc
        default y
        help
          Enabling this option will pass "-Os" instead of "-O2" to gcc


@@ -56,28 +53,55 @@ config CC_OPTIMIZE_FOR_SIZE
 
          This option is enabled by default for U-Boot.
 
 
          This option is enabled by default for U-Boot.
 

-menuconfig EXPERT
-        bool "Configure standard U-Boot features (expert users)"
-        help
-          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.
+config SYS_MALLOC_F
+       bool "Enable malloc() pool before relocation"
+       default y if DM
+       help
+         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.
+
+config SYS_MALLOC_F_LEN
+       hex "Size of malloc() pool before relocation"
+       depends on SYS_MALLOC_F
+       default 0x400
+       help
+         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.

 
 

+menuconfig EXPERT
+       bool "Configure standard U-Boot features (expert users)"
+       default y
+       help
+         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.
+         Use this only if you really know what you are doing.
+
+if EXPERT
+       config SYS_MALLOC_CLEAR_ON_INIT
+       bool "Init with zeros the memory reserved for malloc (slow)"
+       default y
+       help
+         This setting is enabled by default. The reserved malloc
+         memory is initialized with zeros, so first malloc calls
+         will return the pointer to the zeroed memory. But this
+         slows the boot time.
+
+         It is recommended to disable it, when CONFIG_SYS_MALLOC_LEN
+         value, has more than few MiB, e.g. when uses bzip2 or bmp logo.
+         Then the boot time can be significantly reduced.
+         Warning:
+         When disabling this, please check if malloc calls, maybe
+         should be replaced by calloc - if one expects zeroed memory.
+endif

 endmenu                # General setup
 
 menu "Boot images"
 
 endmenu                # General setup
 
 menu "Boot images"
 

-config SPL_BUILD
-       bool
-       depends on $KCONFIG_OBJDIR="spl" || $KCONFIG_OBJDIR="tpl"
-       default y
-
-config TPL_BUILD
-       bool
-       depends on $KCONFIG_OBJDIR="tpl"
-       default y
-

 config SUPPORT_SPL
        bool
 
 config SUPPORT_SPL
        bool
 


@@ -87,29 +111,77 @@ config SUPPORT_TPL
 config SPL
        bool
        depends on SUPPORT_SPL
 config SPL
        bool
        depends on SUPPORT_SPL

-       prompt "Enable SPL" if !SPL_BUILD
-       default y if SPL_BUILD
+       prompt "Enable SPL"

        help
          If you want to build SPL as well as the normal image, say Y.
 
        help
          If you want to build SPL as well as the normal image, say Y.
 

+config SPL_SYS_MALLOC_SIMPLE
+       bool
+       depends on SPL
+       prompt "Only use malloc_simple functions in the SPL"
+       help
+         Say Y here to only use the *_simple malloc functions from
+         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.
+
+config SPL_STACK_R
+       depends on SPL
+       bool "Enable SDRAM location for SPL stack"
+       help
+         SPL starts off execution in SRAM and thus typically has only a small
+         stack available. Since SPL sets up DRAM while in its board_init_f()
+         function, it is possible for the stack to move there before
+         board_init_r() is reached. This option enables a special SDRAM
+         location for the SPL stack. U-Boot SPL switches to this after
+         board_init_f() completes, and before board_init_r() starts.
+
+config SPL_STACK_R_ADDR
+       depends on SPL_STACK_R
+       hex "SDRAM location for SPL stack"
+       help
+         Specify the address in SDRAM for the SPL stack. This will be set up
+         before board_init_r() is called.
+
+config SPL_STACK_R_MALLOC_SIMPLE_LEN
+       depends on SPL_STACK_R && SPL_SYS_MALLOC_SIMPLE
+       hex "Size of malloc_simple heap after switching to DRAM SPL stack"
+       default 0x100000
+       help
+         Specify the amount of the stack to use as memory pool for
+         malloc_simple after switching the stack to DRAM. This may be set
+         to give board_init_r() a larger heap then the initial heap in
+         SRAM which is limited to SYS_MALLOC_F_LEN bytes.
+
+config SPL_SEPARATE_BSS
+       depends on SPL
+       bool "BSS section is in a different memory region from text"
+       help
+         Some platforms need a large BSS region in SPL and can provide this
+         because RAM is already set up. In this case BSS can be moved to RAM.
+         This option should then be enabled so that the correct device tree
+         location is used. Normally we put the device tree at the end of BSS
+         but with this option enabled, it goes at _image_binary_end.
+

 config TPL
        bool
        depends on SPL && SUPPORT_TPL
 config TPL
        bool
        depends on SPL && SUPPORT_TPL

-       prompt "Enable TPL" if !SPL_BUILD
-       default y if TPL_BUILD
-       default n
+       prompt "Enable TPL"

        help
          If you want to build TPL as well as the normal image and SPL, say Y.
 
 config FIT
        bool "Support Flattened Image Tree"
        help
          If you want to build TPL as well as the normal image and SPL, say Y.
 
 config FIT
        bool "Support Flattened Image Tree"

-       depends on !SPL_BUILD

        help
          This option allows to boot the new uImage structrure,
          Flattened Image Tree.  FIT is formally a FDT, which can include
          images of various types (kernel, FDT blob, ramdisk, etc.)
          in a single blob.  To boot this new uImage structure,
        help
          This option allows to boot the new uImage structrure,
          Flattened Image Tree.  FIT is formally a FDT, which can include
          images of various types (kernel, FDT blob, ramdisk, etc.)
          in a single blob.  To boot this new uImage structure,

-         pass the the address of the blob to the "bootm" command.
+         pass the address of the blob to the "bootm" command.
+         FIT is very flexible, supporting compression, multiple images,
+         multiple configurations, verification through hashing and also
+         verified boot (secure boot using RSA). This option enables that
+         feature.

 
 config FIT_VERBOSE
        bool "Display verbose messages on FIT boot"
 
 config FIT_VERBOSE
        bool "Display verbose messages on FIT boot"


@@ -118,15 +190,71 @@ config FIT_VERBOSE
 config FIT_SIGNATURE
        bool "Enable signature verification of FIT uImages"
        depends on FIT
 config FIT_SIGNATURE
        bool "Enable signature verification of FIT uImages"
        depends on FIT

+       depends on DM

        select RSA
        help
          This option enables signature verification of FIT uImages,
        select RSA
        help
          This option enables signature verification of FIT uImages,

-         using a hash signed and verified using RSA.
-         See doc/uImage.FIT/signature.txt for more details.
+         using a hash signed and verified using RSA. If
+         CONFIG_SHA_PROG_HW_ACCEL is defined, i.e support for progressive
+         hashing is available using hardware, then then RSA library will use
+         it. See doc/uImage.FIT/signature.txt for more details.
+
+         WARNING: When relying on signed FIT images with a required signature
+         check the legacy image format is disabled by default, so that
+         unsigned images cannot be loaded. If a board needs the legacy image
+         format support in this case, enable it using
+         CONFIG_IMAGE_FORMAT_LEGACY.
+
+config FIT_BEST_MATCH
+       bool "Select the best match for the kernel device tree"
+       depends on FIT
+       help
+         When no configuration is explicitly selected, default to the
+         one whose fdt's compatibility field best matches that of
+         U-Boot itself. A match is considered "best" if it matches the
+         most specific compatibility entry of U-Boot's fdt's root node.
+         The order of entries in the configuration's fdt is ignored.
+
+config FIT_VERBOSE
+       bool "Show verbose messages when FIT images fails"
+       depends on FIT
+       help
+         Generally a system will have valid FIT images so debug messages
+         are a waste of code space. If you are debugging your images then
+         you can enable this option to get more verbose information about
+         failures.
+
+config OF_BOARD_SETUP
+       bool "Set up board-specific details in device tree before boot"
+       depends on OF_LIBFDT
+       help
+         This causes U-Boot to call ft_board_setup() before booting into
+         the Operating System. This function can set up various
+         board-specific information in the device tree for use by the OS.
+         The device tree is then passed to the OS.
+
+config OF_SYSTEM_SETUP
+       bool "Set up system-specific details in device tree before boot"
+       depends on OF_LIBFDT
+       help
+         This causes U-Boot to call ft_system_setup() before booting into
+         the Operating System. This function can set up various
+         system-specific information in the device tree for use by the OS.
+         The device tree is then passed to the OS.
+
+config OF_STDOUT_VIA_ALIAS
+       bool "Update the device-tree stdout alias from U-Boot"
+       depends on OF_LIBFDT
+       help
+         This uses U-Boot's serial alias from the aliases node to update
+         the device tree passed to the OS. The "linux,stdout-path" property
+         in the chosen node is set to point to the correct serial node.
+         This option currently references CONFIG_CONS_INDEX, which is
+         incorrect when used with device tree as this option does not
+         exist / should not be used.

 
 config SYS_EXTRA_OPTIONS
        string "Extra Options (DEPRECATED)"
 
 config SYS_EXTRA_OPTIONS
        string "Extra Options (DEPRECATED)"

-       depends on !SPL_BUILD

        help
          The old configuration infrastructure (= mkconfig + boards.cfg)
          provided the extra options field. If you have something like
        help
          The old configuration infrastructure (= mkconfig + boards.cfg)
          provided the extra options field. If you have something like


@@ -139,23 +267,36 @@ config SYS_EXTRA_OPTIONS
          new boards should not use this option.
 
 config SYS_TEXT_BASE
          new boards should not use this option.
 
 config SYS_TEXT_BASE

-       depends on SPARC || ARC
+       depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
+               (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS
+       depends on !EFI_APP

        hex "Text Base"
        help
          TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
 
        hex "Text Base"
        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
 config SYS_CLK_FREQ

-       depends on ARC
+       depends on ARC || ARCH_SUNXI

        int "CPU clock frequency"
        help
          TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
 
 endmenu                # Boot images
 
        int "CPU clock frequency"
        help
          TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
 
 endmenu                # Boot images
 

-source "arch/Kconfig"
-

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

+source "cmd/Kconfig"
+

 source "dts/Kconfig"
 
 source "net/Kconfig"
 source "dts/Kconfig"
 
 source "net/Kconfig"


@@ -165,3 +306,5 @@ source "drivers/Kconfig"
 source "fs/Kconfig"
 
 source "lib/Kconfig"
 source "fs/Kconfig"
 
 source "lib/Kconfig"

+
+source "test/Kconfig"