Move to u-boot v2016.07-aspeed-openbmc branch

This moves all machines to a new u-boot branch. The u-boot branch is
based on this month's upstream v2016.07 release, and contains cleanups
that get us closer to submitting upstream.

Importantly for the machine configurations, we now have four new
defconfigs that replace the previous targets:

 - ast_g4_ncsi_defconfig: ast2400 with NCSI networking
 - ast_g4_phy_defconfig: ast2400 with directly attached PHY networking
 - ast_g5_ncsi_defconfig: ast2500 with NCSI networking
 - ast_g5_phy_defconfig: ast2500 with directly attached PHY networking

We now support Firestone again with the ast_g4_phy_defconfig.

This commit updates all machines to the new branch and defconfig. It
also removes unused patches that were being made to u-boot, in the case
of barreleye (a patch to aspeednic.c) and palmetto (a modification to
the u-boot environment).

Change-Id: Ic4baf9ae0d5f4046e69cab99d54865771b01cd2a
Signed-off-by: Joel Stanley <joel@jms.id.au>

meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/machine/include/ast2400.inc

@@ -6,7 +6,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
 PREFERRED_VERSION_u-boot ?= "v2016.05+git%"
 PREFERRED_VERSION_u-boot-fw-utils ?= "v2016.05+git%"
 
-UBOOT_MACHINE ?= "ast_g4_config"
+UBOOT_MACHINE ?= "ast_g4_ncsi_config"
 UBOOT_ENTRYPOINT ?= "0x40001000"
 UBOOT_LOADADDRESS ?= "0x40001000"
 

meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc

@@ -4,7 +4,7 @@
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
 
-UBOOT_MACHINE ?= "ast_g5_config"
+UBOOT_MACHINE ?= "ast_g5_ncsi_config"
 UBOOT_ENTRYPOINT ?= "0x80001000"
 UBOOT_LOADADDRESS ?= "0x80001000"
 

meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/machine/evb-ast2500.conf

@@ -1,6 +1,8 @@
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = "${KMACHINE}-ast2500-evb.dtb"
 
+UBOOT_MACHINE = "ast_g5_phy_config"
+
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/sample.inc

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 = "ast_g4_config"
+UBOOT_MACHINE_firestone = "ast_g4_phy_config"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_LOADADDRESS = "0x40008000"
 

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 = "ast_g4_config"
+UBOOT_MACHINE_garrison = "ast_g4_ncsi_config"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_LOADADDRESS = "0x40008000"
 

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 = "ast_g4_config"
+UBOOT_MACHINE_palmetto = "ast_g4_ncsi_config"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_LOADADDRESS = "0x40008000"
 

meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf

@@ -1,7 +1,7 @@
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
 
-UBOOT_MACHINE = "witherspoon_bmc_config"
+UBOOT_MACHINE = "ast_g5_ncsi_config"
 
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc

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 = "ast_g4_config"
+UBOOT_MACHINE_barreleye = "ast_g4_ncsi_config"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_LOADADDRESS = "0x40008000"
 

meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb → meta-phosphor/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb

@@ -4,11 +4,11 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 SECTION = "bootloader"
 DEPENDS = "mtd-utils"
 
-SRCREV = "3f04d9fef7bbfec3a536337e7fc1b3492d20e331"
-UBRANCH = "v2016.05-aspeed-openbmc"
+SRCREV = "f9b2a49f57c153c7358f9769234c0cefdf4de8d4"
+UBRANCH = "v2016.07-aspeed-openbmc"
 SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
 
-PV = "v2016.05+git${SRCPV}"
+PV = "v2016.07+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 

meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb → meta-phosphor/common/recipes-bsp/u-boot/u-boot-mkimage_2016.07.bb

@@ -5,11 +5,11 @@ SECTION = "bootloader"
 
 DEPENDS = "openssl"
 
-SRCREV = "47441cc36bb8e919a066837e4d7c5a8a1c475da4"
-UBRANCH = "v2016.05-ast2500"
+SRCREV = "f9b2a49f57c153c7358f9769234c0cefdf4de8d4"
+UBRANCH = "v2016.07-aspeed-openbmc"
 SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
 
-PV = "v2016.05+git${SRCPV}"
+PV = "v2016.07+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 

meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.05.bb → meta-phosphor/common/recipes-bsp/u-boot/u-boot_2016.07.bb

@@ -3,10 +3,8 @@ require recipes-bsp/u-boot/u-boot.inc
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 DEPENDS += "dtc-native"
 
-SRCREV = "3f04d9fef7bbfec3a536337e7fc1b3492d20e331"
-UBRANCH = "v2016.05-aspeed-openbmc"
+SRCREV = "f9b2a49f57c153c7358f9769234c0cefdf4de8d4"
+UBRANCH = "v2016.07-aspeed-openbmc"
 SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
 
-PV = "v2016.05+git${SRCPV}"
-
-EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline"
+PV = "v2016.07+git${SRCPV}"