From 30b49e9696e82869cffc9994d7b5391d75c13dec Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 28 May 2020 10:01:46 +0200 Subject: machines: u-boot: use full config name U-Boot used to be configured by 'make _config', however with the move integration of the Kconfig system that changed to use a config file ending in _defconfig. Usually those names are _defconfig. So nowadays one configures with 'make _defconfig'. If make is called with _config that is silently changed to _defconfig. Change our config targets to the new name to prevent confusion. Signed-off-by: Max Krummenacher --- conf/machine/apalis-imx8.conf | 2 +- conf/machine/apalis-imx8x.conf | 2 +- conf/machine/colibri-imx8x.conf | 2 +- conf/machine/verdin-imx8mm.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf index 01d0cc5..72bab16 100644 --- a/conf/machine/apalis-imx8.conf +++ b/conf/machine/apalis-imx8.conf @@ -29,7 +29,7 @@ KERNEL_DEVICETREE = " \ UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "apalis-imx8_config,sdcard" +UBOOT_CONFIG[sd] = "apalis-imx8_defconfig,sdcard" UBOOT_ENTRYPOINT = "0x80280000" UBOOT_RD_LOADADDRESS = "0xA0000000" diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf index 2505c82..e7439f1 100644 --- a/conf/machine/apalis-imx8x.conf +++ b/conf/machine/apalis-imx8x.conf @@ -29,7 +29,7 @@ KERNEL_DEVICETREE = " \ UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "apalis-imx8x_config,sdcard" +UBOOT_CONFIG[sd] = "apalis-imx8x_defconfig,sdcard" UBOOT_ENTRYPOINT = "0x80280000" UBOOT_RD_LOADADDRESS = "0xA0000000" diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index f9982d1..f0358da 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -35,7 +35,7 @@ KERNEL_DEVICETREE_use-mainline-bsp = "freescale/imx8qxp-colibri-eval-v3.dtb" UBOOT_SUFFIX = "bin" UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "colibri-imx8qxp_config,sdcard" +UBOOT_CONFIG[sd] = "colibri-imx8qxp_defconfig,sdcard" UBOOT_ENTRYPOINT = "0x80280000" UBOOT_RD_LOADADDRESS = "0xA0000000" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index 5ec6ba5..333e517 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -22,7 +22,7 @@ KERNEL_DEVICETREE = " \ " UBOOT_CONFIG ??= "sd" -UBOOT_CONFIG[sd] = "verdin-imx8mm_config,sdcard" +UBOOT_CONFIG[sd] = "verdin-imx8mm_defconfig,sdcard" SPL_BINARY = "spl/u-boot-spl.bin" UBOOT_ENTRYPOINT = "0x80280000" -- cgit v1.2.3