summaryrefslogtreecommitdiff
path: root/meta-evb
diff options
context:
space:
mode:
Diffstat (limited to 'meta-evb')
-rw-r--r--meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample2
-rw-r--r--meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf9
2 files changed, 2 insertions, 9 deletions
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample
index 6a12c601e..0844090b0 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample
@@ -19,3 +19,5 @@ INHERIT += "extrausers"
EXTRA_USERS_PARAMS = " \
usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
"
+
+require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf
deleted file mode 100644
index 3d88c8702..000000000
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-ast2500-evb.dtb"
-
-UBOOT_MACHINE = "ast_g5_phy_config"
-
-FLASH_SIZE = "32768"
-
-require conf/machine/include/ast2500.inc
-require conf/machine/include/obmc-bsp-common.inc