[PATCH openbmc v5 10/11] u-boot: Upgrade AST2400 machines to 2016.15 tree.

[Joel Stanley]

On Fri, Jun 24, 2016 at 6:10 AM, OpenBMC Patches
<openbmc-patches at stwcx.xyz> wrote:
> From: Patrick Williams <patrick at stwcx.xyz>
>
> Move 2016.15 tree to point at the latest openbmc commit and point
> all AST2400 machines to it.
>
> Signed-off-by: Patrick Williams <patrick at stwcx.xyz>
> ---
>  .../meta-ast2400/conf/machine/include/ast2400.inc            |  6 +++---
>  .../recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend            | 12 ++++++++++++
>  .../recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend     | 10 ----------
>  .../meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend        |  3 +++
>  .../meta-ast2400/recipes-bsp/u-boot/u-boot_2013.07%.bbappend |  1 -
>  .../meta-ibm/meta-firestone/conf/machine/firestone.conf      |  2 +-
>  .../meta-ibm/meta-garrison/conf/machine/garrison.conf        |  2 +-
>  .../meta-ibm/meta-palmetto/conf/machine/palmetto.conf        |  2 +-
>  .../meta-barreleye/conf/machine/barreleye.conf               |  2 +-
>  .../common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb     |  4 ++--
>  meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb    |  4 ++--
>  11 files changed, 26 insertions(+), 22 deletions(-)
>  create mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
>  create mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend
>
> 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 8510a03..d67959a 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%"

Should this be the branch name? The branch is called v2016.05-aspeed-openbmc.

> -UBOOT_MACHINE ?= "palmetto_config"
> +UBOOT_MACHINE ?= "ast_g4_config"

As I mentioned in my status update, I didn't do the best job of naming
the defconfigs. ast_g4_config is for ast2400 systems that use NC-SI,
which means it's no good for firestone or the facebook machines.

Do you want me to rename the config ast_g4_ncsi_config? Or leave it
for now, and we can clean it up once the u-boot tree is in order.

I would lean towards leaving it for now as once u-boot is cleaned up
to use the Kconfig system, we can have the yocto machines select the
option they require.

>  UBOOT_ENTRYPOINT ?= "0x40001000"
>  UBOOT_LOADADDRESS ?= "0x40001000"


> 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 42f2d29..fa0d35e 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"

As above; firestone uses a dedicated phy instead of NC-SI. Machines
won't have network if they update to this.

I can add add a new system to u-boot, or I can send a patch that hacks
at the machine.

>  UBOOT_ENTRYPOINT = "0x40008000"
>  UBOOT_LOADADDRESS = "0x40008000"
>