[U-Boot] [PATCH v2 3/6] x86: Make QEMU the default vendor
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Acked-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org ---
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3d02620..0b78f10 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -12,7 +12,7 @@ config SYS_VSNPRINTF
choice prompt "Mainboard vendor" - default VENDOR_COREBOOT + default VENDOR_EMULATION
config VENDOR_COREBOOT bool "coreboot"
On 7 May 2015 at 07:34, Bin Meng bmeng.cn@gmail.com wrote:
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Acked-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-x86, thanks!
Hi Bin,
On 8 May 2015 at 14:42, Simon Glass sjg@chromium.org wrote:
On 7 May 2015 at 07:34, Bin Meng bmeng.cn@gmail.com wrote:
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Acked-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
04: x86: Make QEMU the default vendor x86: + coreboot-x86 + +Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2 +make: *** [sub-make] Error 2
Regards, Simon
Hi Simon,
On Wed, May 27, 2015 at 11:57 AM, Simon Glass sjg@chromium.org wrote:
Hi Bin,
On 8 May 2015 at 14:42, Simon Glass sjg@chromium.org wrote:
On 7 May 2015 at 07:34, Bin Meng bmeng.cn@gmail.com wrote:
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Acked-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
04: x86: Make QEMU the default vendor x86: + coreboot-x86
+Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2 +make: *** [sub-make] Error 2
That's weird. I didn't see such error when building the patchset with buildman.
Regards, Bin
Hi Simon,
On Wed, May 27, 2015 at 12:01 PM, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Wed, May 27, 2015 at 11:57 AM, Simon Glass sjg@chromium.org wrote:
Hi Bin,
On 8 May 2015 at 14:42, Simon Glass sjg@chromium.org wrote:
On 7 May 2015 at 07:34, Bin Meng bmeng.cn@gmail.com wrote:
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Acked-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
04: x86: Make QEMU the default vendor x86: + coreboot-x86
+Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2 +make: *** [sub-make] Error 2
That's weird. I didn't see such error when building the patchset with buildman.
I've figured out the root cause. For some reason which I don't understand, commit bd328eb broke this.
+Joe,
Do you know if there is something wrong with commit bd328eb that accidentally removed 'CONFIG_VENDOR_COREBOOT=y'?
Regards, Bin
Hi Bin,
On 27 May 2015 at 09:52, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Wed, May 27, 2015 at 12:01 PM, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Wed, May 27, 2015 at 11:57 AM, Simon Glass sjg@chromium.org wrote:
Hi Bin,
On 8 May 2015 at 14:42, Simon Glass sjg@chromium.org wrote:
On 7 May 2015 at 07:34, Bin Meng bmeng.cn@gmail.com wrote:
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Acked-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
04: x86: Make QEMU the default vendor x86: + coreboot-x86
+Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2 +make: *** [sub-make] Error 2
That's weird. I didn't see such error when building the patchset with buildman.
I've figured out the root cause. For some reason which I don't understand, commit bd328eb broke this.
+Joe,
Do you know if there is something wrong with commit bd328eb that accidentally removed 'CONFIG_VENDOR_COREBOOT=y'?
It could perhaps be a merge conflict. If it's needed I can put it back in.
Regards, Simon
Hi Simon,
On Wed, May 27, 2015 at 11:53 PM, Simon Glass sjg@chromium.org wrote:
Hi Bin,
On 27 May 2015 at 09:52, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Wed, May 27, 2015 at 12:01 PM, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Wed, May 27, 2015 at 11:57 AM, Simon Glass sjg@chromium.org wrote:
Hi Bin,
On 8 May 2015 at 14:42, Simon Glass sjg@chromium.org wrote:
On 7 May 2015 at 07:34, Bin Meng bmeng.cn@gmail.com wrote:
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by: Bin Meng bmeng.cn@gmail.com Acked-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
04: x86: Make QEMU the default vendor x86: + coreboot-x86
+Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2 +make: *** [sub-make] Error 2
That's weird. I didn't see such error when building the patchset with buildman.
I've figured out the root cause. For some reason which I don't understand, commit bd328eb broke this.
+Joe,
Do you know if there is something wrong with commit bd328eb that accidentally removed 'CONFIG_VENDOR_COREBOOT=y'?
It could perhaps be a merge conflict. If it's needed I can put it back in.
No, it looks Joe's commit is already there in the U-Boot main git repo. I've just worked out a patch to revert the change and sent it to the mailing list.
Regards, Bin
Hi Bin,
On Wed, May 27, 2015 at 10:58 AM, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Wed, May 27, 2015 at 11:53 PM, Simon Glass sjg@chromium.org wrote:
Hi Bin,
On 27 May 2015 at 09:52, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Wed, May 27, 2015 at 12:01 PM, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Wed, May 27, 2015 at 11:57 AM, Simon Glass sjg@chromium.org wrote:
Hi Bin,
On 8 May 2015 at 14:42, Simon Glass sjg@chromium.org wrote:
On 7 May 2015 at 07:34, Bin Meng bmeng.cn@gmail.com wrote: > Now that we have QEMU support, make it the default vendor in the > 'make menuconfig' screen. > > Signed-off-by: Bin Meng bmeng.cn@gmail.com > Acked-by: Simon Glass sjg@chromium.org > Tested-by: Simon Glass sjg@chromium.org > --- > > Changes in v2: None > > arch/x86/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
04: x86: Make QEMU the default vendor x86: + coreboot-x86
+Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2 +make: *** [sub-make] Error 2
That's weird. I didn't see such error when building the patchset with buildman.
I've figured out the root cause. For some reason which I don't understand, commit bd328eb broke this.
+Joe,
Do you know if there is something wrong with commit bd328eb that accidentally removed 'CONFIG_VENDOR_COREBOOT=y'?
It could perhaps be a merge conflict. If it's needed I can put it back in.
No, it looks Joe's commit is already there in the U-Boot main git repo. I've just worked out a patch to revert the change and sent it to the mailing list.
That patch was simply a call to make *_defconfig && make savedefconfig.
The way this usually happens is that the Kconfig file is changed to make the config (for instance CONFIG_VENDOR_COREBOOT) no longer the default, without adding that to the defconfig files.
Cheers, -Joe
participants (3)
-
Bin Meng -
Joe Hershberger -
Simon Glass