u-boot: change UBOOT_MACHINES to use ?= so they can be overridden

Signed-off-by: Matthew McClintock <msm@freescale.com>

22 files changed, 22 insertions, 22 deletions

diff --git a/meta-fsl-ppc/conf/machine/mpc8536ds.conf b/meta-fsl-ppc/conf/machine/mpc8536ds.conf
index bc74b8da..aef057ad 100644
--- a/meta-fsl-ppc/conf/machine/mpc8536ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8536ds.conf
@@ -5,7 +5,7 @@
 require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr2_512m_mpc8536ds_667M.dat"
-UBOOT_MACHINES = "MPC8536DS MPC8536DS_36BIT MPC8536DS_NAND MPC8536DS_SDCARD MPC8536DS_SPIFLASH"
+UBOOT_MACHINES ?= "MPC8536DS MPC8536DS_36BIT MPC8536DS_NAND MPC8536DS_SDCARD MPC8536DS_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8536ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/mpc8544ds.conf b/meta-fsl-ppc/conf/machine/mpc8544ds.conf
index 2199dcc5..3d5d26ea 100644
--- a/meta-fsl-ppc/conf/machine/mpc8544ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8544ds.conf
@@ -4,7 +4,7 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "MPC8544DS"
+UBOOT_MACHINES ?= "MPC8544DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8544ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/mpc8548cds.conf b/meta-fsl-ppc/conf/machine/mpc8548cds.conf
index 01a5cc61..007c3bc9 100644
--- a/meta-fsl-ppc/conf/machine/mpc8548cds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8548cds.conf
@@ -4,7 +4,7 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "MPC8548CDS"
+UBOOT_MACHINES ?= "MPC8548CDS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8548cds_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/mpc8572ds.conf b/meta-fsl-ppc/conf/machine/mpc8572ds.conf
index 65033ea2..cefcdcc0 100644
--- a/meta-fsl-ppc/conf/machine/mpc8572ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8572ds.conf
@@ -3,7 +3,7 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "MPC8572DS"
+UBOOT_MACHINES ?= "MPC8572DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8572ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p1010rdb.conf b/meta-fsl-ppc/conf/machine/p1010rdb.conf
index 85253000..a56f7b7c 100644
--- a/meta-fsl-ppc/conf/machine/p1010rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1010rdb.conf
@@ -4,7 +4,7 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "P1010RDB_NAND"
+UBOOT_MACHINES ?= "P1010RDB_NAND"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1010rdb.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p1020mbg.conf b/meta-fsl-ppc/conf/machine/p1020mbg.conf
index 57d826fd..d7c41197 100644
--- a/meta-fsl-ppc/conf/machine/p1020mbg.conf
+++ b/meta-fsl-ppc/conf/machine/p1020mbg.conf
@@ -5,7 +5,7 @@
 require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
-UBOOT_MACHINES = "P1020MBG-PC P1020MBG-PC_SDCARD P1020MBG-PC_36BIT P1020MBG-PC_36BIT_SDCARD"
+UBOOT_MACHINES ?= "P1020MBG-PC P1020MBG-PC_SDCARD P1020MBG-PC_36BIT P1020MBG-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020mbg-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf
index c4cf9c5a..0ebe32c8 100644
--- a/meta-fsl-ppc/conf/machine/p1020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1020rdb.conf
@@ -4,7 +4,7 @@
 require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
-UBOOT_MACHINES = " P1020RDB-PC P1020RDB-PC_SPIFLASH P1020RDB-PC_NAND P1020RDB-PC_SDCARD P1020RDB-PC_36BIT P1020RDB-PC_36BIT_SPIFLASH P1020RDB-PC_36BIT_NAND P1020RDB-PC_36BIT_SDCARD"
+UBOOT_MACHINES ?= " P1020RDB-PC P1020RDB-PC_SPIFLASH P1020RDB-PC_NAND P1020RDB-PC_SDCARD P1020RDB-PC_36BIT P1020RDB-PC_36BIT_SPIFLASH P1020RDB-PC_36BIT_NAND P1020RDB-PC_36BIT_SDCARD"
 
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020rdb-pc_32b.dts"
 
diff --git a/meta-fsl-ppc/conf/machine/p1020utm.conf b/meta-fsl-ppc/conf/machine/p1020utm.conf
index af679869..fc71ddd5 100644
--- a/meta-fsl-ppc/conf/machine/p1020utm.conf
+++ b/meta-fsl-ppc/conf/machine/p1020utm.conf
@@ -5,7 +5,7 @@
 require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
-UBOOT_MACHINES = "P1020UTM-PC P1020UTM-PC_SDCARD P1020UTM-PC_36BIT P1020UTM-PC_36BIT_SDCARD"
+UBOOT_MACHINES ?= "P1020UTM-PC P1020UTM-PC_SDCARD P1020UTM-PC_36BIT P1020UTM-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020utm-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p1021rdb.conf b/meta-fsl-ppc/conf/machine/p1021rdb.conf
index 0d9349ec..cecbf580 100644
--- a/meta-fsl-ppc/conf/machine/p1021rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1021rdb.conf
@@ -4,7 +4,7 @@
 
 require e500v2.inc
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
-UBOOT_MACHINES = "P1021RDB-PC P1021RDB-PC_NAND P1021RDB-PC_SDCARD P1021RDB-PC_SPIFLASH P1021RDB-PC_36BIT P1021RDB-PC_36BIT_SPIFLASH P1021RDB-PC_36BIT_NAND P1021RDB-PC_36BIT_SDCARD"
+UBOOT_MACHINES ?= "P1021RDB-PC P1021RDB-PC_NAND P1021RDB-PC_SDCARD P1021RDB-PC_SPIFLASH P1021RDB-PC_36BIT P1021RDB-PC_36BIT_SPIFLASH P1021RDB-PC_36BIT_NAND P1021RDB-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1021rdb-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf
index 7d7b6af7..fa93d316 100644
--- a/meta-fsl-ppc/conf/machine/p1022ds.conf
+++ b/meta-fsl-ppc/conf/machine/p1022ds.conf
@@ -4,7 +4,7 @@
 require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_2gb_p1022ds.dat"
-UBOOT_MACHINES = "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_36BIT P1022DS_36BIT_SPIFLASH P1022DS_36BIT_NAND P1022DS_36BIT_SDCARD"
+UBOOT_MACHINES ?= "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_36BIT P1022DS_36BIT_SPIFLASH P1022DS_36BIT_NAND P1022DS_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1022ds_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p1023rds.conf b/meta-fsl-ppc/conf/machine/p1023rds.conf
index f2397ef2..5f97c465 100644
--- a/meta-fsl-ppc/conf/machine/p1023rds.conf
+++ b/meta-fsl-ppc/conf/machine/p1023rds.conf
@@ -3,7 +3,7 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "P1023RDS P1023RDS_NAND"
+UBOOT_MACHINES ?= "P1023RDS P1023RDS_NAND"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1023rds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/p1023rds_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p1024rdb.conf b/meta-fsl-ppc/conf/machine/p1024rdb.conf
index 98b5ea24..37b27177 100644
--- a/meta-fsl-ppc/conf/machine/p1024rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1024rdb.conf
@@ -5,7 +5,7 @@
 require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
-UBOOT_MACHINES = "P1024RDB P1024RDB_36BIT P1024RDB_NAND P1024RDB_SDCARD P1024RDB_SPIFLASH"
+UBOOT_MACHINES ?= "P1024RDB P1024RDB_36BIT P1024RDB_NAND P1024RDB_SDCARD P1024RDB_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1024rdb_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p1025rdb.conf b/meta-fsl-ppc/conf/machine/p1025rdb.conf
index b5231fa2..bc1b4246 100644
--- a/meta-fsl-ppc/conf/machine/p1025rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1025rdb.conf
@@ -6,7 +6,7 @@ require e500v2.inc
 
 
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
-UBOOT_MACHINES = "P1025RDB P1025RDB_36BIT P1025RDB_NAND P1025RDB_SDCARD P1025RDB_SPIFLASH"
+UBOOT_MACHINES ?= "P1025RDB P1025RDB_36BIT P1025RDB_NAND P1025RDB_SDCARD P1025RDB_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1025rdb_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p2020ds.conf b/meta-fsl-ppc/conf/machine/p2020ds.conf
index bedb3da3..80c54cef 100644
--- a/meta-fsl-ppc/conf/machine/p2020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p2020ds.conf
@@ -4,7 +4,7 @@
 require e500v2.inc
 BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"
 
-UBOOT_MACHINES = "P2020DS P2020DS_36BIT P2020DS_DDR2 P2020DS_SDCARD P2020DS_SPIFLASH"
+UBOOT_MACHINES ?= "P2020DS P2020DS_36BIT P2020DS_DDR2 P2020DS_SDCARD P2020DS_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p2020rdb.conf b/meta-fsl-ppc/conf/machine/p2020rdb.conf
index 52e2e11e..09e56804 100644
--- a/meta-fsl-ppc/conf/machine/p2020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2020rdb.conf
@@ -5,7 +5,7 @@
 require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_64bit_p2020rdb_pc.dat"
-UBOOT_MACHINES = " P2020RDB-PC P2020RDB-PC_NAND P2020RDB-PC_SDCARD P2020RDB-PC_SPIFLASH P2020RDB-PC_36BIT P2020RDB-PC_36BIT_SPIFLASH P2020RDB-PC_36BIT_NAND P2020RDB-PC_36BIT_SDCARD"
+UBOOT_MACHINES ?= " P2020RDB-PC P2020RDB-PC_NAND P2020RDB-PC_SDCARD P2020RDB-PC_SPIFLASH P2020RDB-PC_36BIT P2020RDB-PC_36BIT_SPIFLASH P2020RDB-PC_36BIT_NAND P2020RDB-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p2041rdb.conf b/meta-fsl-ppc/conf/machine/p2041rdb.conf
index 6854da34..b4f12648 100644
--- a/meta-fsl-ppc/conf/machine/p2041rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2041rdb.conf
@@ -3,7 +3,7 @@
 
 require e500mc.inc
 
-UBOOT_MACHINES = "P2041RDB P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH"
+UBOOT_MACHINES ?= "P2041RDB P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2041rdb.dts \
         ${S}/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
diff --git a/meta-fsl-ppc/conf/machine/p3041ds.conf b/meta-fsl-ppc/conf/machine/p3041ds.conf
index 35b6feb4..2f2c605b 100644
--- a/meta-fsl-ppc/conf/machine/p3041ds.conf
+++ b/meta-fsl-ppc/conf/machine/p3041ds.conf
@@ -3,7 +3,7 @@
 
 require e500mc.inc
 
-UBOOT_MACHINES = "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH"
+UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3041ds.dts \
         ${S}/arch/powerpc/boot/dts/p3041ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
diff --git a/meta-fsl-ppc/conf/machine/p4080ds.conf b/meta-fsl-ppc/conf/machine/p4080ds.conf
index 0de03042..0d29de27 100644
--- a/meta-fsl-ppc/conf/machine/p4080ds.conf
+++ b/meta-fsl-ppc/conf/machine/p4080ds.conf
@@ -3,7 +3,7 @@
 
 require e500mc.inc
 
-UBOOT_MACHINES = "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH "
+UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH "
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p4080ds.dts \
         ${S}/arch/powerpc/boot/dts/p4080ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
index 46b3187c..9ab47110 100644
--- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
@@ -4,7 +4,7 @@
 require e5500-64b.inc
 
 # TODO: fix 32bit build of u-boot for p5020ds-64b
-UBOOT_MACHINES = "P5020DS"
+UBOOT_MACHINES ?= "P5020DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \
         ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
diff --git a/meta-fsl-ppc/conf/machine/p5020ds.conf b/meta-fsl-ppc/conf/machine/p5020ds.conf
index 7b5ed832..45d1ea71 100644
--- a/meta-fsl-ppc/conf/machine/p5020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds.conf
@@ -3,7 +3,7 @@
 
 require e5500.inc
 
-UBOOT_MACHINES = "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH "
+UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH "
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \
         ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
diff --git a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
index 41f4ad2c..091f81f7 100644
--- a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
@@ -3,7 +3,7 @@
 
 require e5500-64b.inc
 
-UBOOT_MACHINES = "P5040DS"
+UBOOT_MACHINES ?= "P5040DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \
         ${S}/arch/powerpc/boot/dts/p5040ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
diff --git a/meta-fsl-ppc/conf/machine/p5040ds.conf b/meta-fsl-ppc/conf/machine/p5040ds.conf
index dd09e341..f06b47a6 100644
--- a/meta-fsl-ppc/conf/machine/p5040ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds.conf
@@ -3,7 +3,7 @@
 
 require e5500.inc
 
-UBOOT_MACHINES = "P5040DS"
+UBOOT_MACHINES ?= "P5040DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \
         ${S}/arch/powerpc/boot/dts/p5040ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"