summaryrefslogtreecommitdiff
path: root/meta-aspeed/conf
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-08-16 06:02:20 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-08-16 16:18:36 +0300
commitf18011c79769f61a48289eb659840246b44b21e9 (patch)
tree20bffd5222cdb0c736e2ad8daddb545c3cdcfc5d /meta-aspeed/conf
parent1e4fec7d2b7f9b7742c74abbf2eca4a6b0e5f757 (diff)
downloadopenbmc-f18011c79769f61a48289eb659840246b44b21e9.tar.xz
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>
Diffstat (limited to 'meta-aspeed/conf')
-rw-r--r--meta-aspeed/conf/machine/include/ast2400.inc2
-rw-r--r--meta-aspeed/conf/machine/include/ast2500.inc2
2 files changed, 0 insertions, 4 deletions
diff --git a/meta-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc
index d315686f2..6284a2b64 100644
--- a/meta-aspeed/conf/machine/include/ast2400.inc
+++ b/meta-aspeed/conf/machine/include/ast2400.inc
@@ -2,5 +2,3 @@ SOC_FAMILY = "aspeed-g4"
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 924b6bfe8..0724157a9 100644
--- a/meta-aspeed/conf/machine/include/ast2500.inc
+++ b/meta-aspeed/conf/machine/include/ast2500.inc
@@ -2,5 +2,3 @@ SOC_FAMILY = "aspeed-g5"
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"