diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
index 49edfd61..25147926 100644
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -13,7 +13,8 @@ MACHINE_GUI_CLASS = "bigscreen"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-UBOOT_MACHINE = "am335x_boneblack_config"
+# fall back on generic am335x_evm_config for now
+#UBOOT_MACHINE = "am335x_boneblack_config"
 
 WKS_FILE = "sdimage-bootpart.wks"
 IMAGE_BOOT_FILES = "MLO u-boot.img"