dm: cbfs: Fix handling of invalid type

[u-boot] / Kconfig

diff --git a/Kconfig b/Kconfig
index b5968d74a179a3e37085a86eb0888a1e6ef07271..3ce5ba1b522effe11d4dfdacf877cba0472ac006 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -114,6 +114,16 @@ config 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"
 config SPL_STACK_R
        depends on SPL
        bool "Enable SDRAM location for SPL stack"


@@ -132,6 +142,26 @@ config SPL_STACK_R_ADDR
          Specify the address in SDRAM for the SPL stack. This will be set up
          before board_init_r() is called.
 
          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


@@ -146,7 +176,7 @@ config FIT
          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,
          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.

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


@@ -178,13 +208,15 @@ 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
+       depends on !EFI_APP

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


@@ -193,6 +225,8 @@ endmenu             # Boot images
 
 source "common/Kconfig"
 
 
 source "common/Kconfig"
 

+source "cmd/Kconfig"
+

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