diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
commit | 9722c6ee87766a45a337c094d1293de81cdcb106 (patch) | |
tree | 08b57716ae3c02fef2bc870b634019e692fd70e6 /meta-aspeed/conf/machine/include/ast2600.inc | |
parent | 35e295e2a161fcf146ea031de53431b2888521fa (diff) | |
parent | 5b6cc97bf138293b6af12d5d3003bb66c700c48a (diff) | |
download | openbmc-9722c6ee87766a45a337c094d1293de81cdcb106.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into HEAD
Diffstat (limited to 'meta-aspeed/conf/machine/include/ast2600.inc')
-rw-r--r-- | meta-aspeed/conf/machine/include/ast2600.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/meta-aspeed/conf/machine/include/ast2600.inc b/meta-aspeed/conf/machine/include/ast2600.inc index 2dcaaf613..fff5465d9 100644 --- a/meta-aspeed/conf/machine/include/ast2600.inc +++ b/meta-aspeed/conf/machine/include/ast2600.inc @@ -1,7 +1,4 @@ SOC_FAMILY = "aspeed-g6" include conf/machine/include/soc-family.inc require conf/machine/include/aspeed.inc -require conf/machine/include/tune-cortexa7.inc - -UBOOT_ENTRYPOINT = "0x80001000" -UBOOT_LOADADDRESS = "0x80001000" +include conf/machine/include/arm/arch-armv7a.inc |