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

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

diff --git a/meta-fsl-ppc/conf/machine/mpc8536ds.conf b/meta-fsl-ppc/conf/machine/mpc8536ds.conf
index bc74b8da6a95026aa91080e5f8c15a3c0639c668..aef057ad47d023f67e166a5d5b52664589d13c17 100644 (file)
--- 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 2199dcc5695c5f00589109d6f4c363c3f29ad5b6..3d5d26ea95d77cc28aff2b8099a1b2d57da9bee5 100644 (file)
--- 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 01a5cc6180699c91515965f99644d6e2b14fa01f..007c3bc9a39ef03e99c47a4f3041a1be3f3ebec3 100644 (file)
--- 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 65033ea2721edd1122234eb90dc83529509f2c31..cefcdcc03200acab2d7d2296afbb4809bfd26569 100644 (file)
--- 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 85253000bc45a4eb671515acb4b64364695003c9..a56f7b7ccb0e1da03c62e873de46101831a6728a 100644 (file)
--- 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 57d826fd5afe97cb08bbf4f847354ef3da38bb0f..d7c411977e10a34c6bf1045c10a78c2388e09405 100644 (file)
--- 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 c4cf9c5a7742f439e3e355cd6681b9aa7ed781c1..0ebe32c8d75a7f9cb3198cea9a97a9a4a7827997 100644 (file)
--- 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 af67986940198fe8a59e32de1e9813e237289aae..fc71ddd5ea396ddf2fe11ba5382388bed86d9b41 100644 (file)
--- 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 0d9349eca51bba7e31d185e1fb4616a9abd364b1..cecbf5808727e25d4e3f125285207241c52a0cb9 100644 (file)
--- 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 7d7b6af79e89bf427d68a2cf9602a3b6336e94da..fa93d316db2110b5eef5da4cd5771aec1edb8a66 100644 (file)
--- 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 f2397ef2717c61a6385f5eaf0a754327f500bc9c..5f97c465c88991f428f2e936c51e66c28406908c 100644 (file)
--- 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 98b5ea24713b80135a789b65d9b5e9914c9e271d..37b271772037773a273072392eedae4ee5f27bdd 100644 (file)
--- 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 b5231fa25f2ce1fc857fe97d0b72076c5e51b8e7..bc1b4246685b3fad3b9fdcad20ecf041509e4227 100644 (file)
--- 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 bedb3da3f2394cbb7330ac1e3c17684072998f80..80c54cefddfba30e5367edcff783f099e2217c7c 100644 (file)
--- 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 52e2e11e2c929d3e2cb9b661f50a154b3f8e3369..09e56804dbc9ccd17b6dfb4a283f179dc155eec6 100644 (file)
--- 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 6854da349a622351b246b5555783f146a21c8b9a..b4f12648f5cc3def2557d654378da105df954038 100644 (file)
--- 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 35b6feb4c3700d0167fabb996c23c010b5581c4e..2f2c605b1d55e7c4f2d72c7031440cd028ead8b3 100644 (file)
--- 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 0de03042543f6dbb5b5ef205ab0e00953f3195d8..0d29de27c73ee04de7b200ba0f69a5c2f05c6c9e 100644 (file)
--- 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 46b3187c9d50d9f6f79b22c4de61394133cf05f3..9ab471104fbc77e3931447f01163d89e62cdcbc8 100644 (file)
--- 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 7b5ed832bbfe60d1aafba3999b3d19b7e92909bb..45d1ea710b6b639eb35a1fa9fc62fb9d812fb511 100644 (file)
--- 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 41f4ad2c36b7ee5a80cee82b37d7bdb395515631..091f81f7beb0c4b152c3a5967312ad819f316bfc 100644 (file)
--- 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 dd09e34103b54fc353da3f71006bb00ba58e234b..f06b47a68a87b0c34c367c5386e7543732c98626 100644 (file)
--- 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"