| Message ID | BLU436-SMTP75F28A595FF6BC963866C3BFE90@phx.gbl |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 27 April 2015 at 09:22, Bin Meng <bmeng.cn@gmail.com> wrote: > Move platform-specific options under in arch/x86/Kconfig forward right > after the board-specific options but before any architecture-specific > options. When it comes to the same Kconfig option, board-specific one > takes take the highest precedence, then platform-specific one, and > finally architecture-specific one. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > arch/x86/Kconfig | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 28 April 2015 at 08:12, Simon Glass <sjg@chromium.org> wrote: > On 27 April 2015 at 09:22, Bin Meng <bmeng.cn@gmail.com> wrote: >> Move platform-specific options under in arch/x86/Kconfig forward right >> after the board-specific options but before any architecture-specific >> options. When it comes to the same Kconfig option, board-specific one >> takes take the highest precedence, then platform-specific one, and >> finally architecture-specific one. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- >> >> arch/x86/Kconfig | 19 +++++++++---------- >> 1 file changed, 9 insertions(+), 10 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-x86, thanks!
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c3cc144..43062cd 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -30,6 +30,15 @@ source "board/coreboot/Kconfig" source "board/google/Kconfig" source "board/intel/Kconfig" +# platform-specific options below +source "arch/x86/cpu/baytrail/Kconfig" +source "arch/x86/cpu/coreboot/Kconfig" +source "arch/x86/cpu/ivybridge/Kconfig" +source "arch/x86/cpu/quark/Kconfig" +source "arch/x86/cpu/queensbay/Kconfig" + +# architecture-specific options below + config DM_SPI default y @@ -358,16 +367,6 @@ config FSP_TEMP_RAM_ADDR Stack top address which is used in FspInit after DRAM is ready and CAR is disabled. -source "arch/x86/cpu/baytrail/Kconfig" - -source "arch/x86/cpu/coreboot/Kconfig" - -source "arch/x86/cpu/ivybridge/Kconfig" - -source "arch/x86/cpu/quark/Kconfig" - -source "arch/x86/cpu/queensbay/Kconfig" - config TSC_CALIBRATION_BYPASS bool "Bypass Time-Stamp Counter (TSC) calibration" default n
Move platform-specific options under in arch/x86/Kconfig forward right after the board-specific options but before any architecture-specific options. When it comes to the same Kconfig option, board-specific one takes take the highest precedence, then platform-specific one, and finally architecture-specific one. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- arch/x86/Kconfig | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)