diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-07-27 18:33:40 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-07-27 18:33:40 +0930 |
| commit | a244dcdcd45c0b55023095fb6cc3e5dcc0e090b6 (patch) | |
| tree | 57494288cb278239c801632c1c9a98e1cfdbbaa4 /meta-openbmc-machines/meta-openpower/meta-rackspace | |
| parent | 612a6908196e60ee1251a072ba621e167614170f (diff) | |
| download | talos-openbmc-a244dcdcd45c0b55023095fb6cc3e5dcc0e090b6.tar.gz talos-openbmc-a244dcdcd45c0b55023095fb6cc3e5dcc0e090b6.zip | |
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>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/meta-rackspace')
2 files changed, 1 insertions, 14 deletions
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 d861f7478..3254023c3 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 = "ast_g4_config" +UBOOT_MACHINE_barreleye = "ast_g4_ncsi_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch deleted file mode 100644 index dab24f6ce..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-bsp/u-boot/files/u-boot-barreleye.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/drivers/net/aspeednic.c -=================================================================== ---- git.orig/drivers/net/aspeednic.c 2015-10-29 13:23:42.225712001 -0500 -+++ git/drivers/net/aspeednic.c 2015-10-29 13:26:52.205712001 -0500 -@@ -1155,7 +1155,7 @@ - - RESET_DE4X5(dev); - -- aspeednic_probe_phy(dev); -+ //aspeednic_probe_phy(dev); - - set_mac_address (dev, bis); - set_mac_control_register (dev); |
