[U-Boot] [PATCH v3] qemu-x86: Use config_distro_bootcmd

Heinrich Schuchardt
2019-08-14T04:14:56Z

On 7/19/19 11:46 AM, Bin Meng wrote:
> On Wed, Jul 17, 2019 at 1:43 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>>
>> On Thu, Jul 4, 2019 at 1:46 AM Joshua Watt <jpewhacker@gmail.com> wrote:
>>>
>>> Converts qemu x86 machines to boot using distro_config. The intent is to
>>> allow u-boot in qemu to be maximally compatible with many boot methods
>>> without having to change the config. Previously, u-boot would only boot
>>> in a very limited set of circumstances where there was a /boot/vmlinuz
>>> on scsi 0:3 with no ramdisk.
>>>
>>> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
>>> ---
>>> configs/qemu-x86_64_defconfig | 1 +
>>> configs/qemu-x86_defconfig | 1 +
>>> doc/README.x86 | 17 +++++++++++++++++
>>> include/configs/qemu-x86.h | 25 +++++++++++++++++++++++++
>>> 4 files changed, 44 insertions(+)
>>>
>>
>> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
>
> applied to u-boot-x86, thanks!
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>

This patch leads to a build error when building with
CONFIG_DISTRO_DEFAULTS=n.

In file included from include/configs/qemu-x86.h:23,
from include/config.h:5,
from include/common.h:23,
from lib/asm-offsets.c:14:
include/configs/x86-common.h:109: error: "BOOTENV" redefined [-Werror]
#define BOOTENV

In file included from include/configs/qemu-x86.h:22,
from include/config.h:5,
from include/common.h:23,
from lib/asm-offsets.c:14:
include/config_distro_bootcmd.h:407: note: this is the location of the
previous definition
#define BOOTENV \

I am glad that qemu-x86 now can use distro defaults. But I would not
expect a build error due to a legal configuration choice.

If you do not want to retain backwards compatibility you could 'select
DISTRO_DEFAULTS' in board/emulation/Kconfig. This way distro defaults
would no longer be deselectable for qemu-x86.

Best regards

Heinrich