summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-03-02 17:04:37 -0700
committerSimon Glass <sjg@chromium.org>2015-04-18 11:11:37 -0600
commitee2b24340fd1d63a27ac4ed6ac828ade1469dbe7 (patch)
tree1126a86f04af92194c867b268ea5ca1e29d7aa46 /arch/x86
parent5c4f9c1d722d7c11e304469bf5e54197bf95f0ce (diff)
downloadtalos-obmc-uboot-ee2b24340fd1d63a27ac4ed6ac828ade1469dbe7.tar.gz
talos-obmc-uboot-ee2b24340fd1d63a27ac4ed6ac828ade1469dbe7.zip
Kconfig: Move CONFIG_BOOTSTAGE to Kconfig
Move CONFIG_BOOT_STAGE and its associated options to Kconfig. Adjust existing users and code. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig9
-rw-r--r--arch/x86/cpu/cpu.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6cff14a0ca..b44f709253 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -465,4 +465,13 @@ config PCIE_ECAM_BASE
assigned to PCI devices - i.e. the memory and prefetch regions, as
passed to pci_set_region().
+config BOOTSTAGE
+ default y
+
+config BOOTSTAGE_REPORT
+ default y
+
+config CMD_BOOTSTAGE
+ default y
+
endmenu
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index ed7905c1d7..a9ca50b1e4 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -163,7 +163,7 @@ void setup_gdt(gd_t *id, u64 *gdt_addr)
int __weak x86_cleanup_before_linux(void)
{
#ifdef CONFIG_BOOTSTAGE_STASH
- bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH,
+ bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH_ADDR,
CONFIG_BOOTSTAGE_STASH_SIZE);
#endif
OpenPOWER on IntegriCloud