[meta-xilinx] [PATCH][meta-xilinx-bsp] standardize on u-boot "_defconfig" names
Robert P. J. Day
rpjday at crashcourse.ca
Thu Apr 25 07:50:33 PDT 2019
While UBOOT_MACHINE can be set to "<board>_config", the "_config"
suffix is supported in U-Boot only for backward compatibility -- the
proper suffix is, pedantically, "_defconfig". Clearly, these changes
should have no functional effect.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
---
diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
index 73ff40f..b8c08f7 100644
--- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
@@ -21,4 +21,4 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx"
EXTRA_IMAGEDEPENDS += "virtual/bitstream virtual/bootloader"
-UBOOT_MACHINE ?= "microblaze-generic_config"
+UBOOT_MACHINE ?= "microblaze-generic_defconfig"
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index 8869424..a5208a4 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
@@ -12,7 +12,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost"
# u-boot configuration
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-UBOOT_MACHINE = "zynq_microzed_config"
+UBOOT_MACHINE = "zynq_microzed_defconfig"
SPL_BINARY ?= "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index 911bf90..d9d9a50 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
@@ -16,7 +16,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
# u-boot configuration
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-UBOOT_MACHINE = "zynq_picozed_config"
+UBOOT_MACHINE = "zynq_picozed_defconfig"
SPL_BINARY ?= "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index fbd58a6..a022233 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -18,7 +18,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
# u-boot configuration
-UBOOT_MACHINE = "zynq_zc702_config"
+UBOOT_MACHINE = "zynq_zc702_defconfig"
SPL_BINARY ?= "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index 741ef5d..84aae1e 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -19,7 +19,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
# u-boot configuration
-UBOOT_MACHINE = "zynq_zc706_config"
+UBOOT_MACHINE = "zynq_zc706_defconfig"
SPL_BINARY ?= "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index 36c51b7..ec4e0ec 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -15,7 +15,7 @@ require conf/machine/include/machine-xilinx-overrides.inc
require conf/machine/include/machine-xilinx-default.inc
# u-boot configuration
-UBOOT_MACHINE = "zynq_zed_config"
+UBOOT_MACHINE = "zynq_zed_defconfig"
SPL_BINARY ?= "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
index ba355d5..3af3170 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -19,7 +19,7 @@ SERIAL_CONSOLE = "115200 ttyPS0"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
-UBOOT_MACHINE = "zynq_zybo_config"
+UBOOT_MACHINE = "zynq_zybo_defconfig"
SPL_BINARY ?= "spl/boot.bin"
FORCE_PLATFORM_INIT = "1"
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
index 049add9..354cea3 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
@@ -16,7 +16,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
# u-boot configuration
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-UBOOT_MACHINE = "zynq_zybo_config"
+UBOOT_MACHINE = "zynq_zybo_defconfig"
SPL_BINARY ?= "spl/boot.bin"
EXTRA_IMAGEDEPENDS += " \
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
More information about the meta-xilinx
mailing list