This series fixes a couple of kconfig errors that I observed while
invoking a build with a defconfig and config fragment.

I invoked the build as follows:

cat > xen/arch/arm/configs/custom.config <<EOF
CONFIG_DEBUG=y
CONFIG_SCHED_ARINC653=y
CONFIG_EARLY_PRINTK_ZYNQMP=y
EOF
make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig custom.config
make XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- dist-xen -j $(nproc)

Stewart Hildebrand (2):
  xen/build: fixup path to merge_config.sh
  xen/build: use the correct kconfig makefile

 xen/tools/kconfig/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.26.2

On Tue, May 12, 2020 at 01:52:04PM -0400, Stewart Hildebrand wrote:
> This series fixes a couple of kconfig errors that I observed while
> invoking a build with a defconfig and config fragment.
> 
> I invoked the build as follows:
> 
> cat > xen/arch/arm/configs/custom.config <<EOF
> CONFIG_DEBUG=y
> CONFIG_SCHED_ARINC653=y
> CONFIG_EARLY_PRINTK_ZYNQMP=y
> EOF
> make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig custom.config

Thanks for the patches.

FYI, `make defconfig custom.config` doesn't work as expected with the Xen
build system, it doesn't deal with this use case like Linux's one does.
There is no guaranty that "defconfig" will be made before "custom.config".
It would be better to run `make defconfig && make custom.config`, or
maybe use -j1, until this is properly handled. That's what is done by
kbuild.

Cheers,

-- 
Anthony PERARD