diff options
11 files changed, 26 insertions, 22 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" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf index 42f2d295c..fa0d35e6e 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/conf/machine/firestone.conf @@ -5,7 +5,7 @@ require conf/machine/include/ast2400.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/ibm.inc -UBOOT_MACHINE_firestone = "palmetto_config" +UBOOT_MACHINE_firestone = "ast_g4_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf index 4fd03fd13..820a5137e 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf @@ -5,7 +5,7 @@ require conf/machine/include/ast2400.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/ibm.inc -UBOOT_MACHINE_garrison = "palmetto_config" +UBOOT_MACHINE_garrison = "ast_g4_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf index f6256a771..e69a9affb 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf @@ -5,7 +5,7 @@ require conf/machine/include/ast2400.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/ibm.inc -UBOOT_MACHINE_palmetto = "palmetto_config" +UBOOT_MACHINE_palmetto = "ast_g4_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf index f9d31f1f8..d861f7478 100644 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf @@ -5,7 +5,7 @@ require conf/machine/include/ast2400.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/rackspace.inc -UBOOT_MACHINE_barreleye = "palmetto_config" +UBOOT_MACHINE_barreleye = "ast_g4_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb index 80d90fa3e..c24023641 100644 --- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb +++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" SECTION = "bootloader" DEPENDS = "mtd-utils" -SRCREV = "47441cc36bb8e919a066837e4d7c5a8a1c475da4" -UBRANCH = "v2016.05-ast2500" +SRCREV = "3f04d9fef7bbfec3a536337e7fc1b3492d20e331" +UBRANCH = "v2016.05-aspeed-openbmc" SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" PV = "v2016.05+git${SRCPV}" diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb index f1d631805..bb97e8ba2 100644 --- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb +++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb @@ -3,8 +3,8 @@ require recipes-bsp/u-boot/u-boot.inc LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" DEPENDS += "dtc-native" -SRCREV = "47441cc36bb8e919a066837e4d7c5a8a1c475da4" -UBRANCH = "v2016.05-ast2500" +SRCREV = "3f04d9fef7bbfec3a536337e7fc1b3492d20e331" +UBRANCH = "v2016.05-aspeed-openbmc" SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" PV = "v2016.05+git${SRCPV}" |
