diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-06-21 11:13:49 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-06-24 15:22:18 -0500 |
| commit | 084df1b03b90c10283a7dcfc3867de3af98ea81d (patch) | |
| tree | f4e7f13db95c24e6b7b08179508f0fe2ca961d64 /meta-openbmc-bsp | |
| parent | f5139092b16dd06a04a3c35282f69f697ae08b39 (diff) | |
| download | talos-openbmc-084df1b03b90c10283a7dcfc3867de3af98ea81d.tar.gz talos-openbmc-084df1b03b90c10283a7dcfc3867de3af98ea81d.zip | |
u-boot: Upgrade AST2400 machines to 2016.05 tree.
Move 2016.05 tree to point at the latest openbmc commit and point
all AST2400 machines to it.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-openbmc-bsp')
5 files changed, 18 insertions, 14 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc index 8510a03fb..d67959a02 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc @@ -4,10 +4,10 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc" PREFERRED_VERSION_linux-obmc ?= "4.4+git%" -PREFERRED_VERSION_u-boot ?= "v2013.07+git%" -PREFERRED_VERSION_u-boot-fw-utils ?= "v2013.07+git%" +PREFERRED_VERSION_u-boot ?= "v2016.05+git%" +PREFERRED_VERSION_u-boot-fw-utils ?= "v2016.05+git%" -UBOOT_MACHINE ?= "palmetto_config" +UBOOT_MACHINE ?= "ast_g4_config" UBOOT_ENTRYPOINT ?= "0x40001000" UBOOT_LOADADDRESS ?= "0x40001000" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend new file mode 100644 index 000000000..070f389c5 --- /dev/null +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://fw_env.config" + +do_install_append() { + if [ -e ${WORKDIR}/fw_env.config ] ; then + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + fi +} + +BBCLASSEXTEND += "native" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend index 40206967c..77fcfefec 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend @@ -1,13 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://fw_env.config" SRC_URI += "file://config.patch" - -do_install_append() { - if [ -e ${WORKDIR}/fw_env.config ] ; then - install -d ${D}${sysconfdir} - install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config - fi -} - -BBCLASSEXTEND += "native" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend new file mode 100644 index 000000000..ef6a70950 --- /dev/null +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://fw_env.config" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend index 42a4704d6..77fcfefec 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend @@ -1,4 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://fw_env.config" SRC_URI += "file://config.patch" |
