board/BuR/common: Add support for displaying BMP on LCD

[u-boot] / Kconfig

diff --git a/Kconfig b/Kconfig
index fb012cfb3ebd20b1bf954cd95b6e40b7b83733a7..b879461b964233fcf97ce537d22fd08551c31f15 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -8,15 +8,13 @@ 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.
          This will show up on your boot log, for example.
        help
          Append an extra string to the end of your U-Boot version.
          This will show up on your boot log, for example.


@@ -27,7 +25,6 @@ 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


@@ -48,7 +45,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


@@ -87,16 +83,6 @@ endmenu              # General setup
 
 menu "Boot images"
 
 
 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
 


@@ -106,23 +92,37 @@ 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_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 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
        help
          This option allows to boot the new uImage structrure,
          Flattened Image Tree.  FIT is formally a FDT, which can include


@@ -148,7 +148,6 @@ config FIT_SIGNATURE
 
 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


@@ -174,8 +173,6 @@ config SYS_CLK_FREQ
 
 endmenu                # Boot images
 
 
 endmenu                # Boot images
 

-source "arch/Kconfig"
-

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