x86: chromebook_panther: Correct the image layout

This board does not have microcode but at present that is not supported
by Kconfig nor the binman image layout. Fix both of these.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 01ffaea132c1955bc7095171ebe5b93563653763..cbca69ef6b3a73888751d9c64fa4814650b1c14e 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -594,8 +594,13 @@ config HAVE_REFCODE
           Various peripherals may fail to work.
 
 config HAVE_MICROCODE
-       bool
+       bool "Board requires a microcode binary"
        default y if !FSP_VERSION2
+       help
+         Enable this if the board requires microcode to be loaded on boot.
+         Typically this is handed by the FSP for modern boards, but for
+         some older boards, it must be programmed by U-Boot, and that form
+         part of the image.
 
 config SMP
        bool "Enable Symmetric Multiprocessing"

diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index 1e0a985b43b5ab74f956cf9fca3ccc702536009c..fa8106c8b8c4d90c3c1363aaeb4c69bcf6d7e571 100644 (file)
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.dtsi
@@ -75,11 +75,15 @@
        u-boot {
                offset = <CONFIG_SYS_TEXT_BASE>;
        };
-# else
+# elif defined(CONFIG_HAVE_MICROCODE)
        /* If there is no SPL then we need to put microcode in U-Boot */
        u-boot-with-ucode-ptr {
                offset = <CONFIG_X86_OFFSET_U_BOOT>;
        };
+# else
+       u-boot-nodtb {
+               offset = <CONFIG_X86_OFFSET_U_BOOT>;
+       };
 # endif
 #endif
 #ifdef CONFIG_HAVE_MICROCODE

diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index d559e034b1c803ab24d5bc94fdd09d9dce75c874..701edf0d07f0a95d8ae25abb596e8f33f7048b20 100644 (file)
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -8,7 +8,9 @@ CONFIG_DEFAULT_DEVICE_TREE="chromebox_panther"
 CONFIG_VENDOR_GOOGLE=y
 CONFIG_TARGET_CHROMEBOX_PANTHER=y
 CONFIG_HAVE_MRC=y
+# CONFIG_HAVE_MICROCODE is not set
 CONFIG_HAVE_VGA_BIOS=y
+CONFIG_X86_OFFSET_U_BOOT=0xffa00000
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y