From a244dcdcd45c0b55023095fb6cc3e5dcc0e090b6 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 27 Jul 2016 18:33:40 +0930 Subject: 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 --- .../meta-ast2400/recipes-bsp/u-boot/files/config.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch (limited to 'meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot') diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch deleted file mode 100644 index c5216e7d6..000000000 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/config.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/include/configs/palmetto.h -+++ b/include/configs/palmetto.h -@@ -96,11 +96,8 @@ - #define CONFIG_UPDATE "tftp 40800000 ast2400.scr; so 40800000'" - - #define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */ --#define CONFIG_AUTOBOOT_KEYED - #define CONFIG_AUTOBOOT_PROMPT \ - "autoboot in %d seconds (stop with 'Delete' key)...\n", bootdelay --#define CONFIG_AUTOBOOT_STOP_STR "\x1b\x5b\x33\x7e" /* 'Delete', ESC[3~ */ --#define CONFIG_ZERO_BOOTDELAY_CHECK - - #ifdef CONFIG_FLASH_AST2300 - #define CONFIG_BOOTCOMMAND "bootm 20080000 20300000" -- cgit v1.2.1