| Message ID | 1420553664-3281-7-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 6 January 2015 at 07:14, Bin Meng <bmeng.cn@gmail.com> wrote: > There are many places in the U-Boot source tree which refer to > CONFIG_SYS_COREBOOT, CONFIG_CBMEM_CONSOLE and CONFIG_VIDEO_COREBOOT > that is currently defined in coreboot.h. > > Move them to arch/x86/cpu/coreboot/Kconfig so that we can switch > to board configuration file to build U-Boot later. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > --- > > Changes in v4: None > Changes in v3: > - Make coreboot options wrapped by TARGET_COREBOOT > - Remove these options from include/configs/coreboot.h for bisectability > > Changes in v2: > - New patch to move coreboot specific defines from coreboot.h to Kconfig > > arch/x86/Kconfig | 2 ++ > arch/x86/cpu/coreboot/Kconfig | 15 +++++++++++++++ > include/configs/coreboot.h | 5 ----- > 3 files changed, 17 insertions(+), 5 deletions(-) > create mode 100644 arch/x86/cpu/coreboot/Kconfig Acked-by: Simon Glass <sjg@chromium.org>
On 6 January 2015 at 07:28, Simon Glass <sjg@chromium.org> wrote: > On 6 January 2015 at 07:14, Bin Meng <bmeng.cn@gmail.com> wrote: >> There are many places in the U-Boot source tree which refer to >> CONFIG_SYS_COREBOOT, CONFIG_CBMEM_CONSOLE and CONFIG_VIDEO_COREBOOT >> that is currently defined in coreboot.h. >> >> Move them to arch/x86/cpu/coreboot/Kconfig so that we can switch >> to board configuration file to build U-Boot later. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> >> --- >> >> Changes in v4: None >> Changes in v3: >> - Make coreboot options wrapped by TARGET_COREBOOT >> - Remove these options from include/configs/coreboot.h for bisectability >> >> Changes in v2: >> - New patch to move coreboot specific defines from coreboot.h to Kconfig >> >> arch/x86/Kconfig | 2 ++ >> arch/x86/cpu/coreboot/Kconfig | 15 +++++++++++++++ >> include/configs/coreboot.h | 5 ----- >> 3 files changed, 17 insertions(+), 5 deletions(-) >> create mode 100644 arch/x86/cpu/coreboot/Kconfig > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-x86/next, thanks!
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 512b6f6..90e828a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -344,6 +344,8 @@ config TSC_FREQ_IN_MHZ help The running frequency in MHz of Time-Stamp Counter (TSC). +source "arch/x86/cpu/coreboot/Kconfig" + source "arch/x86/cpu/ivybridge/Kconfig" source "arch/x86/cpu/queensbay/Kconfig" diff --git a/arch/x86/cpu/coreboot/Kconfig b/arch/x86/cpu/coreboot/Kconfig new file mode 100644 index 0000000..e0e3c64 --- /dev/null +++ b/arch/x86/cpu/coreboot/Kconfig @@ -0,0 +1,15 @@ +if TARGET_COREBOOT + +config SYS_COREBOOT + bool + default y + +config CBMEM_CONSOLE + bool + default y + +config VIDEO_COREBOOT + bool + default y + +endif diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index 990a2d1..a0d9952 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -19,7 +19,6 @@ * High Level Configuration Options * (easy to change) */ -#define CONFIG_SYS_COREBOOT #define CONFIG_LAST_STAGE_INIT #define CONFIG_SYS_EARLY_PCI_INIT @@ -55,10 +54,6 @@ "stdout=vga,serial,cbmem\0" \ "stderr=vga,serial,cbmem\0" -#define CONFIG_CBMEM_CONSOLE - -#define CONFIG_VIDEO_COREBOOT - #define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_TRACE
There are many places in the U-Boot source tree which refer to CONFIG_SYS_COREBOOT, CONFIG_CBMEM_CONSOLE and CONFIG_VIDEO_COREBOOT that is currently defined in coreboot.h. Move them to arch/x86/cpu/coreboot/Kconfig so that we can switch to board configuration file to build U-Boot later. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- Changes in v4: None Changes in v3: - Make coreboot options wrapped by TARGET_COREBOOT - Remove these options from include/configs/coreboot.h for bisectability Changes in v2: - New patch to move coreboot specific defines from coreboot.h to Kconfig arch/x86/Kconfig | 2 ++ arch/x86/cpu/coreboot/Kconfig | 15 +++++++++++++++ include/configs/coreboot.h | 5 ----- 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 arch/x86/cpu/coreboot/Kconfig