aspeed: drop g4/g5 UBOOT_MACHINE defaults
The u-boot config is a property of the board and not the SOC. Don't set
a default in the g4 and g5 include files. This ensures that BSP users
explicitly select a uboot config capable of booting the board.
(From meta-aspeed rev: 6203fbdba652e2f7943b55b067b2e91247c795e1)
Change-Id: I7b07019eb7428d8c38268e8dbed0ff5d05f3a7a2
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc
index d315686..6284a2b 100644
--- a/meta-aspeed/conf/machine/include/ast2400.inc
+++ b/meta-aspeed/conf/machine/include/ast2400.inc
@@ -2,5 +2,3 @@
include conf/machine/include/soc-family.inc
require conf/machine/include/aspeed.inc
require conf/machine/include/tune-arm926ejs.inc
-
-UBOOT_MACHINE ?= "ast_g4_ncsi_config"
diff --git a/meta-aspeed/conf/machine/include/ast2500.inc b/meta-aspeed/conf/machine/include/ast2500.inc
index 924b6bf..0724157 100644
--- a/meta-aspeed/conf/machine/include/ast2500.inc
+++ b/meta-aspeed/conf/machine/include/ast2500.inc
@@ -2,5 +2,3 @@
include conf/machine/include/soc-family.inc
require conf/machine/include/aspeed.inc
require conf/machine/include/tune-arm1176jz-s.inc
-
-UBOOT_MACHINE ?= "ast_g5_ncsi_config"