Update to internal 0.43

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
author: Jason M. Bills <jason.m.bills@linux.intel.com> 2021-03-26 01:45:09 +0300
committer: Jason M. Bills <jason.m.bills@linux.intel.com> 2021-03-27 01:41:36 +0300
commit: 12bef3e1bf292dec5ac15af9fb41e86f7bcfb0cb (patch)
tree: 608a905372f3f545d2686e29512ae3f5f5b4a78c /meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot
parent: 0a1ece0568a37de9f17fd6e0bcdfd2cad2c6503f (diff)
download: openbmc-12bef3e1bf292dec5ac15af9fb41e86f7bcfb0cb.tar.xz
50 files changed, 343 insertions, 404 deletions
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0001-flash-use-readX-writeX-not-udelay.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0001-flash-use-readX-writeX-not-udelay.patch
index 73ab78a65..b24d91a68 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0001-flash-use-readX-writeX-not-udelay.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0001-flash-use-readX-writeX-not-udelay.patch
@@ -1,7 +1,16 @@
-Index: u-boot/arch/arm/mach-aspeed/flash.c
-===================================================================
---- u-boot.orig/arch/arm/mach-aspeed/flash.c
-+++ u-boot/arch/arm/mach-aspeed/flash.c
+From 614d875d383c6567dd282faeb7ced1db1e4d07d9 Mon Sep 17 00:00:00 2001
+From: Vernon Mauery <vernon.mauery@intel.com>
+Date: Thu, 26 Apr 2018 13:29:46 -0700
+Subject: [PATCH] U-Boot aspeed flash driver should not use udelay
+
+---
+ arch/arm/mach-aspeed/flash.c | 229 ++++++++++++++---------------------
+ 1 file changed, 88 insertions(+), 141 deletions(-)
+
+diff --git a/arch/arm/mach-aspeed/flash.c b/arch/arm/mach-aspeed/flash.c
+index b8a438df75..d33fb9e0fe 100644
+--- a/arch/arm/mach-aspeed/flash.c
++++ b/arch/arm/mach-aspeed/flash.c
 @@ -28,6 +28,7 @@
  #include <common.h>
  #include <asm/processor.h>
@@ -10,7 +19,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
  #include <environment.h>
  
  #include <asm/arch/ast_scu.h>
-@@ -199,7 +200,7 @@ static void reset_flash (flash_info_t *
+@@ -202,7 +203,7 @@ static void reset_flash (flash_info_t * info)
          if (info->dualport)
              ulCtrlData  |= 0x08;
  #endif
@@ -19,7 +28,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
  
  }
  
-@@ -228,28 +229,22 @@ static void enable_write (flash_info_t *
+@@ -231,28 +232,22 @@ static void enable_write (flash_info_t * info)
  
          ulCtrlData  = (info->tCK_Write << 8);
          ulCtrlData |= CE_LOW | USERMODE;
@@ -55,7 +64,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
  
  }
  
-@@ -280,30 +275,23 @@ static void write_status_register (flash
+@@ -283,30 +278,23 @@ static void write_status_register (flash_info_t * info, uchar data)
  
          ulCtrlData  = (info->tCK_Write << 8);
          ulCtrlData |= CE_LOW | USERMODE;
@@ -94,7 +103,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
  }
  
  static void enable4b (flash_info_t * info)
-@@ -330,13 +318,11 @@ static void enable4b (flash_info_t * inf
+@@ -333,13 +321,11 @@ static void enable4b (flash_info_t * info)
  
          ulCtrlData  = (info->tCK_Write << 8);
          ulCtrlData |= CE_LOW | USERMODE;
@@ -111,7 +120,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
  
  } /* enable4b */
  
-@@ -366,29 +352,23 @@ static void enable4b_spansion (flash_inf
+@@ -369,29 +355,23 @@ static void enable4b_spansion (flash_info_t * info)
  	/* Enable 4B: BAR0 D[7] = 1 */
  	ulCtrlData  = (info->tCK_Write << 8);
  	ulCtrlData |= CE_LOW | USERMODE;
@@ -149,7 +158,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
  
  } /* enable4b_spansion */
  
-@@ -420,14 +400,11 @@ static void enable4b_numonyx (flash_info
+@@ -423,14 +403,11 @@ static void enable4b_numonyx (flash_info_t * info)
  	/* Enable 4B: CMD:0xB7 */
  	ulCtrlData  = (info->tCK_Write << 8);
  	ulCtrlData |= CE_LOW | USERMODE;
@@ -167,7 +176,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
  
  } /* enable4b_numonyx */
  
-@@ -463,63 +440,49 @@ static void flash_write_buffer (flash_in
+@@ -466,63 +443,49 @@ static void flash_write_buffer (flash_info_t *info, uchar *src, ulong addr, int
  
          ulCtrlData &= CMD_MASK;
          ulCtrlData |= CE_LOW | USERMODE;
@@ -247,7 +256,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
          }
  }
  
-@@ -603,57 +566,44 @@ int flash_erase (flash_info_t * info, in
+@@ -606,57 +569,44 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
  
                          ulCtrlData &= CMD_MASK;
                          ulCtrlData |= CE_LOW | USERMODE;
@@ -320,7 +329,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
                          }
  
  			putc ('.');
-@@ -764,22 +714,16 @@ static ulong flash_get_size (ulong base,
+@@ -767,22 +717,16 @@ static ulong flash_get_size (ulong base, flash_info_t *info)
  	}
  
  	/* Get Flash ID */
@@ -351,7 +360,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
  	ulID = ((ulong)ch[0]) | ((ulong)ch[1] << 8) | ((ulong)ch[2] << 16) ;
  	info->flash_id = ulID;
  
-@@ -1294,13 +1238,13 @@ static ulong flash_get_size (ulong base,
+@@ -1339,13 +1283,13 @@ static ulong flash_get_size (ulong base, flash_info_t *info)
  
  	if (info->address32) {
  #ifndef AST_SOC_G5
@@ -369,7 +378,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
  
  		/* set flash chips to 32bits addressing mode */
  		if ((info->flash_id & 0xFF) == 0x01)	/* Spansion */
-@@ -1322,7 +1266,7 @@ unsigned long flash_init (void)
+@@ -1367,7 +1311,7 @@ unsigned long flash_init (void)
  	unsigned long size = 0;
  	int i;
  
@@ -378,7 +387,7 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
  
  	/* Init: FMC  */
  	/* BANK 0 : FMC CS0 , 1: FMC CS1, */
-@@ -1352,7 +1296,7 @@ unsigned long flash_init (void)
+@@ -1397,7 +1341,7 @@ unsigned long flash_init (void)
  #ifdef CONFIG_SPI0_CS
  	//pin switch by trap[13:12]	-- [0:1] Enable SPI Master
  	ast_scu_spi_master(1);	/* enable SPI master */
@@ -387,22 +396,21 @@ Index: u-boot/arch/arm/mach-aspeed/flash.c
  	flash_info[CONFIG_FMC_CS].sysspi = 1;
  	flash_info[CONFIG_FMC_CS].reg_base = AST_FMC_SPI0_BASE;
  	flash_info[CONFIG_FMC_CS].flash_id = FLASH_UNKNOWN;
-@@ -1403,21 +1347,24 @@ void memmove_dma(void * dest,const void
+@@ -1448,21 +1392,24 @@ void memmove_dma(void * dest,const void *src,size_t count)
          poll_time = 100;			/* set 100 us as default */
  
          /* force end of burst read */
 -	*(volatile ulong *) (AST_FMC_BASE + CS0_CTRL) |= CE_HIGH;
 -	*(volatile ulong *) (AST_FMC_BASE + CS0_CTRL) &= ~CE_HIGH;
--
++	data = readl(AST_FMC_BASE + CS0_CTRL);
++	writel(data |  CE_HIGH, AST_FMC_BASE + CS0_CTRL);
++	writel(data & ~CE_HIGH, AST_FMC_BASE + CS0_CTRL);
+ 
 -	*(ulong *) (AST_FMC_BASE + REG_FLASH_DMA_CONTROL) = (ulong) (~FLASH_DMA_ENABLE);
 -	*(ulong *) (AST_FMC_BASE + REG_FLASH_DMA_FLASH_BASE) = (ulong) (src);
 -	*(ulong *) (AST_FMC_BASE + REG_FLASH_DMA_DRAM_BASE) = (ulong) (dest);
 -	*(ulong *) (AST_FMC_BASE + REG_FLASH_DMA_LENGTH) = (ulong) (count_align);
 -	*(ulong *) (AST_FMC_BASE + REG_FLASH_DMA_CONTROL) = (ulong) (FLASH_DMA_ENABLE);
-+	data = readl(AST_FMC_BASE + CS0_CTRL);
-+	writel(data |  CE_HIGH, AST_FMC_BASE + CS0_CTRL);
-+	writel(data & ~CE_HIGH, AST_FMC_BASE + CS0_CTRL);
-+
 +	writel(~FLASH_DMA_ENABLE, AST_FMC_BASE + REG_FLASH_DMA_CONTROL);
 +	writel((ulong)src, AST_FMC_BASE + REG_FLASH_DMA_FLASH_BASE);
 +	writel((ulong)dest, AST_FMC_BASE + REG_FLASH_DMA_DRAM_BASE);
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0004-Make-sure-debug-uart-is-using-24MHz-clock-source.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0004-Make-sure-debug-uart-is-using-24MHz-clock-source.patch
index e7e6c56d7..c438bdcd4 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0004-Make-sure-debug-uart-is-using-24MHz-clock-source.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0004-Make-sure-debug-uart-is-using-24MHz-clock-source.patch
@@ -1,4 +1,4 @@
-From 954e7dd9ff9c5d1159f0896afa34c673061b82ea Mon Sep 17 00:00:00 2001
+From 9efa565f1bc09b1906328b25a01e041ab5024769 Mon Sep 17 00:00:00 2001
 From: Yong Li <yong.b.li@linux.intel.com>
 Date: Tue, 11 Sep 2018 16:24:06 +0800
 Subject: [PATCH] Make sure debug uart is using 24MHz clock source
@@ -16,7 +16,7 @@ Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
  4 files changed, 17 insertions(+)
 
 diff --git a/arch/arm/include/asm/arch-aspeed/ast_scu.h b/arch/arm/include/asm/arch-aspeed/ast_scu.h
-index dcbc673..06825ce 100644
+index dcbc6730d4..06825cebbf 100644
 --- a/arch/arm/include/asm/arch-aspeed/ast_scu.h
 +++ b/arch/arm/include/asm/arch-aspeed/ast_scu.h
 @@ -46,4 +46,6 @@ extern void ast_scu_init_eth(u8 num);
@@ -27,7 +27,7 @@ index dcbc673..06825ce 100644
 +
  #endif
 diff --git a/arch/arm/include/asm/arch-aspeed/platform.h b/arch/arm/include/asm/arch-aspeed/platform.h
-index 1c02914..92ea33b 100644
+index 1c02914fcb..92ea33b89a 100644
 --- a/arch/arm/include/asm/arch-aspeed/platform.h
 +++ b/arch/arm/include/asm/arch-aspeed/platform.h
 @@ -27,6 +27,7 @@
@@ -39,7 +39,7 @@ index 1c02914..92ea33b 100644
  #err "No define for platform.h"
  #endif
 diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c
-index 12de9b8..fff02dc 100644
+index 12de9b8036..fff02dc000 100644
 --- a/arch/arm/mach-aspeed/ast-scu.c
 +++ b/arch/arm/mach-aspeed/ast-scu.c
 @@ -538,3 +538,9 @@ void ast_scu_get_who_init_dram(void)
@@ -53,10 +53,10 @@ index 12de9b8..fff02dc 100644
 +				~(1 << 28), AST_SCU_MISC2_CTRL);
 +}
 diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c
-index e67a4bf..5a1fade 100644
+index 12496cea09..45353b8f78 100644
 --- a/board/aspeed/ast-g5/ast-g5.c
 +++ b/board/aspeed/ast-g5/ast-g5.c
-@@ -16,6 +16,14 @@
+@@ -19,6 +19,14 @@
  
  DECLARE_GLOBAL_DATA_PTR;
  
@@ -70,4 +70,4 @@ index e67a4bf..5a1fade 100644
 +
  int board_init(void)
  {
- 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+ 	bool sdmc_unlocked;
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0005-enable-passthrough-in-uboot.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0005-enable-passthrough-in-uboot.patch
index 6bd063e39..46a547282 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0005-enable-passthrough-in-uboot.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0005-enable-passthrough-in-uboot.patch
@@ -1,4 +1,4 @@
-From 7e11461d6b65969005605f13677269eb91d39643 Mon Sep 17 00:00:00 2001
+From 872e3fd3ae8f692ab11c49dbbd1c5b311c2aaad1 Mon Sep 17 00:00:00 2001
 From: Kuiying Wang <kuiying.wang@intel.com>
 Date: Wed, 7 Nov 2018 13:57:57 +0800
 Subject: [PATCH] enable passthrough in uboot
@@ -9,7 +9,7 @@ Subject: [PATCH] enable passthrough in uboot
  2 files changed, 24 insertions(+)
 
 diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c
-index fff02dc..d27f3d3 100644
+index fff02dc000..d27f3d3ede 100644
 --- a/arch/arm/mach-aspeed/ast-scu.c
 +++ b/arch/arm/mach-aspeed/ast-scu.c
 @@ -544,3 +544,25 @@ void ast_config_uart5_clk(void)
@@ -39,10 +39,10 @@ index fff02dc..d27f3d3 100644
 +	}
 +}
 diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c
-index 5a1fade..b492003 100644
+index 45353b8f78..02eb2c3990 100644
 --- a/board/aspeed/ast-g5/ast-g5.c
 +++ b/board/aspeed/ast-g5/ast-g5.c
-@@ -20,6 +20,8 @@ int board_early_init_f(void)
+@@ -23,6 +23,8 @@ int board_early_init_f(void)
  {
  	/* make sure uart5 is using 24MHz clock */
  	ast_config_uart5_clk();
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0006-Add-Aspeed-g5-interrupt-support.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0006-Add-Aspeed-g5-interrupt-support.patch
index 4f90d6dfe..a659a3011 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0006-Add-Aspeed-g5-interrupt-support.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0006-Add-Aspeed-g5-interrupt-support.patch
@@ -1,4 +1,4 @@
-From e782f6a90468fee35877b78e248a17f39f67c94c Mon Sep 17 00:00:00 2001
+From ad92c1981f81fe28b901894db537a0c98d5956e5 Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@linux.intel.com>
 Date: Wed, 14 Nov 2018 10:21:40 -0800
 Subject: [PATCH] Add Aspeed g5 interrupt support
@@ -11,11 +11,11 @@ Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
 Change-Id: Id7072f1408dcf364968b1b74f2192e50a22a82f0
 
 ---
- Kconfig                             |  13 +++
- arch/arm/lib/interrupts.c           |  11 +++
+ Kconfig                             |  13 ++
+ arch/arm/lib/interrupts.c           |  11 ++
  board/aspeed/ast-g5/Makefile        |   3 +-
- board/aspeed/ast-g5/ast-g5-irq.c    | 176 ++++++++++++++++++++++++++++++++++++
- board/aspeed/ast-g5/ast-g5-irq.h    |  39 ++++++++
+ board/aspeed/ast-g5/ast-g5-irq.c    | 176 ++++++++++++++++++++++++++++
+ board/aspeed/ast-g5/ast-g5-irq.h    |  39 ++++++
  board/aspeed/ast-g5/ast-g5.c        |   3 +
  board/aspeed/ast-g5/ast-g5.h        |   7 ++
  cmd/Kconfig                         |   5 +
@@ -28,7 +28,7 @@ Change-Id: Id7072f1408dcf364968b1b74f2192e50a22a82f0
  create mode 100644 board/aspeed/ast-g5/ast-g5.h
 
 diff --git a/Kconfig b/Kconfig
-index 3ceff25..d6439d0 100644
+index 3ceff25032..d6439d01ca 100644
 --- a/Kconfig
 +++ b/Kconfig
 @@ -115,6 +115,19 @@ if EXPERT
@@ -52,7 +52,7 @@ index 3ceff25..d6439d0 100644
  
  menu "Boot images"
 diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
-index ed83043..a96b3aa 100644
+index ed83043abb..a96b3aa070 100644
 --- a/arch/arm/lib/interrupts.c
 +++ b/arch/arm/lib/interrupts.c
 @@ -94,6 +94,17 @@ int disable_interrupts (void)
@@ -74,7 +74,7 @@ index ed83043..a96b3aa 100644
  int interrupt_init (void)
  {
 diff --git a/board/aspeed/ast-g5/Makefile b/board/aspeed/ast-g5/Makefile
-index d1d7f85..df4e639 100644
+index d1d7f8525e..df4e63966e 100644
 --- a/board/aspeed/ast-g5/Makefile
 +++ b/board/aspeed/ast-g5/Makefile
 @@ -1 +1,2 @@
@@ -83,7 +83,7 @@ index d1d7f85..df4e639 100644
 +obj-y += ast-g5-irq.o
 diff --git a/board/aspeed/ast-g5/ast-g5-irq.c b/board/aspeed/ast-g5/ast-g5-irq.c
 new file mode 100644
-index 0000000..860f16c
+index 0000000000..860f16cf05
 --- /dev/null
 +++ b/board/aspeed/ast-g5/ast-g5-irq.c
 @@ -0,0 +1,176 @@
@@ -265,7 +265,7 @@ index 0000000..860f16c
 +#endif
 diff --git a/board/aspeed/ast-g5/ast-g5-irq.h b/board/aspeed/ast-g5/ast-g5-irq.h
 new file mode 100644
-index 0000000..703eeab
+index 0000000000..703eeabf13
 --- /dev/null
 +++ b/board/aspeed/ast-g5/ast-g5-irq.h
 @@ -0,0 +1,39 @@
@@ -309,11 +309,11 @@ index 0000000..703eeab
 +
 +#endif /* __AST_G5_IRQ_H__ */
 diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c
-index b492003..2472aa3 100644
+index 02eb2c3990..ca25348178 100644
 --- a/board/aspeed/ast-g5/ast-g5.c
 +++ b/board/aspeed/ast-g5/ast-g5.c
-@@ -14,6 +14,8 @@
- #include <asm/arch/ast-sdmc.h>
+@@ -17,6 +17,8 @@
+ #include <asm/arch/regs-sdmc.h>
  #include <asm/io.h>
  
 +#include "ast-g5.h"
@@ -321,7 +321,7 @@ index b492003..2472aa3 100644
  DECLARE_GLOBAL_DATA_PTR;
  
  int board_early_init_f(void)
-@@ -22,6 +24,7 @@ int board_early_init_f(void)
+@@ -25,6 +27,7 @@ int board_early_init_f(void)
  	ast_config_uart5_clk();
  	/*enable pass through*/
  	ast_enable_pass_through();
@@ -331,7 +331,7 @@ index b492003..2472aa3 100644
  }
 diff --git a/board/aspeed/ast-g5/ast-g5.h b/board/aspeed/ast-g5/ast-g5.h
 new file mode 100644
-index 0000000..9fd10ec
+index 0000000000..9fd10eccb3
 --- /dev/null
 +++ b/board/aspeed/ast-g5/ast-g5.h
 @@ -0,0 +1,7 @@
@@ -343,7 +343,7 @@ index 0000000..9fd10ec
 +
 +#endif /* _AST_G5_H_ */
 diff --git a/cmd/Kconfig b/cmd/Kconfig
-index d69b817..33be240 100644
+index d69b817c82..33be2407d2 100644
 --- a/cmd/Kconfig
 +++ b/cmd/Kconfig
 @@ -313,6 +313,11 @@ endmenu
@@ -359,7 +359,7 @@ index d69b817..33be240 100644
  	bool "dm - Access to driver model information"
  	depends on DM
 diff --git a/configs/ast_g5_ncsi_2boot_defconfig b/configs/ast_g5_ncsi_2boot_defconfig
-index 2d28c86..d5b7894 100644
+index 2d28c86966..d5b7894a9e 100644
 --- a/configs/ast_g5_ncsi_2boot_defconfig
 +++ b/configs/ast_g5_ncsi_2boot_defconfig
 @@ -33,3 +33,4 @@ CONFIG_CMD_CRC32=y
@@ -368,7 +368,7 @@ index 2d28c86..d5b7894 100644
  CONFIG_CMD_MX_CYCLIC=y
 +CONFIG_USE_IRQ=y
 diff --git a/configs/ast_g5_ncsi_defconfig b/configs/ast_g5_ncsi_defconfig
-index 74029ed..9481e5f 100644
+index 74029ed514..9481e5fb6e 100644
 --- a/configs/ast_g5_ncsi_defconfig
 +++ b/configs/ast_g5_ncsi_defconfig
 @@ -11,3 +11,4 @@ CONFIG_HUSH_PARSER=y
@@ -377,7 +377,7 @@ index 74029ed..9481e5f 100644
  CONFIG_SYS_NS16550=y
 +CONFIG_USE_IRQ=y
 diff --git a/configs/ast_g5_phy_defconfig b/configs/ast_g5_phy_defconfig
-index 767f3af..4aefcf4 100644
+index 767f3af605..4aefcf49e8 100644
 --- a/configs/ast_g5_phy_defconfig
 +++ b/configs/ast_g5_phy_defconfig
 @@ -12,3 +12,4 @@ CONFIG_HUSH_PARSER=y
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0007-Add-espi-support.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0007-Add-espi-support.patch
index 40336d3dd..cbe0df0aa 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0007-Add-espi-support.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0007-Add-espi-support.patch
@@ -1,7 +1,7 @@
-From dff3a123b0318f83ecd753eea8945ebdc15fd2f9 Mon Sep 17 00:00:00 2001
+From 212e72b6df74af242b23443b252deed4d06129f4 Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@linux.intel.com>
 Date: Wed, 14 Nov 2018 10:21:40 -0800
-Subject: [PATCH 1/1] Add espi support
+Subject: [PATCH] Add espi support
 
 This adds basic eSPI support for U-Boot. The eSPI driver works best with
 interrupts because the timing of the initialization with the PCH is not
@@ -13,6 +13,7 @@ functions.
 
 Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
 Signed-off-by: James Feist <james.feist@linux.intel.com>
+
 ---
  arch/arm/include/asm/arch-aspeed/regs-scu.h |   2 +
  board/aspeed/ast-g5/Makefile                |   2 +
@@ -47,7 +48,7 @@ index df4e63966e..58e0c648f4 100644
  obj-y += ast-g5-irq.o
 diff --git a/board/aspeed/ast-g5/ast-g5-espi.c b/board/aspeed/ast-g5/ast-g5-espi.c
 new file mode 100644
-index 0000000000..5a3ffe7bef
+index 0000000000..7c82cdfd65
 --- /dev/null
 +++ b/board/aspeed/ast-g5/ast-g5-espi.c
 @@ -0,0 +1,248 @@
@@ -342,6 +343,3 @@ index ca25348178..cab5fabcef 100644
  	return 0;
  }
  
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0008-add-sgio-support-for-port80-snoop-post-LEDs.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0008-add-sgio-support-for-port80-snoop-post-LEDs.patch
index 5fa4bffa1..d82acc623 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0008-add-sgio-support-for-port80-snoop-post-LEDs.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0008-add-sgio-support-for-port80-snoop-post-LEDs.patch
@@ -1,4 +1,4 @@
-From 40e02e4ffa13c0128db555a3a3982a7cdc0ebf60 Mon Sep 17 00:00:00 2001
+From 248f12a6a02819a5318025df0868dfd40efa2207 Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@linux.intel.com>
 Date: Wed, 14 Nov 2018 12:09:52 -0800
 Subject: [PATCH] add sgio support for port80 snoop post LEDs
@@ -11,12 +11,12 @@ Change-Id: Iaa1b91cd40f4b6323dba0598da373cb631459e66
 
 ---
  arch/arm/include/asm/arch-aspeed/ast_scu.h |  1 +
- arch/arm/mach-aspeed/ast-scu.c             |  8 +++
- board/aspeed/ast-g5/ast-g5-intel.c         | 96 ++++++++++++++++++++++++++++++
+ arch/arm/mach-aspeed/ast-scu.c             |  8 ++
+ board/aspeed/ast-g5/ast-g5-intel.c         | 96 ++++++++++++++++++++++
  3 files changed, 105 insertions(+)
 
 diff --git a/arch/arm/include/asm/arch-aspeed/ast_scu.h b/arch/arm/include/asm/arch-aspeed/ast_scu.h
-index 06825ce..369c4e3 100644
+index 06825cebbf..369c4e3b60 100644
 --- a/arch/arm/include/asm/arch-aspeed/ast_scu.h
 +++ b/arch/arm/include/asm/arch-aspeed/ast_scu.h
 @@ -45,6 +45,7 @@ extern u32 ast_scu_get_vga_memsize(void);
@@ -28,7 +28,7 @@ index 06825ce..369c4e3 100644
  void ast_config_uart5_clk(void);
  
 diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c
-index d27f3d3..3a9ba05 100644
+index d27f3d3ede..3a9ba05bf2 100644
 --- a/arch/arm/mach-aspeed/ast-scu.c
 +++ b/arch/arm/mach-aspeed/ast-scu.c
 @@ -449,6 +449,14 @@ void ast_scu_multi_func_romcs(u8 num)
@@ -47,7 +47,7 @@ index d27f3d3..3a9ba05 100644
  {
  	int i;
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index e79235c..c2a8b33 100644
+index e79235c8d0..c2a8b33aec 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
 @@ -8,9 +8,105 @@
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0009-Add-basic-GPIO-support.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0009-Add-basic-GPIO-support.patch
index e11f15870..ee93e9884 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0009-Add-basic-GPIO-support.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0009-Add-basic-GPIO-support.patch
@@ -1,7 +1,7 @@
-From 15d04184a94aca6db889d77c2cc5a800b280da4b Mon Sep 17 00:00:00 2001
+From 34ceaf8ee2c6556045f00b911c001bcc2f91c1f8 Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@linux.intel.com>
 Date: Fri, 16 Nov 2018 09:58:01 -0800
-Subject: [PATCH 01/30] Add basic GPIO support
+Subject: [PATCH] Add basic GPIO support
 
 Add a table of well-known gpios (such as FP LEDs and FF UPD jumper) and
 initialize them at boot.
@@ -11,7 +11,7 @@ Add a mechanism to get/set well known gpios from command line.
 Change-Id: I4136a5ccb048b3604f13b17ea0c18a4bc596c249
 Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
 
-%% original patch: 0009-Add-basic-GPIO-support.patch
+
 ---
  board/aspeed/ast-g5/Makefile       |   1 +
  board/aspeed/ast-g5/ast-g5-gpio.c  | 202 +++++++++++++++++++++++++++++
@@ -422,6 +422,3 @@ index 9fd10eccb3..908db1477b 100644
 +#include "ast-g5-gpio.h"
  
  #endif /* _AST_G5_H_ */
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0010-Update-Force-Firmware-Update-Jumper-to-use-new-gpio.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0010-Update-Force-Firmware-Update-Jumper-to-use-new-gpio.patch
index c6ee49f57..b22f50650 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0010-Update-Force-Firmware-Update-Jumper-to-use-new-gpio.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0010-Update-Force-Firmware-Update-Jumper-to-use-new-gpio.patch
@@ -1,4 +1,4 @@
-From d08d22af794eed7b928ab96030a103cfb7bf6ce1 Mon Sep 17 00:00:00 2001
+From 1ce8ac1579502cc4a0e00a2d997a46a83941361b Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@linux.intel.com>
 Date: Fri, 16 Nov 2018 14:59:04 -0800
 Subject: [PATCH] Update Force Firmware Update Jumper to use new gpio API
@@ -10,16 +10,16 @@ Change-Id: I8ead931e9dd828522095a0ef386875be652ec885
 Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
 
 ---
- arch/arm/include/asm/arch-aspeed/ast-g5-intel.h | 19 +++++++++++++++++++
- arch/arm/include/asm/arch-aspeed/platform.h     |  1 +
- board/aspeed/ast-g5/ast-g5-intel.c              |  5 +++++
- common/autoboot.c                               |  6 ++++++
+ .../include/asm/arch-aspeed/ast-g5-intel.h    | 19 +++++++++++++++++++
+ arch/arm/include/asm/arch-aspeed/platform.h   |  1 +
+ board/aspeed/ast-g5/ast-g5-intel.c            |  5 +++++
+ common/autoboot.c                             |  6 ++++++
  4 files changed, 31 insertions(+)
  create mode 100644 arch/arm/include/asm/arch-aspeed/ast-g5-intel.h
 
 diff --git a/arch/arm/include/asm/arch-aspeed/ast-g5-intel.h b/arch/arm/include/asm/arch-aspeed/ast-g5-intel.h
 new file mode 100644
-index 0000000..cd9a099
+index 0000000000..cd9a0994fa
 --- /dev/null
 +++ b/arch/arm/include/asm/arch-aspeed/ast-g5-intel.h
 @@ -0,0 +1,19 @@
@@ -43,7 +43,7 @@ index 0000000..cd9a099
 +
 +#endif /* __AST_INTEL_G5_H__ */
 diff --git a/arch/arm/include/asm/arch-aspeed/platform.h b/arch/arm/include/asm/arch-aspeed/platform.h
-index 92ea33b..3b06e52 100644
+index 92ea33b89a..3b06e526f5 100644
 --- a/arch/arm/include/asm/arch-aspeed/platform.h
 +++ b/arch/arm/include/asm/arch-aspeed/platform.h
 @@ -27,6 +27,7 @@
@@ -55,10 +55,10 @@ index 92ea33b..3b06e52 100644
  #else
  #err "No define for platform.h"
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index 069e7a3..144765a 100644
+index 1868c230eb..9779052da4 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -145,6 +145,11 @@ static void sgpio_init(void)
+@@ -148,6 +148,11 @@ static void sgpio_init(void)
  	writel(value, AST_GPIO_BASE + GPIO254);
  }
  
@@ -71,7 +71,7 @@ index 069e7a3..144765a 100644
  void ast_g5_intel(void)
  {
 diff --git a/common/autoboot.c b/common/autoboot.c
-index c52bad8..d66c0fa 100644
+index c52bad84a4..d66c0fa63a 100644
 --- a/common/autoboot.c
 +++ b/common/autoboot.c
 @@ -14,6 +14,7 @@
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0011-Add-basic-timer-support-for-Aspeed-g5-in-U-Boot.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0011-Add-basic-timer-support-for-Aspeed-g5-in-U-Boot.patch
index 26b4c4fc9..3a26416b3 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0011-Add-basic-timer-support-for-Aspeed-g5-in-U-Boot.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0011-Add-basic-timer-support-for-Aspeed-g5-in-U-Boot.patch
@@ -1,4 +1,4 @@
-From 320cf189fd017e3578b6949ff640213d7bddb20c Mon Sep 17 00:00:00 2001
+From c5098f399d379f79c5532d06f816b05ad4ad6d77 Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@linux.intel.com>
 Date: Fri, 16 Nov 2018 14:44:49 -0800
 Subject: [PATCH] Add basic timer support for Aspeed g5 in U-Boot
@@ -12,15 +12,15 @@ Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
 ---
  board/aspeed/ast-g5/Makefile       |  1 +
  board/aspeed/ast-g5/ast-g5-intel.c |  1 +
- board/aspeed/ast-g5/ast-g5-timer.c | 66 ++++++++++++++++++++++++++++++++++++++
- board/aspeed/ast-g5/ast-g5-timer.h | 27 ++++++++++++++++
+ board/aspeed/ast-g5/ast-g5-timer.c | 66 ++++++++++++++++++++++++++++++
+ board/aspeed/ast-g5/ast-g5-timer.h | 27 ++++++++++++
  board/aspeed/ast-g5/ast-g5.h       |  1 +
  5 files changed, 96 insertions(+)
  create mode 100644 board/aspeed/ast-g5/ast-g5-timer.c
  create mode 100644 board/aspeed/ast-g5/ast-g5-timer.h
 
 diff --git a/board/aspeed/ast-g5/Makefile b/board/aspeed/ast-g5/Makefile
-index 2970ae5..9022433 100644
+index 2970ae5741..90224333c4 100644
 --- a/board/aspeed/ast-g5/Makefile
 +++ b/board/aspeed/ast-g5/Makefile
 @@ -3,3 +3,4 @@ obj-y += ast-g5-intel.o
@@ -29,7 +29,7 @@ index 2970ae5..9022433 100644
  obj-y += ast-g5-gpio.o
 +obj-y += ast-g5-timer.o
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index 144765a..6e45cb4 100644
+index 9779052da4..4ef25ab8f5 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
 @@ -15,6 +15,7 @@
@@ -42,7 +42,7 @@ index 144765a..6e45cb4 100644
  enum gpio_names {
 diff --git a/board/aspeed/ast-g5/ast-g5-timer.c b/board/aspeed/ast-g5/ast-g5-timer.c
 new file mode 100644
-index 0000000..5615722
+index 0000000000..56157222d9
 --- /dev/null
 +++ b/board/aspeed/ast-g5/ast-g5-timer.c
 @@ -0,0 +1,66 @@
@@ -114,7 +114,7 @@ index 0000000..5615722
 +}
 diff --git a/board/aspeed/ast-g5/ast-g5-timer.h b/board/aspeed/ast-g5/ast-g5-timer.h
 new file mode 100644
-index 0000000..4b1ac28
+index 0000000000..4b1ac28a9f
 --- /dev/null
 +++ b/board/aspeed/ast-g5/ast-g5-timer.h
 @@ -0,0 +1,27 @@
@@ -146,7 +146,7 @@ index 0000000..4b1ac28
 +
 +#endif /* __AST_G5_TIMER_H__ */
 diff --git a/board/aspeed/ast-g5/ast-g5.h b/board/aspeed/ast-g5/ast-g5.h
-index 908db14..28fe5ea 100644
+index 908db1477b..28fe5eafcb 100644
 --- a/board/aspeed/ast-g5/ast-g5.h
 +++ b/board/aspeed/ast-g5/ast-g5.h
 @@ -4,5 +4,6 @@
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0012-Add-status-and-ID-LED-support.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0012-Add-status-and-ID-LED-support.patch
index e376001b3..e333b6cc0 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0012-Add-status-and-ID-LED-support.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0012-Add-status-and-ID-LED-support.patch
@@ -1,4 +1,4 @@
-From 2db86017f1cd48da9f6c102665d5ae3d1efe48cc Mon Sep 17 00:00:00 2001
+From e252fcfd1ad66f1af57da1851bb39a398a9545e7 Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@linux.intel.com>
 Date: Wed, 14 Nov 2018 12:16:53 -0800
 Subject: [PATCH] Add status and ID LED support
@@ -11,15 +11,16 @@ Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
 Signed-off-by: James Feist <james.feist@linux.intel.com>
 Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
 Change-Id: Ic9595621b21000ef465ff57ed2047855296e2714
+
 ---
- board/aspeed/ast-g5/ast-g5-intel.c | 113 +++++++++++++++++++++++++++++++++++++
+ board/aspeed/ast-g5/ast-g5-intel.c | 113 +++++++++++++++++++++++++++++
  1 file changed, 113 insertions(+)
 
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index 6e45cb4..e749992 100644
+index 4ef25ab8f5..e27b538fcc 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -146,6 +146,112 @@ static void sgpio_init(void)
+@@ -149,6 +149,112 @@ static void sgpio_init(void)
  	writel(value, AST_GPIO_BASE + GPIO254);
  }
  
@@ -132,7 +133,7 @@ index 6e45cb4..e749992 100644
  int intel_force_firmware_jumper_enabled(void)
  {
  	return gpio_get_value(GPIO_FF_UPD_JUMPER);
-@@ -157,4 +263,11 @@ void ast_g5_intel(void)
+@@ -160,4 +266,11 @@ void ast_g5_intel(void)
  	gpio_init(gpio_table, ARRAY_SIZE(gpio_table));
  	espi_init();
  	sgpio_init();
@@ -144,6 +145,3 @@ index 6e45cb4..e749992 100644
 +		id_led_control(GPIO_AMBER_LED, EIDLED_On);
 +	}
  }
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0013-aspeed-Add-Pwm-Driver.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0013-aspeed-Add-Pwm-Driver.patch
index 4714dd6cc..6a3132adb 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0013-aspeed-Add-Pwm-Driver.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0013-aspeed-Add-Pwm-Driver.patch
@@ -1,19 +1,20 @@
-From 039b9a278a4d075e455a38ec93171dc812aec8b2 Mon Sep 17 00:00:00 2001
+From 118b202b435df8b9a8bdee296289fd42c4a95959 Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@linux.intel.com>
 Date: Fri, 16 Nov 2018 15:57:57 -0800
-Subject: [PATCH 1/1] aspeed: add Pwm Driver
+Subject: [PATCH] aspeed: add Pwm Driver
 
 Change-Id: Ia8b80212f7c70aafcc6a71782936ec95cf9b7f38
 Signed-off-by: James Feist <james.feist@linux.intel.com>
+
 ---
  board/aspeed/ast-g5/ast-g5-intel.c | 113 +++++++++++++++++++++++++++++
  1 file changed, 113 insertions(+)
 
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index e74999223b..74e218dfd0 100644
+index e27b538fcc..a6cad69b1e 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -257,9 +257,122 @@ int intel_force_firmware_jumper_enabled(void)
+@@ -260,9 +260,122 @@ int intel_force_firmware_jumper_enabled(void)
  	return gpio_get_value(GPIO_FF_UPD_JUMPER);
  }
  
@@ -136,6 +137,3 @@ index e74999223b..74e218dfd0 100644
  	gpio_init(gpio_table, ARRAY_SIZE(gpio_table));
  	espi_init();
  	sgpio_init();
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0014-Keep-interrupts-enabled-until-last-second.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0014-Keep-interrupts-enabled-until-last-second.patch
index 22191f07a..306728244 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0014-Keep-interrupts-enabled-until-last-second.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0014-Keep-interrupts-enabled-until-last-second.patch
@@ -1,4 +1,4 @@
-From 040c9c13778076403198ce93f43c4aa3a1ed3907 Mon Sep 17 00:00:00 2001
+From 473287e31ebd263e7278dd86e2f5e72aba9ba4db Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@linux.intel.com>
 Date: Sat, 17 Nov 2018 14:17:27 -0800
 Subject: [PATCH] Keep interrupts enabled until last second
@@ -18,10 +18,10 @@ Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
  3 files changed, 9 insertions(+), 7 deletions(-)
 
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index c7ae566..01f8a13 100644
+index a6cad69b1e..5796ecf055 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -255,6 +255,14 @@ int intel_force_firmware_jumper_enabled(void)
+@@ -260,6 +260,14 @@ int intel_force_firmware_jumper_enabled(void)
  	return gpio_get_value(GPIO_FF_UPD_JUMPER);
  }
  
@@ -37,7 +37,7 @@ index c7ae566..01f8a13 100644
  
  #define PWM_BASE_ADDR 0x1E786000
 diff --git a/common/bootm.c b/common/bootm.c
-index 2431019..46909ec 100644
+index 2431019b3f..46909ecdbb 100644
 --- a/common/bootm.c
 +++ b/common/bootm.c
 @@ -602,7 +602,6 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
@@ -76,7 +76,7 @@ index 2431019..46909ec 100644
  		bootstage_error(BOOTSTAGE_ID_DECOMP_UNIMPL);
  	else if (ret == BOOTM_ERR_RESET)
 diff --git a/common/bootm_os.c b/common/bootm_os.c
-index 9ec84bd..b56eb39 100644
+index 9ec84bd0db..b56eb39780 100644
 --- a/common/bootm_os.c
 +++ b/common/bootm_os.c
 @@ -476,6 +476,7 @@ __weak void arch_preboot_os(void)
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0015-Rewrite-memmove-to-optimize-on-word-transfers.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0015-Rewrite-memmove-to-optimize-on-word-transfers.patch
index d93d9c4a1..f5ff7a2b9 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0015-Rewrite-memmove-to-optimize-on-word-transfers.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0015-Rewrite-memmove-to-optimize-on-word-transfers.patch
@@ -1,4 +1,4 @@
-From 711c7bc5a07b62e8369bc76a9db265c960bacef8 Mon Sep 17 00:00:00 2001
+From e600623b13e3de73be5cd3b2711d58095efb4573 Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@linux.intel.com>
 Date: Mon, 19 Nov 2018 11:04:02 -0800
 Subject: [PATCH] Rewrite memmove to optimize on word transfers
@@ -12,11 +12,11 @@ Change-Id: Ie0a1f3261e507fb34a908571883d9bf04a1059ee
 Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
 
 ---
- lib/string.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
+ lib/string.c | 77 +++++++++++++++++++++++++++++++++++++++++++---------
  1 file changed, 64 insertions(+), 13 deletions(-)
 
 diff --git a/lib/string.c b/lib/string.c
-index 67d5f6a..0bf472f 100644
+index 67d5f6a421..0bf472f1f6 100644
 --- a/lib/string.c
 +++ b/lib/string.c
 @@ -505,26 +505,77 @@ void * memcpy(void *dest, const void *src, size_t count)
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0019-u-boot-full-platform-reset-espi-oob-ready.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0019-u-boot-full-platform-reset-espi-oob-ready.patch
index 8a63edbb7..8798c1f6a 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0019-u-boot-full-platform-reset-espi-oob-ready.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0019-u-boot-full-platform-reset-espi-oob-ready.patch
@@ -1,4 +1,4 @@
-From 9b05a276af65dd436f30b1b2680a09821c5a81aa Mon Sep 17 00:00:00 2001
+From ec61ed244f574158315df42c17f4a8d3b3504b97 Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@intel.com>
 Date: Mon, 17 Dec 2018 20:37:23 -0800
 Subject: [PATCH] u-boot: full platform reset + espi oob-ready
@@ -14,7 +14,7 @@ Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/mach-aspeed/platform_g5.S b/arch/arm/mach-aspeed/platform_g5.S
-index 2ac1ca4..66427b6 100644
+index 2ac1ca4721..66427b6f33 100644
 --- a/arch/arm/mach-aspeed/platform_g5.S
 +++ b/arch/arm/mach-aspeed/platform_g5.S
 @@ -139,7 +139,7 @@
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0020-Add-system-reset-status-support.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0020-Add-system-reset-status-support.patch
index afdd610b3..c5d194d6b 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0020-Add-system-reset-status-support.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0020-Add-system-reset-status-support.patch
@@ -1,4 +1,4 @@
-From 54616ade08517374200a332e50f68ee9d0fbf5c5 Mon Sep 17 00:00:00 2001
+From 4027a17dcfa5749cf2777a62c695a5b04377756b Mon Sep 17 00:00:00 2001
 From: Yong Li <yong.b.li@linux.intel.com>
 Date: Tue, 9 Apr 2019 14:42:05 +0800
 Subject: [PATCH] Add system reset status support
@@ -14,12 +14,12 @@ Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
 ---
  arch/arm/include/asm/arch-aspeed/platform.h |  2 +
  arch/arm/mach-aspeed/ast-scu.c              |  4 ++
- board/aspeed/ast-g5/ast-g5-intel.c          | 73 +++++++++++++++++++++++++++++
- board/aspeed/ast-g5/ast-g5.c                |  7 +++
+ board/aspeed/ast-g5/ast-g5-intel.c          | 73 +++++++++++++++++++++
+ board/aspeed/ast-g5/ast-g5.c                |  7 ++
  4 files changed, 86 insertions(+)
 
 diff --git a/arch/arm/include/asm/arch-aspeed/platform.h b/arch/arm/include/asm/arch-aspeed/platform.h
-index 3b06e52..4e4140d 100644
+index 3b06e526f5..4e4140d8e4 100644
 --- a/arch/arm/include/asm/arch-aspeed/platform.h
 +++ b/arch/arm/include/asm/arch-aspeed/platform.h
 @@ -29,6 +29,8 @@
@@ -32,7 +32,7 @@ index 3b06e52..4e4140d 100644
  #err "No define for platform.h"
  #endif
 diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c
-index 3a9ba05..976c59b 100644
+index 3a9ba05bf2..976c59b82a 100644
 --- a/arch/arm/mach-aspeed/ast-scu.c
 +++ b/arch/arm/mach-aspeed/ast-scu.c
 @@ -494,6 +494,9 @@ void ast_scu_sys_rest_info(void)
@@ -54,11 +54,11 @@ index 3a9ba05..976c59b 100644
  
  u32 ast_scu_get_vga_memsize(void)
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index 01f8a13..e0bf9ee 100644
+index 5796ecf055..a223c798ac 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -303,6 +303,79 @@ static inline void ast_scu_write(uint32_t val, uint32_t reg)
- #endif
+@@ -333,6 +333,79 @@ static void set_pwm_duty_cycle(int duty)
+ 
  }
  
 +
@@ -138,10 +138,10 @@ index 01f8a13..e0bf9ee 100644
  {
  	uint32_t val;
 diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c
-index d41ef9c..0953677 100644
+index cab5fabcef..d89a2b799a 100644
 --- a/board/aspeed/ast-g5/ast-g5.c
 +++ b/board/aspeed/ast-g5/ast-g5.c
-@@ -19,6 +19,7 @@
+@@ -22,6 +22,7 @@
  DECLARE_GLOBAL_DATA_PTR;
  
  extern void ast_g5_intel(void);
@@ -149,7 +149,7 @@ index d41ef9c..0953677 100644
  
  int board_early_init_f(void)
  {
-@@ -40,6 +41,12 @@ int board_init(void)
+@@ -90,6 +91,12 @@ int board_init(void)
  	return 0;
  }
  
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0020-Enable-PCIe-L1-support.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0020-Enable-PCIe-L1-support.patch
index 6949856db..60800a3fd 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0020-Enable-PCIe-L1-support.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0020-Enable-PCIe-L1-support.patch
@@ -1,4 +1,4 @@
-From 647cc2538ed6b64054c742b4668386fda9394221 Mon Sep 17 00:00:00 2001
+From 088d7496885148f6d953a709988ab3ac1c2919a8 Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 Date: Tue, 8 Jan 2019 13:33:15 -0800
 Subject: [PATCH] Enable PCIe L1 support
@@ -12,7 +12,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
  1 file changed, 12 insertions(+)
 
 diff --git a/arch/arm/mach-aspeed/platform_g5.S b/arch/arm/mach-aspeed/platform_g5.S
-index 66427b6..b404353 100644
+index 66427b6f33..b4043534b0 100644
 --- a/arch/arm/mach-aspeed/platform_g5.S
 +++ b/arch/arm/mach-aspeed/platform_g5.S
 @@ -2432,6 +2432,18 @@ spi_cbr_end:
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0021-Config-host-uart-clock-source-using-environment-vari.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0021-Config-host-uart-clock-source-using-environment-vari.patch
index 32a40261f..7cc0d2d11 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0021-Config-host-uart-clock-source-using-environment-vari.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0021-Config-host-uart-clock-source-using-environment-vari.patch
@@ -1,4 +1,4 @@
-From 30c634b4969b8a3cd3afc079d60d23d2cb9f5f5c Mon Sep 17 00:00:00 2001
+From 2740b1112737d3acd23d3a0b56ab26b05a5d1a5e Mon Sep 17 00:00:00 2001
 From: Yong Li <yong.b.li@linux.intel.com>
 Date: Mon, 11 Feb 2019 15:19:56 +0800
 Subject: [PATCH] Config host uart clock source using environment variable
@@ -27,15 +27,15 @@ cat /sys/class/tty/ttyS*/uartclk, ttyS0/12/3 should be 192MHz
 Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
 
 ---
- arch/arm/include/asm/arch-aspeed/regs-scu.h |  5 ++++
- board/aspeed/ast-g5/ast-g5-intel.c          | 39 +++++++++++++++++++++++++++++
+ arch/arm/include/asm/arch-aspeed/regs-scu.h |  5 +++
+ board/aspeed/ast-g5/ast-g5-intel.c          | 39 +++++++++++++++++++++
  2 files changed, 44 insertions(+)
 
 diff --git a/arch/arm/include/asm/arch-aspeed/regs-scu.h b/arch/arm/include/asm/arch-aspeed/regs-scu.h
-index 10b983a..8a596ce 100644
+index 019c00036a..a2c9549fc6 100644
 --- a/arch/arm/include/asm/arch-aspeed/regs-scu.h
 +++ b/arch/arm/include/asm/arch-aspeed/regs-scu.h
-@@ -529,6 +529,11 @@
+@@ -530,6 +530,11 @@
  /* AST_SCU_MAC_CLK			0x48 - MAC interface clock delay setting register */
  
  /* AST_SCU_MISC2_CTRL			0x4C - Misc. 2 Control register */
@@ -48,10 +48,10 @@ index 10b983a..8a596ce 100644
  #define SCU_PCIE_MAPPING_HIGH		(1 << 15)
  #define SCU_MALI_DTY_MODE		(1 << 8)
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index e0bf9ee..e19df03 100644
+index a223c798ac..a16e1330a0 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -103,6 +103,9 @@ static const GPIOValue gpio_table[] = {
+@@ -106,6 +106,9 @@ static const GPIOValue gpio_table[] = {
  #define SGPIO_ENABLE 1
  #define GPIO254 0x254
  
@@ -61,7 +61,7 @@ index e0bf9ee..e19df03 100644
  static void sgpio_init(void)
  {
  	uint32_t value;
-@@ -368,6 +371,42 @@ void ast_g5_intel_late_init(void)
+@@ -398,6 +401,42 @@ void ast_g5_intel_late_init(void)
  	char value[32];
  	u32 reset_reason = 0;
  
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-KCS-driver-support-in-uBoot.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-KCS-driver-support-in-uBoot.patch
index 2b6382967..9020ff265 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-KCS-driver-support-in-uBoot.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-KCS-driver-support-in-uBoot.patch
@@ -1,7 +1,7 @@
-From 6d8db23becf9665193023e350adcad00b75195b0 Mon Sep 17 00:00:00 2001
+From ecda16cf2eb96fb63aca737513abcf79cc59a44b Mon Sep 17 00:00:00 2001
 From: AppaRao Puli <apparao.puli@linux.intel.com>
 Date: Wed, 13 Mar 2019 14:28:05 +0530
-Subject: [PATCH 1/1] KCS driver support in uBoot
+Subject: [PATCH] KCS driver support in uBoot
 
 Added KCS support in uBoot. This will enable
 KCS channels and set the specified registers
@@ -26,6 +26,7 @@ via KCS interfaces using cmdtool.efi.
 
 Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
 Signed-off-by: James Feist <james.feist@linux.intel.com>
+
 ---
  board/aspeed/ast-g5/Makefile       |   1 +
  board/aspeed/ast-g5/ast-g5-intel.c |   3 +
@@ -45,20 +46,20 @@ index 90224333c4..05972b9d17 100644
  obj-y += ast-g5-timer.o
 +obj-y += ast-g5-kcs.o
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index 032f716722..c149426947 100644
+index a16e1330a0..ac2af9af56 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -256,6 +256,7 @@ int intel_force_firmware_jumper_enabled(void)
+@@ -493,6 +493,7 @@ static void pwm_init(void)
  }
  
  extern void espi_init(void);
 +extern void kcs_init(void);
  void ast_g5_intel(void)
  {
- 	gpio_init(gpio_table, ARRAY_SIZE(gpio_table));
-@@ -264,5 +265,7 @@ void ast_g5_intel(void)
- 	timer8_init();
- 	if (intel_force_firmware_jumper_enabled()) {
+ 	pwm_init();
+@@ -505,5 +506,7 @@ void ast_g5_intel(void)
+ 		id_led_control(GPIO_ID_LED, EIDLED_On);
+ 		id_led_control(GPIO_GREEN_LED, EIDLED_Off);
  		id_led_control(GPIO_AMBER_LED, EIDLED_On);
 +		kcs_init();
 +		/* TODO: need to stop the booting here. */
@@ -608,6 +609,3 @@ index 0000000000..bb697c455d
 +	u16 data_out_idx;
 +	u8 data_out[MAX_KCS_PKT_SIZE];
 +};
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-u-boot-env-change-for-PFR-image.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-u-boot-env-change-for-PFR-image.patch
index afba07abf..5a9b3c081 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-u-boot-env-change-for-PFR-image.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-u-boot-env-change-for-PFR-image.patch
@@ -1,4 +1,4 @@
-From 4cbfb21b7792e6dae74e2db6e2e2d6803bf6cc1d Mon Sep 17 00:00:00 2001
+From d0546e59ff42f964ab09cebb1bab0fc2d8e7e6d8 Mon Sep 17 00:00:00 2001
 From: Vikram Bodireddy <vikram.bodireddy@intel.com>
 Date: Tue, 26 Mar 2019 20:34:51 +0530
 Subject: [PATCH] u-boot env change for PFR image
@@ -6,12 +6,13 @@ Subject: [PATCH] u-boot env change for PFR image
 Tested: verified BMC booting from 0x20b00000
 
 Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
+
 ---
  include/configs/ast-common.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
-index 0bc7f2d..821ea8f 100644
+index 0bc7f2d75f..821ea8f8eb 100644
 --- a/include/configs/ast-common.h
 +++ b/include/configs/ast-common.h
 @@ -108,7 +108,7 @@
@@ -32,6 +33,3 @@ index 0bc7f2d..821ea8f 100644
  #define CONFIG_ENV_OVERWRITE
  
  #define ASPEED_ENV_SETTINGS \
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0023-Add-TPM-enable-pulse-triggering.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0023-Add-TPM-enable-pulse-triggering.patch
index f3fc0738b..8da4dc22f 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0023-Add-TPM-enable-pulse-triggering.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0023-Add-TPM-enable-pulse-triggering.patch
@@ -1,4 +1,4 @@
-From 6b0f858e2dda7afce82797835f950e3501b3046d Mon Sep 17 00:00:00 2001
+From ad47771d6210d686082498e4e829b41b8fd8e160 Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 Date: Fri, 29 Mar 2019 12:30:20 -0700
 Subject: [PATCH] Add TPM enable pulse triggering
@@ -12,10 +12,10 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index adc6d10..55afa09 100644
+index ac2af9af56..45ecd83fd3 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -53,8 +53,8 @@ static const GPIOValue gpio_table[] = {
+@@ -56,8 +56,8 @@ static const GPIOValue gpio_table[] = {
  				GPIO_DEBOUNCE_8MS},
  
  	/* Enable Pulse -- pin D6 */
@@ -26,7 +26,7 @@ index adc6d10..55afa09 100644
  };
  
  #define LPC_SNOOP_ADDR 0x80
-@@ -232,6 +232,13 @@ void id_led_control(int id, int action)
+@@ -237,6 +237,13 @@ void id_led_control(int id, int action)
  	gpio_set_value(s_led_info[id].gpio, s_led_info[id].state);
  }
  
@@ -40,11 +40,11 @@ index adc6d10..55afa09 100644
  static void timer8_irq_handler(void *regs)
  {
  	int i;
-@@ -488,6 +495,7 @@ void ast_g5_intel(void)
+@@ -501,6 +508,7 @@ void ast_g5_intel(void)
  	espi_init();
  	sgpio_init();
  	timer8_init();
 +	enable_onboard_tpm();
  	if (intel_force_firmware_jumper_enabled()) {
- 		id_led_control(GPIO_AMBER_LED, EIDLED_On);
- 		kcs_init();
+ 		/* FFUJ mode:- ChassisID: Solid Blue, StatusLED: Solid Amber */
+ 		id_led_control(GPIO_ID_LED, EIDLED_On);
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0024-IPMI-command-handler-implementation-in-uboot.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0024-IPMI-command-handler-implementation-in-uboot.patch
index 252a9ea1b..0697c2808 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0024-IPMI-command-handler-implementation-in-uboot.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0024-IPMI-command-handler-implementation-in-uboot.patch
@@ -1,4 +1,4 @@
-From 2314db61ea792a98c35fcc75b0ac09cbc0db005d Mon Sep 17 00:00:00 2001
+From 7bbaf8f4c268f9df195a84486caf3c22e21db59e Mon Sep 17 00:00:00 2001
 From: AppaRao Puli <apparao.puli@linux.intel.com>
 Date: Tue, 21 May 2019 00:19:16 +0530
 Subject: [PATCH] IPMI command handler implementation in uboot
@@ -23,15 +23,15 @@ Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
 
 ---
  board/aspeed/ast-g5/Makefile       |   1 +
- board/aspeed/ast-g5/ast-g5-kcs.c   |  77 +++++++++++++-----------
- board/aspeed/ast-g5/ipmi-handler.c | 118 +++++++++++++++++++++++++++++++++++++
- board/aspeed/ast-g5/ipmi-handler.h |  40 +++++++++++++
+ board/aspeed/ast-g5/ast-g5-kcs.c   |  77 ++++++++++---------
+ board/aspeed/ast-g5/ipmi-handler.c | 118 +++++++++++++++++++++++++++++
+ board/aspeed/ast-g5/ipmi-handler.h |  40 ++++++++++
  4 files changed, 202 insertions(+), 34 deletions(-)
  create mode 100644 board/aspeed/ast-g5/ipmi-handler.c
  create mode 100644 board/aspeed/ast-g5/ipmi-handler.h
 
 diff --git a/board/aspeed/ast-g5/Makefile b/board/aspeed/ast-g5/Makefile
-index 05972b9..f28fcfe 100644
+index 05972b9d17..f28fcfe61c 100644
 --- a/board/aspeed/ast-g5/Makefile
 +++ b/board/aspeed/ast-g5/Makefile
 @@ -5,3 +5,4 @@ obj-y += ast-g5-irq.o
@@ -40,7 +40,7 @@ index 05972b9..f28fcfe 100644
  obj-y += ast-g5-kcs.o
 +obj-y += ipmi-handler.o
 diff --git a/board/aspeed/ast-g5/ast-g5-kcs.c b/board/aspeed/ast-g5/ast-g5-kcs.c
-index 7bff26f..98bf69b 100644
+index 7bff26f9db..98bf69ba85 100644
 --- a/board/aspeed/ast-g5/ast-g5-kcs.c
 +++ b/board/aspeed/ast-g5/ast-g5-kcs.c
 @@ -1,7 +1,7 @@
@@ -160,7 +160,7 @@ index 7bff26f..98bf69b 100644
  	kcs_pkt->read_req_done = false;
 diff --git a/board/aspeed/ast-g5/ipmi-handler.c b/board/aspeed/ast-g5/ipmi-handler.c
 new file mode 100644
-index 0000000..9cccee9
+index 0000000000..9cccee9f2f
 --- /dev/null
 +++ b/board/aspeed/ast-g5/ipmi-handler.c
 @@ -0,0 +1,118 @@
@@ -284,7 +284,7 @@ index 0000000..9cccee9
 +}
 diff --git a/board/aspeed/ast-g5/ipmi-handler.h b/board/aspeed/ast-g5/ipmi-handler.h
 new file mode 100644
-index 0000000..9d46d9b
+index 0000000000..9d46d9bd9a
 --- /dev/null
 +++ b/board/aspeed/ast-g5/ipmi-handler.h
 @@ -0,0 +1,40 @@
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0025-Manufacturing-mode-physical-presence-detection.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0025-Manufacturing-mode-physical-presence-detection.patch
index 065f890bc..6932aebf0 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0025-Manufacturing-mode-physical-presence-detection.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0025-Manufacturing-mode-physical-presence-detection.patch
@@ -1,7 +1,7 @@
-From b6f898ef15eede75700e9e13a8e0b69d88b12fd4 Mon Sep 17 00:00:00 2001
+From 008edb2487358bb3f0f0ec1d753cc5bff7b08182 Mon Sep 17 00:00:00 2001
 From: AppaRao Puli <apparao.puli@linux.intel.com>
 Date: Thu, 20 Jun 2019 18:11:43 +0530
-Subject: [PATCH 15/30] Manufacturing mode physical presence detection
+Subject: [PATCH] Manufacturing mode physical presence detection
 
 Support for physical presence of manufacturing mode added.
 Front panel power button press for 15 seconds will be detected
@@ -23,7 +23,7 @@ Change-Id: Id7e7c7e7860c7ef3ae8e3a7a7cfda7ff506c0f2b
 Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com>
 Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
 
-%% original patch: 0025-Manufacturing-mode-physical-presence-detection.patch
+
 ---
  board/aspeed/ast-g5/ast-g5-gpio.h  |  2 +-
  board/aspeed/ast-g5/ast-g5-intel.c | 35 ++++++++++++++++++++++++++++++
@@ -109,6 +109,3 @@ index 45ecd83fd3..efc3315caf 100644
  }
  
  static void pwm_init(void)
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0026-Aspeed-I2C-support-in-U-Boot.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0026-Aspeed-I2C-support-in-U-Boot.patch
index be2c4018d..2002259ee 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0026-Aspeed-I2C-support-in-U-Boot.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0026-Aspeed-I2C-support-in-U-Boot.patch
@@ -1,4 +1,4 @@
-From ea4f14a24b67d5085149d48c7fb38d00f3a7444a Mon Sep 17 00:00:00 2001
+From dd5ead5f8474a9929301745d3cdac23385ff6ded Mon Sep 17 00:00:00 2001
 From: AppaRao Puli <apparao.puli@linux.intel.com>
 Date: Mon, 6 May 2019 03:01:55 +0530
 Subject: [PATCH] Aspeed I2C support in U-Boot
@@ -16,24 +16,24 @@ Change-Id: Iad9af4a57a58bc8dc5c470bfadad9dac1371c238
 Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
 
 ---
- arch/arm/include/asm/arch-aspeed/ast_g5_platform.h |  14 +
- arch/arm/include/asm/arch-aspeed/ast_scu.h         |   5 +
- arch/arm/include/asm/arch-aspeed/regs-iic.h        | 204 +++++
- arch/arm/mach-aspeed/ast-scu.c                     | 122 +++
- board/aspeed/ast-g5/ast-g5.c                       |   8 +
- configs/ast_g5_phy_defconfig                       |   2 +
- drivers/i2c/Kconfig                                |   5 +
- drivers/i2c/Makefile                               |   1 +
- drivers/i2c/ast_i2c.c                              | 852 +++++++++++++++++++++
- drivers/i2c/ast_i2c.h                              | 131 ++++
- include/configs/ast-common.h                       |   5 +
+ .../include/asm/arch-aspeed/ast_g5_platform.h |  14 +
+ arch/arm/include/asm/arch-aspeed/ast_scu.h    |   5 +
+ arch/arm/include/asm/arch-aspeed/regs-iic.h   | 204 +++++
+ arch/arm/mach-aspeed/ast-scu.c                | 122 +++
+ board/aspeed/ast-g5/ast-g5.c                  |   8 +
+ configs/ast_g5_phy_defconfig                  |   2 +
+ drivers/i2c/Kconfig                           |   5 +
+ drivers/i2c/Makefile                          |   1 +
+ drivers/i2c/ast_i2c.c                         | 852 ++++++++++++++++++
+ drivers/i2c/ast_i2c.h                         | 131 +++
+ include/configs/ast-common.h                  |   5 +
  11 files changed, 1349 insertions(+)
  create mode 100644 arch/arm/include/asm/arch-aspeed/regs-iic.h
  create mode 100644 drivers/i2c/ast_i2c.c
  create mode 100644 drivers/i2c/ast_i2c.h
 
 diff --git a/arch/arm/include/asm/arch-aspeed/ast_g5_platform.h b/arch/arm/include/asm/arch-aspeed/ast_g5_platform.h
-index 4210873..a84f471 100644
+index 42108733f3..a84f471bf4 100644
 --- a/arch/arm/include/asm/arch-aspeed/ast_g5_platform.h
 +++ b/arch/arm/include/asm/arch-aspeed/ast_g5_platform.h
 @@ -105,6 +105,20 @@
@@ -58,7 +58,7 @@ index 4210873..a84f471 100644
  #define AST_PCIARBITER_BASE		0x1E78C000 /* PCI ARBITER */
  #define AST_UART2_BASE			0x1E78D000 /* UART2 */
 diff --git a/arch/arm/include/asm/arch-aspeed/ast_scu.h b/arch/arm/include/asm/arch-aspeed/ast_scu.h
-index 369c4e3..b94d13e 100644
+index 369c4e3b60..b94d13e97d 100644
 --- a/arch/arm/include/asm/arch-aspeed/ast_scu.h
 +++ b/arch/arm/include/asm/arch-aspeed/ast_scu.h
 @@ -28,6 +28,8 @@
@@ -89,7 +89,7 @@ index 369c4e3..b94d13e 100644
  
 diff --git a/arch/arm/include/asm/arch-aspeed/regs-iic.h b/arch/arm/include/asm/arch-aspeed/regs-iic.h
 new file mode 100644
-index 0000000..5eb3f0a
+index 0000000000..5eb3f0a828
 --- /dev/null
 +++ b/arch/arm/include/asm/arch-aspeed/regs-iic.h
 @@ -0,0 +1,204 @@
@@ -298,7 +298,7 @@ index 0000000..5eb3f0a
 +
 +#endif /* __ASM_ARCH_REGS_IIC_H */
 diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c
-index 976c59b..537cd4b 100644
+index 976c59b82a..537cd4b3e1 100644
 --- a/arch/arm/mach-aspeed/ast-scu.c
 +++ b/arch/arm/mach-aspeed/ast-scu.c
 @@ -112,6 +112,12 @@ static struct soc_id soc_map_table[] = {
@@ -445,18 +445,18 @@ index 976c59b..537cd4b 100644
  {
  	int i;
 diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c
-index 0953677..3c33546 100644
+index d89a2b799a..ead2e1bb63 100644
 --- a/board/aspeed/ast-g5/ast-g5.c
 +++ b/board/aspeed/ast-g5/ast-g5.c
-@@ -13,6 +13,7 @@
- #include <asm/arch/ast_scu.h>
- #include <asm/arch/ast-sdmc.h>
+@@ -16,6 +16,7 @@
+ #include <asm/arch/regs-scu.h>
+ #include <asm/arch/regs-sdmc.h>
  #include <asm/io.h>
 +#include <i2c.h>
  
  #include "ast-g5.h"
  
-@@ -37,6 +38,13 @@ int board_init(void)
+@@ -87,6 +88,13 @@ int board_init(void)
  	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
  	gd->flags = 0;
  
@@ -471,7 +471,7 @@ index 0953677..3c33546 100644
  	return 0;
  }
 diff --git a/configs/ast_g5_phy_defconfig b/configs/ast_g5_phy_defconfig
-index 4aefcf4..1b96ab7 100644
+index 4aefcf49e8..1b96ab7f3b 100644
 --- a/configs/ast_g5_phy_defconfig
 +++ b/configs/ast_g5_phy_defconfig
 @@ -13,3 +13,5 @@ CONFIG_OF_LIBFDT=y
@@ -481,7 +481,7 @@ index 4aefcf4..1b96ab7 100644
 +CONFIG_CMD_I2C=y
 +CONFIG_SYS_I2C_AST=y
 diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
-index 6e22bba..5368ba2 100644
+index 6e22bbadff..5368ba270a 100644
 --- a/drivers/i2c/Kconfig
 +++ b/drivers/i2c/Kconfig
 @@ -58,6 +58,11 @@ config DM_I2C_GPIO
@@ -497,7 +497,7 @@ index 6e22bba..5368ba2 100644
         bool "Freescale I2C bus driver"
         depends on DM_I2C
 diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
-index 167424d..b2a69ea 100644
+index 167424db98..b2a69eafc1 100644
 --- a/drivers/i2c/Makefile
 +++ b/drivers/i2c/Makefile
 @@ -11,6 +11,7 @@ obj-$(CONFIG_$(SPL_)I2C_CROS_EC_TUNNEL) += cros_ec_tunnel.o
@@ -510,7 +510,7 @@ index 167424d..b2a69ea 100644
  obj-$(CONFIG_TSI108_I2C) += tsi108_i2c.o
 diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c
 new file mode 100644
-index 0000000..533419f
+index 0000000000..533419f9dd
 --- /dev/null
 +++ b/drivers/i2c/ast_i2c.c
 @@ -0,0 +1,852 @@
@@ -1368,7 +1368,7 @@ index 0000000..533419f
 +#endif
 diff --git a/drivers/i2c/ast_i2c.h b/drivers/i2c/ast_i2c.h
 new file mode 100644
-index 0000000..7cff0e5
+index 0000000000..7cff0e5a10
 --- /dev/null
 +++ b/drivers/i2c/ast_i2c.h
 @@ -0,0 +1,131 @@
@@ -1504,7 +1504,7 @@ index 0000000..7cff0e5
 +
 +#endif				/* __AST_I2C_H_ */
 diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
-index b7d7192..0bc7f2d 100644
+index b7d7192cce..0bc7f2d75f 100644
 --- a/include/configs/ast-common.h
 +++ b/include/configs/ast-common.h
 @@ -84,6 +84,11 @@
@@ -1519,6 +1519,3 @@ index b7d7192..0bc7f2d 100644
  /*
   * Optional MTD and UBI support
   */
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0027-CPLD-u-boot-commands-support-for-PFR.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0027-CPLD-u-boot-commands-support-for-PFR.patch
index ac458dd6c..2729b066d 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0027-CPLD-u-boot-commands-support-for-PFR.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0027-CPLD-u-boot-commands-support-for-PFR.patch
@@ -1,4 +1,4 @@
-From 0083904a79527cef9ca99e516ed015b56a6b95c7 Mon Sep 17 00:00:00 2001
+From 3d2ea02810c8b6d595536cf2ce0c692f56ebaf0c Mon Sep 17 00:00:00 2001
 From: AppaRao Puli <apparao.puli@linux.intel.com>
 Date: Tue, 7 May 2019 11:26:35 +0530
 Subject: [PATCH] CPLD u-boot commands support for PFR
@@ -29,6 +29,7 @@ ast#
 Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
 
 Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
+
 ---
  cmd/Makefile |   1 +
  cmd/cpld.c   | 244 +++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -297,6 +298,3 @@ index 0000000000..1b225d20dc
 +#endif
 +
 +U_BOOT_CMD(cpld, 4, 1, do_cpld, "PFR CPLD information", cpld_help_text);
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0028-Enabling-uart1-uart2-in-u-boot-for-BIOS-messages.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0028-Enabling-uart1-uart2-in-u-boot-for-BIOS-messages.patch
index 0113fc3fe..e3864db6e 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0028-Enabling-uart1-uart2-in-u-boot-for-BIOS-messages.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0028-Enabling-uart1-uart2-in-u-boot-for-BIOS-messages.patch
@@ -1,4 +1,4 @@
-From 41c08f1fcb5fa0b07ea541fc3d8bc322ddf8701d Mon Sep 17 00:00:00 2001
+From f387e9be00ccaa49d77c82d4340dff6f84bb4bb3 Mon Sep 17 00:00:00 2001
 From: AppaRao Puli <apparao.puli@linux.intel.com>
 Date: Mon, 13 May 2019 23:49:02 +0530
 Subject: [PATCH] Enabling uart1&uart2 in u-boot for BIOS messages
@@ -19,10 +19,10 @@ Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
  1 file changed, 21 insertions(+)
 
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index 812e3ef..e68ab85 100644
+index efc3315caf..a8b65658b3 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -453,6 +453,26 @@ void ast_g5_intel_late_init(void)
+@@ -487,6 +487,26 @@ void ast_g5_intel_late_init(void)
  		update_bootargs_cmd("special", NULL);
  }
  
@@ -49,7 +49,7 @@ index 812e3ef..e68ab85 100644
  static void pwm_init(void)
  {
  	uint32_t val;
-@@ -521,6 +541,7 @@ extern void espi_init(void);
+@@ -538,6 +558,7 @@ extern void espi_init(void);
  extern void kcs_init(void);
  void ast_g5_intel(void)
  {
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0029-FFUJ-FW-IPMI-commands-and-flash-support-in-u-boot.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0029-FFUJ-FW-IPMI-commands-and-flash-support-in-u-boot.patch
index 3c21a7c0a..5dbf1304c 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0029-FFUJ-FW-IPMI-commands-and-flash-support-in-u-boot.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0029-FFUJ-FW-IPMI-commands-and-flash-support-in-u-boot.patch
@@ -1,4 +1,4 @@
-From 0f64b0e0c0a122ce23b5ccc518f514ec296bc7f5 Mon Sep 17 00:00:00 2001
+From 61587868bf9979dd8308f12157310949f0e5c430 Mon Sep 17 00:00:00 2001
 From: AppaRao Puli <apparao.puli@linux.intel.com>
 Date: Tue, 21 May 2019 00:53:04 +0530
 Subject: [PATCH] FFUJ: FW IPMI commands and flash support in u-boot
@@ -28,17 +28,18 @@ Tested:
    image transfer via KCS and flashing.
 
 Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
+
 ---
- arch/arm/include/asm/arch-aspeed/ast-g5-intel.h |   1 +
- board/aspeed/ast-g5/Makefile                    |   2 +
- board/aspeed/ast-g5/fw-update.c                 | 486 ++++++++++++++++++++++++
- board/aspeed/ast-g5/fw-update.h                 |  50 +++
- board/aspeed/ast-g5/ipmi-fwupd.c                | 402 ++++++++++++++++++++
- board/aspeed/ast-g5/ipmi-fwupd.h                |  81 ++++
- board/aspeed/ast-g5/ipmi-handler.c              |  66 +++-
- board/aspeed/ast-g5/ipmi-handler.h              |   3 +-
- common/autoboot.c                               |  13 +
- configs/ast_g5_phy_defconfig                    |   1 +
+ .../include/asm/arch-aspeed/ast-g5-intel.h    |   1 +
+ board/aspeed/ast-g5/Makefile                  |   2 +
+ board/aspeed/ast-g5/fw-update.c               | 486 ++++++++++++++++++
+ board/aspeed/ast-g5/fw-update.h               |  50 ++
+ board/aspeed/ast-g5/ipmi-fwupd.c              | 402 +++++++++++++++
+ board/aspeed/ast-g5/ipmi-fwupd.h              |  81 +++
+ board/aspeed/ast-g5/ipmi-handler.c            |  66 ++-
+ board/aspeed/ast-g5/ipmi-handler.h            |   3 +-
+ common/autoboot.c                             |  13 +
+ configs/ast_g5_phy_defconfig                  |   1 +
  10 files changed, 1093 insertions(+), 12 deletions(-)
  create mode 100644 board/aspeed/ast-g5/fw-update.c
  create mode 100644 board/aspeed/ast-g5/fw-update.h
@@ -46,7 +47,7 @@ Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
  create mode 100644 board/aspeed/ast-g5/ipmi-fwupd.h
 
 diff --git a/arch/arm/include/asm/arch-aspeed/ast-g5-intel.h b/arch/arm/include/asm/arch-aspeed/ast-g5-intel.h
-index cd9a099..a88521a 100644
+index cd9a0994fa..a88521a1b3 100644
 --- a/arch/arm/include/asm/arch-aspeed/ast-g5-intel.h
 +++ b/arch/arm/include/asm/arch-aspeed/ast-g5-intel.h
 @@ -14,6 +14,7 @@
@@ -58,7 +59,7 @@ index cd9a099..a88521a 100644
  
  #endif /* __AST_INTEL_G5_H__ */
 diff --git a/board/aspeed/ast-g5/Makefile b/board/aspeed/ast-g5/Makefile
-index f28fcfe..0b2d936 100644
+index f28fcfe61c..0b2d936c23 100644
 --- a/board/aspeed/ast-g5/Makefile
 +++ b/board/aspeed/ast-g5/Makefile
 @@ -6,3 +6,5 @@ obj-y += ast-g5-gpio.o
@@ -69,7 +70,7 @@ index f28fcfe..0b2d936 100644
 +obj-y += fw-update.o
 diff --git a/board/aspeed/ast-g5/fw-update.c b/board/aspeed/ast-g5/fw-update.c
 new file mode 100644
-index 0000000..9923993
+index 0000000000..99239938b5
 --- /dev/null
 +++ b/board/aspeed/ast-g5/fw-update.c
 @@ -0,0 +1,486 @@
@@ -561,7 +562,7 @@ index 0000000..9923993
 +#endif
 diff --git a/board/aspeed/ast-g5/fw-update.h b/board/aspeed/ast-g5/fw-update.h
 new file mode 100644
-index 0000000..ed033ad
+index 0000000000..ed033adfed
 --- /dev/null
 +++ b/board/aspeed/ast-g5/fw-update.h
 @@ -0,0 +1,50 @@
@@ -617,7 +618,7 @@ index 0000000..ed033ad
 +int generate_random_number(void);
 diff --git a/board/aspeed/ast-g5/ipmi-fwupd.c b/board/aspeed/ast-g5/ipmi-fwupd.c
 new file mode 100644
-index 0000000..3eba056
+index 0000000000..3eba056e7f
 --- /dev/null
 +++ b/board/aspeed/ast-g5/ipmi-fwupd.c
 @@ -0,0 +1,402 @@
@@ -1025,7 +1026,7 @@ index 0000000..3eba056
 +}
 diff --git a/board/aspeed/ast-g5/ipmi-fwupd.h b/board/aspeed/ast-g5/ipmi-fwupd.h
 new file mode 100644
-index 0000000..e490f6b
+index 0000000000..e490f6b527
 --- /dev/null
 +++ b/board/aspeed/ast-g5/ipmi-fwupd.h
 @@ -0,0 +1,81 @@
@@ -1111,7 +1112,7 @@ index 0000000..e490f6b
 +u16 fwupd_get_update_status(u8 *req, u16 req_len, u8 *res);
 +u16 fwupd_image_write(u8 *req, u16 req_len, u8 *res);
 diff --git a/board/aspeed/ast-g5/ipmi-handler.c b/board/aspeed/ast-g5/ipmi-handler.c
-index 9cccee9..5e78546 100644
+index 9cccee9f2f..5e78546e70 100644
 --- a/board/aspeed/ast-g5/ipmi-handler.c
 +++ b/board/aspeed/ast-g5/ipmi-handler.c
 @@ -1,18 +1,37 @@
@@ -1212,7 +1213,7 @@ index 9cccee9..5e78546 100644
  
  #define CMD_TABLE_SIZE ARRAY_SIZE(cmd_info)
 diff --git a/board/aspeed/ast-g5/ipmi-handler.h b/board/aspeed/ast-g5/ipmi-handler.h
-index 9d46d9b..8eea930 100644
+index 9d46d9bd9a..8eea93063a 100644
 --- a/board/aspeed/ast-g5/ipmi-handler.h
 +++ b/board/aspeed/ast-g5/ipmi-handler.h
 @@ -1,4 +1,3 @@
@@ -1236,7 +1237,7 @@ index 9d46d9b..8eea930 100644
  
  /* BMC IPMB LUNs */
 diff --git a/common/autoboot.c b/common/autoboot.c
-index d66c0fa..3647d5f 100644
+index d66c0fa63a..3647d5fb21 100644
 --- a/common/autoboot.c
 +++ b/common/autoboot.c
 @@ -349,6 +349,19 @@ void autoboot_command(const char *s)
@@ -1260,7 +1261,7 @@ index d66c0fa..3647d5f 100644
  #if defined(CONFIG_AUTOBOOT_KEYED) && !defined(CONFIG_AUTOBOOT_KEYED_CTRLC)
  		int prev = disable_ctrlc(1);	/* disable Control C checking */
 diff --git a/configs/ast_g5_phy_defconfig b/configs/ast_g5_phy_defconfig
-index 1b96ab7..5965a9b 100644
+index 1b96ab7f3b..5965a9b04f 100644
 --- a/configs/ast_g5_phy_defconfig
 +++ b/configs/ast_g5_phy_defconfig
 @@ -15,3 +15,4 @@ CONFIG_SYS_NS16550=y
@@ -1268,6 +1269,3 @@ index 1b96ab7..5965a9b 100644
  CONFIG_CMD_I2C=y
  CONFIG_SYS_I2C_AST=y
 +CONFIG_LIB_RAND=y
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0030-Support-Get-Set-Security-mode-command.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0030-Support-Get-Set-Security-mode-command.patch
index 519977e19..ce62c3fb1 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0030-Support-Get-Set-Security-mode-command.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0030-Support-Get-Set-Security-mode-command.patch
@@ -1,4 +1,4 @@
-From 294a5971c94099277ee5b5589c060896cf22c495 Mon Sep 17 00:00:00 2001
+From 60b24cc8e1da556437770e9e49e046b9f41e2979 Mon Sep 17 00:00:00 2001
 From: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com>
 Date: Thu, 20 Jun 2019 15:26:50 +0530
 Subject: [PATCH] Support Get/Set Security mode command
@@ -20,11 +20,11 @@ throws correct errors
 Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com>
 
 ---
- board/aspeed/ast-g5/ipmi-handler.c | 63 +++++++++++++++++++++++++++++++++++++-
+ board/aspeed/ast-g5/ipmi-handler.c | 63 +++++++++++++++++++++++++++++-
  1 file changed, 62 insertions(+), 1 deletion(-)
 
 diff --git a/board/aspeed/ast-g5/ipmi-handler.c b/board/aspeed/ast-g5/ipmi-handler.c
-index 5e78546..4e921bd 100644
+index 5e78546e70..4e921bd575 100644
 --- a/board/aspeed/ast-g5/ipmi-handler.c
 +++ b/board/aspeed/ast-g5/ipmi-handler.c
 @@ -20,10 +20,19 @@
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0031-Make-it-so-TFTP-port-can-be-modified.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0031-Make-it-so-TFTP-port-can-be-modified.patch
index b70427fe0..9045360fc 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0031-Make-it-so-TFTP-port-can-be-modified.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0031-Make-it-so-TFTP-port-can-be-modified.patch
@@ -1,13 +1,14 @@
-From 1d680678abb76bdea7cf2128b7ce6db4a5652151 Mon Sep 17 00:00:00 2001
+From 853894273464f068107f8de3a786327871df699f Mon Sep 17 00:00:00 2001
 From: James Feist <james.feist@linux.intel.com>
 Date: Tue, 16 Jul 2019 16:30:02 -0700
-Subject: [PATCH 1/1] Make it so TFTP port can be modified
+Subject: [PATCH] Make it so TFTP port can be modified
 
 This makes it so we can use non-privileged tftp ports.
 
 Tested: Can load fw from non-privileged port.
 
 Signed-off-by: James Feist <james.feist@linux.intel.com>
+
 ---
  include/configs/ast-g5-ncsi.h | 2 ++
  include/configs/ast-g5-phy.h  | 2 ++
@@ -35,6 +36,3 @@ index 62ddb841e5..371f50a1db 100644
 +#define CONFIG_TFTP_PORT
 +
  #endif	/* __AST_G5_PHY_CONFIG_H */
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0032-PFR-FW-update-and-checkpoint-support-in-u-boot.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0032-PFR-FW-update-and-checkpoint-support-in-u-boot.patch
index 392acb9ad..bd32d55ec 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0032-PFR-FW-update-and-checkpoint-support-in-u-boot.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0032-PFR-FW-update-and-checkpoint-support-in-u-boot.patch
@@ -1,4 +1,4 @@
-From bd0d8af493387ab1602a0a40b4a548981c1e4d00 Mon Sep 17 00:00:00 2001
+From 5d16832eb3a65e2d30c732a06abcec801c1edf38 Mon Sep 17 00:00:00 2001
 From: AppaRao Puli <apparao.puli@linux.intel.com>
 Date: Wed, 24 Jul 2019 20:11:30 +0530
 Subject: [PATCH] PFR FW update and checkpoint support in u-boot
@@ -22,6 +22,7 @@ cross verified the check-points properly set or not.
 
 Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
 Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
+
 ---
  board/aspeed/ast-g5/Makefile       |   1 +
  board/aspeed/ast-g5/ast-g5-intel.c |  10 +++
@@ -45,7 +46,7 @@ index 0b2d936c23..9021d7fc08 100644
  obj-y += fw-update.o
 +obj-y += pfr-mgr.o
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index dde5adbc70..6ef3ca9f73 100644
+index 6e43b74bc4..6a36cfa2ba 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
 @@ -16,6 +16,7 @@
@@ -56,7 +57,7 @@ index dde5adbc70..6ef3ca9f73 100644
  
  /* Names to match the GPIOs */
  enum gpio_names {
-@@ -634,6 +635,10 @@ void ast_g5_intel(void)
+@@ -664,6 +665,10 @@ void ast_g5_intel(void)
  	ast_scu_write(ast_scu_read(AST_SCU_MISC1_CTRL) |
  		      SCU_MISC_UART_DEBUG_DIS, AST_SCU_MISC1_CTRL);
  
@@ -65,9 +66,9 @@ index dde5adbc70..6ef3ca9f73 100644
 +	set_cpld_reg(PFR_CPLD_BOOT_CHECKPOINT_REG, PFR_CPLD_CHKPOINT_START);
 +
  	uart_init();
+ 	mailbox_init();
  	pwm_init();
- 	gpio_init(gpio_table, ARRAY_SIZE(gpio_table));
-@@ -649,6 +654,11 @@ void ast_g5_intel(void)
+@@ -683,6 +688,11 @@ void ast_g5_intel(void)
  		kcs_init();
  		if (intel_get_platform_id() == COOPER_CITY_BOARD_ID)
  			set_pwm_duty_cycle(ELEVATED_PWM_DUTY_VALUE);
@@ -525,6 +526,3 @@ index 0000000000..5c5b98bbe0
 +ulong get_update_intent(u32 type);
 +ulong get_flash_region_offset(u32 type);
 +ulong get_image_max_size(u32 type);
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0033-Reboot-into-UBOOT-on-Watchdog-Failures.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0033-Reboot-into-UBOOT-on-Watchdog-Failures.patch
index e673da7ee..8a00ccc3d 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0033-Reboot-into-UBOOT-on-Watchdog-Failures.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0033-Reboot-into-UBOOT-on-Watchdog-Failures.patch
@@ -1,7 +1,7 @@
-From c82bf9de515cbbdb4ea1a350be83fb89f4a83631 Mon Sep 17 00:00:00 2001
+From a4ba855a0dfac7af9720e94d82720d1fd916cb4b Mon Sep 17 00:00:00 2001
 From: James Feist <james.feist@linux.intel.com>
 Date: Wed, 31 Jul 2019 16:01:49 -0700
-Subject: [PATCH 1/1] Reboot into UBOOT on Watchdog Failures
+Subject: [PATCH] Reboot into UBOOT on Watchdog Failures
 
 We use watchdog1 to reboot when there is a watchdog
 error. Reboot into u-boot as we are using that as
@@ -11,6 +11,7 @@ Tested: watchdog -T 0 -F /dev/watchdog1 reboots into
 uboot after 3 times
 
 Signed-off-by: James Feist <james.feist@linux.intel.com>
+
 ---
  .../include/asm/arch-aspeed/ast-g5-intel.h    |  1 +
  board/aspeed/ast-g5/ast-g5-intel.c            | 31 +++++++++++++++++++
@@ -30,10 +31,10 @@ index a88521a1b3..64f4ed17bf 100644
  #endif
  
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index e68ab8546a..c003d9a7bc 100644
+index a8b65658b3..12216922ac 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -111,6 +111,24 @@ static const GPIOValue gpio_table[] = {
+@@ -114,6 +114,24 @@ static const GPIOValue gpio_table[] = {
  #define HOST_SERIAL_A_HIGH_SPEED (1 << 0)
  #define HOST_SERIAL_B_HIGH_SPEED (1 << 1)
  
@@ -58,7 +59,7 @@ index e68ab8546a..c003d9a7bc 100644
  static void sgpio_init(void)
  {
  	uint32_t value;
-@@ -270,6 +288,11 @@ int intel_force_firmware_jumper_enabled(void)
+@@ -275,6 +293,11 @@ int intel_force_firmware_jumper_enabled(void)
  	return gpio_get_value(GPIO_FF_UPD_JUMPER);
  }
  
@@ -70,7 +71,7 @@ index e68ab8546a..c003d9a7bc 100644
  void arch_preboot_os(void)
  {
  	// last second before booting... set the LEDs
-@@ -402,6 +425,7 @@ void ast_g5_intel_late_init(void)
+@@ -436,6 +459,7 @@ void ast_g5_intel_late_init(void)
  {
  	char value[32];
  	u32 reset_reason = 0;
@@ -78,7 +79,7 @@ index e68ab8546a..c003d9a7bc 100644
  
  	/* By default host serail A and B use normal speed */
  	uint32_t host_serial_cfg = 0;
-@@ -446,6 +470,13 @@ void ast_g5_intel_late_init(void)
+@@ -480,6 +504,13 @@ void ast_g5_intel_late_init(void)
  
  	update_bootargs_cmd("resetreason", value);
  
@@ -93,7 +94,7 @@ index e68ab8546a..c003d9a7bc 100644
  	if (is_mfg_mode_phy_req())
  		update_bootargs_cmd("special", "mfg");
 diff --git a/common/autoboot.c b/common/autoboot.c
-index 45a600e663..03fd164501 100644
+index 3647d5fb21..0e7f7b0965 100644
 --- a/common/autoboot.c
 +++ b/common/autoboot.c
 @@ -263,6 +263,8 @@ static int abortboot(int bootdelay)
@@ -105,6 +106,3 @@ index 45a600e663..03fd164501 100644
  # endif
  
  	if (bootdelay >= 0)
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0034-Disable-uart-debug-interface.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0034-Disable-uart-debug-interface.patch
index 941dc7d0d..e8cd4179f 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0034-Disable-uart-debug-interface.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0034-Disable-uart-debug-interface.patch
@@ -1,7 +1,7 @@
-From 961561c437c8a3f3de1753c502a20c334966354e Mon Sep 17 00:00:00 2001
+From aec56ef4f3cf0417a28ddc0719603d54073eee09 Mon Sep 17 00:00:00 2001
 From: Yong Li <yong.b.li@linux.intel.com>
 Date: Tue, 20 Aug 2019 16:10:03 +0800
-Subject: [PATCH 1/2] Disable uart debug interface
+Subject: [PATCH] Disable uart debug interface
 
 AST2500 SOC integrates a UART debug interface which can
 input commands to AST2500 by using simple terminal
@@ -17,28 +17,29 @@ md 0x1e6e202c
 
 Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
 Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
+
 ---
  arch/arm/include/asm/arch-aspeed/regs-scu.h | 1 +
  board/aspeed/ast-g5/ast-g5-intel.c          | 4 ++++
  2 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/include/asm/arch-aspeed/regs-scu.h b/arch/arm/include/asm/arch-aspeed/regs-scu.h
-index 8a596ceafc..8333ba1c59 100644
+index a2c9549fc6..1bdb1d8574 100644
 --- a/arch/arm/include/asm/arch-aspeed/regs-scu.h
 +++ b/arch/arm/include/asm/arch-aspeed/regs-scu.h
-@@ -467,6 +467,7 @@
- #define SCU_MISC_VUART_TO_CTRL		(0x1 << 13)
+@@ -468,6 +468,7 @@
  #define SCU_MISC_DIV13_EN		(0x1 << 12)
+ #define SCU_MISC_DEBUG_UART             (0x1 << 10)
  #define SCU_MISC_Y_CLK_INVERT		(0x1 << 11)
 +#define SCU_MISC_UART_DEBUG_DIS		(0x1 << 10)
  #define SCU_MISC_OUT_DELAY		(0x1 << 9)
  #define SCU_MISC_PCI_TO_AHB_DIS		(0x1 << 8)
  #define SCU_MISC_2D_CRT_EN		(0x1 << 7)
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index 324387a4bc..c58fd3591b 100644
+index 12216922ac..e05a6da468 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -578,6 +578,10 @@ extern void espi_init(void);
+@@ -589,6 +589,10 @@ extern void espi_init(void);
  extern void kcs_init(void);
  void ast_g5_intel(void)
  {
@@ -49,6 +50,3 @@ index 324387a4bc..c58fd3591b 100644
  	uart_init();
  	pwm_init();
  	gpio_init(gpio_table, ARRAY_SIZE(gpio_table));
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0035-PFR-platform-EXTRST-reset-mask-selection.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0035-PFR-platform-EXTRST-reset-mask-selection.patch
index f2d1ebdeb..eb8fac487 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0035-PFR-platform-EXTRST-reset-mask-selection.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0035-PFR-platform-EXTRST-reset-mask-selection.patch
@@ -1,4 +1,4 @@
-From a5dc9fb9b33aa732858dc574f1ada22bc4cbd57c Mon Sep 17 00:00:00 2001
+From 6b62f592434eaadc02057c0d35c3b79982f555bc Mon Sep 17 00:00:00 2001
 From: Vikram Bodireddy <vikram.bodireddy@intel.com>
 Date: Thu, 5 Sep 2019 15:03:21 +0530
 Subject: [PATCH] PFR platform - EXTRST# reset mask selection
@@ -11,14 +11,15 @@ update flow, during which certain modules of BMC should be chosen
 to be reset so that Host functionality would be intact.
 
 Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
+
 ---
- arch/arm/include/asm/arch-aspeed/ast-g5-intel.h | 31 +++++++++++++++++++++++++
- arch/arm/include/asm/arch-aspeed/regs-scu.h     | 29 +++++++++++++++++++++++
- board/aspeed/ast-g5/ast-g5-intel.c              |  9 +++++++
+ .../include/asm/arch-aspeed/ast-g5-intel.h    | 31 +++++++++++++++++++
+ arch/arm/include/asm/arch-aspeed/regs-scu.h   | 29 +++++++++++++++++
+ board/aspeed/ast-g5/ast-g5-intel.c            |  9 ++++++
  3 files changed, 69 insertions(+)
 
 diff --git a/arch/arm/include/asm/arch-aspeed/ast-g5-intel.h b/arch/arm/include/asm/arch-aspeed/ast-g5-intel.h
-index 64f4ed1..b9386b2 100644
+index 64f4ed17bf..b9386b2cf6 100644
 --- a/arch/arm/include/asm/arch-aspeed/ast-g5-intel.h
 +++ b/arch/arm/include/asm/arch-aspeed/ast-g5-intel.h
 @@ -12,6 +12,37 @@
@@ -60,7 +61,7 @@ index 64f4ed1..b9386b2 100644
  int intel_force_firmware_jumper_enabled(void);
  int intel_failed_boot(void);
 diff --git a/arch/arm/include/asm/arch-aspeed/regs-scu.h b/arch/arm/include/asm/arch-aspeed/regs-scu.h
-index 1bdb1d8..0a4fb6f 100644
+index 1bdb1d8574..0a4fb6f773 100644
 --- a/arch/arm/include/asm/arch-aspeed/regs-scu.h
 +++ b/arch/arm/include/asm/arch-aspeed/regs-scu.h
 @@ -144,6 +144,35 @@
@@ -100,7 +101,7 @@ index 1bdb1d8..0a4fb6f 100644
  #define SCU_RESET_CRT3			(0x1 << 8)
  #define SCU_RESET_CRT2			(0x1 << 7)
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index 06c6708..e6dd2e6 100644
+index 6a36cfa2ba..2d260a7759 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
 @@ -661,6 +661,15 @@ extern void espi_init(void);
@@ -119,6 +120,3 @@ index 06c6708..e6dd2e6 100644
  	/* Disable uart port debug function */
  	ast_scu_write(ast_scu_read(AST_SCU_MISC1_CTRL) |
  		      SCU_MISC_UART_DEBUG_DIS, AST_SCU_MISC1_CTRL);
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0036-Re-Enable-KCS.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0036-Re-Enable-KCS.patch
index 976277f9e..08b05e60b 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0036-Re-Enable-KCS.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0036-Re-Enable-KCS.patch
@@ -1,7 +1,7 @@
-From 6bd4135cd2b8e3a95f5c29e7edaa678e0ca6eded Mon Sep 17 00:00:00 2001
+From 6e3928154538f8935d9d6379e3db40daeb1aedcf Mon Sep 17 00:00:00 2001
 From: James Feist <james.feist@linux.intel.com>
 Date: Thu, 19 Sep 2019 10:15:19 -0700
-Subject: [PATCH 1/1] Re-Enable KCS
+Subject: [PATCH] Re-Enable KCS
 
 Phosphor-isolation isolates too much and seems to
 make KCS not work. This removes the lines from that
@@ -10,6 +10,7 @@ patch that seem to be of question.
 Tested: AC/Cycled, cmdtool.efi 20 18 1 works
 
 Signed-off-by: James Feist <james.feist@linux.intel.com>
+
 ---
  board/aspeed/ast-g5/ast-g5.c | 5 -----
  1 file changed, 5 deletions(-)
@@ -30,6 +31,3 @@ index ead2e1bb63..00bd92ae5f 100644
  	val = readl(AST_LPC_BASE + AST_LPC_HICRB);
  	val |= LPC_HICRB_ILPC2AHB;
  	writel(val, AST_LPC_BASE + AST_LPC_HICRB);
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0037-aspeed-ast-scu.c-fix-MAC1LINK-and-MAC2LINK-pin-pads-.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0037-aspeed-ast-scu.c-fix-MAC1LINK-and-MAC2LINK-pin-pads-.patch
index 9c176e998..eaaa0075b 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0037-aspeed-ast-scu.c-fix-MAC1LINK-and-MAC2LINK-pin-pads-.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0037-aspeed-ast-scu.c-fix-MAC1LINK-and-MAC2LINK-pin-pads-.patch
@@ -1,4 +1,4 @@
-From 4b96a19bdde82d7fed24cb70e0bcaef16d8711c3 Mon Sep 17 00:00:00 2001
+From 07a269d7873c77c372acbd4ccf83612e14f05404 Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 Date: Fri, 4 Oct 2019 15:54:43 -0700
 Subject: [PATCH] aspeed/ast-scu.c: fix MAC1LINK and MAC2LINK pin pads setting
@@ -8,12 +8,13 @@ so this commit disables them in SCU pin control register so that
 the pins can be used as GPIOs.
 
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
+
 ---
- arch/arm/mach-aspeed/ast-scu.c | 37 +++++++++----------------------------
+ arch/arm/mach-aspeed/ast-scu.c | 37 +++++++++-------------------------
  1 file changed, 9 insertions(+), 28 deletions(-)
 
 diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c
-index 537cd4b3e1c7..28c48c115406 100644
+index 537cd4b3e1..28c48c1154 100644
 --- a/arch/arm/mach-aspeed/ast-scu.c
 +++ b/arch/arm/mach-aspeed/ast-scu.c
 @@ -419,49 +419,30 @@ void ast_scu_multi_func_eth(u8 num)
@@ -75,6 +76,3 @@ index 537cd4b3e1c7..28c48c115406 100644
  		break;
  	}
  }
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0038-Increase-default-fan-speed-for-cooper-city.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0038-Increase-default-fan-speed-for-cooper-city.patch
index 53cdd763e..96172cbac 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0038-Increase-default-fan-speed-for-cooper-city.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0038-Increase-default-fan-speed-for-cooper-city.patch
@@ -1,7 +1,7 @@
-From e465945672408b632d5e3c2cf7f08ade1268419e Mon Sep 17 00:00:00 2001
+From d248ebf5bddd0c0bc6f7e287867b651d0c17aafe Mon Sep 17 00:00:00 2001
 From: James Feist <james.feist@linux.intel.com>
 Date: Thu, 24 Oct 2019 14:39:22 -0700
-Subject: [PATCH 1/1] Increase default fan speed for cooper city
+Subject: [PATCH] Increase default fan speed for cooper city
 
 This increases the uboot fan speed for cooper city
 as it has high core count CPUS.
@@ -9,16 +9,17 @@ as it has high core count CPUS.
 Tested: In uboot fans appeared to run faster
 
 Signed-off-by: James Feist <james.feist@linux.intel.com>
+
 ---
  board/aspeed/ast-g5/ast-g5-gpio.h  |  6 ++++
  board/aspeed/ast-g5/ast-g5-intel.c | 46 ++++++++++++++++++++++++++++++
  2 files changed, 52 insertions(+)
 
 diff --git a/board/aspeed/ast-g5/ast-g5-gpio.h b/board/aspeed/ast-g5/ast-g5-gpio.h
-index ed2499f5cc..9088cdd3e3 100644
+index 8ccf437346..7f0c06d88f 100644
 --- a/board/aspeed/ast-g5/ast-g5-gpio.h
 +++ b/board/aspeed/ast-g5/ast-g5-gpio.h
-@@ -70,9 +70,15 @@
+@@ -71,9 +71,15 @@
  #define ID_LED_PORT_PIN PORT_PIN(GPIO_PORT_S, GPIO_PIN_6)
  #define GRN_LED_PORT_PIN PORT_PIN(GPIO_PORT_S, GPIO_PIN_4)
  #define AMB_LED_PORT_PIN PORT_PIN(GPIO_PORT_S, GPIO_PIN_5)
@@ -35,7 +36,7 @@ index ed2499f5cc..9088cdd3e3 100644
  // GPIO Configuration Register bits
  #define GPCFG_EVENT_TO_SMI (1 << 7) // 1 == enabled
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index c58fd3591b..9d5db68b7e 100644
+index e05a6da468..4b017269f9 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
 @@ -25,6 +25,12 @@ enum gpio_names {
@@ -51,8 +52,8 @@ index c58fd3591b..9d5db68b7e 100644
  };
  
  #define GPIO_CFG_DEFAULT (GPCFG_ACTIVE_HIGH | GPCFG_LEVEL_TRIG)
-@@ -60,6 +66,21 @@ static const GPIOValue gpio_table[] = {
- 	[GPIO_FP_PWR_BTN] = {FP_PWR_BTN_PORT_PIN, GPIO_CFG_DEFAULT, 0,
+@@ -63,6 +69,21 @@ static const GPIOValue gpio_table[] = {
+ 	[GPIO_FP_PWR_BTN] = {FP_PWR_BTN_PORT_PIN, GPIO_CFG_LOW_INPUT, 0,
  				   GPIO_DEBOUNCE_8MS},
  
 +	/* Platform ID Pins */
@@ -73,7 +74,7 @@ index c58fd3591b..9d5db68b7e 100644
  };
  
  #define LPC_SNOOP_ADDR 0x80
-@@ -114,6 +135,8 @@ static const GPIOValue gpio_table[] = {
+@@ -117,6 +138,8 @@ static const GPIOValue gpio_table[] = {
  #define WATCHDOG_RESET_BIT 0x8
  #define BOOT_FAILURE_LIMIT 0x3
  
@@ -82,7 +83,7 @@ index c58fd3591b..9d5db68b7e 100644
  static int get_boot_failures(void)
  {
  	return getenv_ulong("bootfailures", 10, 0);
-@@ -295,6 +318,26 @@ int intel_failed_boot(void)
+@@ -298,6 +321,26 @@ int intel_failed_boot(void)
  	return get_boot_failures() >= BOOT_FAILURE_LIMIT;
  }
  
@@ -109,7 +110,7 @@ index c58fd3591b..9d5db68b7e 100644
  void arch_preboot_os(void)
  {
  	// last second before booting... set the LEDs
-@@ -322,6 +365,7 @@ void arch_preboot_os(void)
+@@ -325,6 +368,7 @@ void arch_preboot_os(void)
  #define PWM_CLK_ENABLE BIT(0)
  #define PWM_DUTY(PCT) (((PCT) * 128) / 100)
  #define DEFAULT_PWM_DUTY_VALUE PWM_DUTY(57)
@@ -117,7 +118,7 @@ index c58fd3591b..9d5db68b7e 100644
  
  
  static inline uint32_t ast_scu_read(uint32_t reg)
-@@ -595,6 +639,8 @@ void ast_g5_intel(void)
+@@ -606,6 +650,8 @@ void ast_g5_intel(void)
  		id_led_control(GPIO_GREEN_LED, EIDLED_Off);
  		id_led_control(GPIO_AMBER_LED, EIDLED_On);
  		kcs_init();
@@ -126,6 +127,3 @@ index c58fd3591b..9d5db68b7e 100644
  		/* TODO: need to stop the booting here. */
  	}
  }
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0040-Initialize-the-BMC-host-mailbox-at-reset-time.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0040-Initialize-the-BMC-host-mailbox-at-reset-time.patch
index b36627d17..464faa65d 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0040-Initialize-the-BMC-host-mailbox-at-reset-time.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0040-Initialize-the-BMC-host-mailbox-at-reset-time.patch
@@ -1,4 +1,4 @@
-From 933d80ac82dbe1f74c653b0ac505fde406e2553c Mon Sep 17 00:00:00 2001
+From c749a717d02936b49f6213f8861e3c17b35abf67 Mon Sep 17 00:00:00 2001
 From: Vernon Mauery <vernon.mauery@intel.com>
 Date: Mon, 27 Jan 2020 15:13:10 -0800
 Subject: [PATCH] Initialize the BMC/host mailbox at reset time
@@ -10,15 +10,16 @@ Tested: boot the BMC and take note that the mailbox registers are no
         longer random garbage.
 
 Signed-off-by: Vernon Mauery <vernon.mauery@intel.com>
+
 ---
  board/aspeed/ast-g5/ast-g5-intel.c | 28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
 
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index ce87a46cd1..1086742045 100644
+index 4b017269f9..6c193d8afb 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -575,6 +575,33 @@ static void pwm_init(void)
+@@ -629,6 +629,33 @@ static void pwm_init(void)
  	writel(val, PWM_BASE_ADDR + PWM_CONTROL);
  }
  
@@ -52,14 +53,11 @@ index ce87a46cd1..1086742045 100644
  extern void espi_init(void);
  extern void kcs_init(void);
  void ast_g5_intel(void)
-@@ -597,6 +624,7 @@ void ast_g5_intel(void)
- 	set_cpld_reg(PFR_CPLD_BOOT_CHECKPOINT_REG, PFR_CPLD_CHKPOINT_START);
+@@ -638,6 +665,7 @@ void ast_g5_intel(void)
+ 		      SCU_MISC_UART_DEBUG_DIS, AST_SCU_MISC1_CTRL);
  
  	uart_init();
 +	mailbox_init();
  	pwm_init();
  	gpio_init(gpio_table, ARRAY_SIZE(gpio_table));
  	espi_init();
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0043-PFR-Skip-counting-WDT2-event-when-EXTRST-is-set.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0043-PFR-Skip-counting-WDT2-event-when-EXTRST-is-set.patch
index 3833d2a31..bbab94421 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0043-PFR-Skip-counting-WDT2-event-when-EXTRST-is-set.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0043-PFR-Skip-counting-WDT2-event-when-EXTRST-is-set.patch
@@ -1,4 +1,4 @@
-From 51ae3c80f20be3b8e010aa57041fa9c38076cc76 Mon Sep 17 00:00:00 2001
+From 0bae11a932e57c968394dd533bbd853ee2e9493f Mon Sep 17 00:00:00 2001
 From: Vikram Bodireddy <vikram.bodireddy@intel.com>
 Date: Wed, 18 Mar 2020 21:47:11 +0530
 Subject: [PATCH] PFR- Skip counting WDT2 event when EXTRST# is set
@@ -14,23 +14,24 @@ Tested: Verified BMC updates 4 times and checked that
         the boot is not aborted at u-boot.
 
 Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
+
 ---
  board/aspeed/ast-g5/ast-g5-intel.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index 575061ff88..872c7a843a 100644
+index 2d260a7759..1d426db659 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -145,6 +145,7 @@ static const GPIOValue gpio_table[] = {
+@@ -137,6 +137,7 @@ static const GPIOValue gpio_table[] = {
  #define HOST_SERIAL_B_HIGH_SPEED (1 << 1)
  
  #define WATCHDOG_RESET_BIT 0x8
 +#define EXTRST_RESET_BIT 0x2
  #define BOOT_FAILURE_LIMIT 0x3
  
- #define BRIGHTON_CITY_BOARD_ID 0
-@@ -572,7 +573,8 @@ void ast_g5_intel_late_init(void)
+ #define COOPER_CITY_BOARD_ID 40
+@@ -551,7 +552,8 @@ void ast_g5_intel_late_init(void)
  
  	boot_failures = get_boot_failures();
  
@@ -40,6 +41,3 @@ index 575061ff88..872c7a843a 100644
  		set_boot_failures(boot_failures + 1);
  	else
  		set_boot_failures(0);
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0044-net-phy-realtek-Change-LED-configuration.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0044-net-phy-realtek-Change-LED-configuration.patch
index b70d3be50..fb823bae8 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0044-net-phy-realtek-Change-LED-configuration.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0044-net-phy-realtek-Change-LED-configuration.patch
@@ -1,4 +1,4 @@
-From 06039a941d59f265385c5b4a19231fbd55a05b26 Mon Sep 17 00:00:00 2001
+From 70589b01e3284867c77e1d1387bce83b898bd54a Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 Date: Fri, 5 Jun 2020 15:14:50 -0700
 Subject: [PATCH] net: phy: realtek: Change LED configuration
@@ -9,12 +9,13 @@ LED1 (Left Orange): Link 10/100 + Blink on Tx/Rx
 LED2 (Left Green): Link 1000 + Blink on Tx/Rx
 
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
+
 ---
  drivers/net/phy/realtek.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
-index 7a99cb023401..c15280259c35 100644
+index 7a99cb0234..c15280259c 100644
 --- a/drivers/net/phy/realtek.c
 +++ b/drivers/net/phy/realtek.c
 @@ -92,10 +92,15 @@ static int rtl8211f_config(struct phy_device *phydev)
@@ -35,6 +36,3 @@ index 7a99cb023401..c15280259c35 100644
  	phy_write(phydev, MDIO_DEVAD_NONE,
  		  MIIM_RTL8211F_PAGE_SELECT, 0x0);
  
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0045-Apply-WDT1-2-reset-mask-to-reset-needed-controller.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0045-Apply-WDT1-2-reset-mask-to-reset-needed-controller.patch
index 94e93db7f..92d11f634 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0045-Apply-WDT1-2-reset-mask-to-reset-needed-controller.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0045-Apply-WDT1-2-reset-mask-to-reset-needed-controller.patch
@@ -1,4 +1,4 @@
-From 622df2804c7f8540587df26c81653b47809c9984 Mon Sep 17 00:00:00 2001
+From e23fbe6c3867b92b8ba7bfb36e1719348b102399 Mon Sep 17 00:00:00 2001
 From: Suryakanth Sekar <suryakanth.sekar@linux.intel.com>
 Date: Thu, 16 Jul 2020 11:02:53 +0530
 Subject: [PATCH] Apply WDT1-2 reset mask to reset needed controller
@@ -57,12 +57,13 @@ Tested:
    BMC should not hang and able to complete the "erase all" command
 
 Signed-off-by: Suryakanth Sekar <suryakanth.sekar@linux.intel.com>
+
 ---
  arch/arm/mach-aspeed/platform_g5.S | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/mach-aspeed/platform_g5.S b/arch/arm/mach-aspeed/platform_g5.S
-index b404353..97253f4 100644
+index b4043534b0..f221c97b19 100644
 --- a/arch/arm/mach-aspeed/platform_g5.S
 +++ b/arch/arm/mach-aspeed/platform_g5.S
 @@ -366,7 +366,10 @@ init_dram:
@@ -77,6 +78,3 @@ index b404353..97253f4 100644
      str   r1, [r0]
      b     bypass_first_reset
  
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0046-Enable-FMC-DMA-for-memmove.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0046-Enable-FMC-DMA-for-memmove.patch
index e75b732b1..547754996 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0046-Enable-FMC-DMA-for-memmove.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0046-Enable-FMC-DMA-for-memmove.patch
@@ -1,4 +1,4 @@
-From 38d3fba3ac2d4240bab1e5427fc6ed71291e1cc8 Mon Sep 17 00:00:00 2001
+From da1a1d60346118e6d05efc39c8899f590b483a25 Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 Date: Fri, 19 Jun 2020 16:30:47 -0700
 Subject: [PATCH] Enable FMC DMA for memmove
@@ -8,16 +8,17 @@ completed quickly.
 
 Signed-off-by: Chia-Wei Wang <chiawei_wang@aspeedtech.com>
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
+
 ---
  arch/arm/mach-aspeed/Makefile |  2 +-
- arch/arm/mach-aspeed/utils.S  | 53 +++++++++++++++++++++++++++++++++++++++++++
- lib/Kconfig                   |  6 +++++
- lib/string.c                  | 12 +++++++++-
+ arch/arm/mach-aspeed/utils.S  | 53 +++++++++++++++++++++++++++++++++++
+ lib/Kconfig                   |  6 ++++
+ lib/string.c                  | 12 +++++++-
  4 files changed, 71 insertions(+), 2 deletions(-)
  create mode 100644 arch/arm/mach-aspeed/utils.S
 
 diff --git a/arch/arm/mach-aspeed/Makefile b/arch/arm/mach-aspeed/Makefile
-index 7d8930beb988..b9fcf41d8c97 100644
+index 7d8930beb9..b9fcf41d8c 100644
 --- a/arch/arm/mach-aspeed/Makefile
 +++ b/arch/arm/mach-aspeed/Makefile
 @@ -11,7 +11,7 @@
@@ -31,7 +32,7 @@ index 7d8930beb988..b9fcf41d8c97 100644
  obj-$(CONFIG_ARCH_AST2400) += platform_g4.o
 diff --git a/arch/arm/mach-aspeed/utils.S b/arch/arm/mach-aspeed/utils.S
 new file mode 100644
-index 000000000000..a06d72552eef
+index 0000000000..a06d72552e
 --- /dev/null
 +++ b/arch/arm/mach-aspeed/utils.S
 @@ -0,0 +1,53 @@
@@ -89,7 +90,7 @@ index 000000000000..a06d72552eef
 +	mov	pc, lr
 +ENDPROC(aspeed_spi_fastcpy)
 diff --git a/lib/Kconfig b/lib/Kconfig
-index 02ca4058d37e..8c8fde6b1b28 100644
+index 02ca4058d3..8c8fde6b1b 100644
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
 @@ -149,6 +149,12 @@ config SPL_OF_LIBFDT
@@ -106,7 +107,7 @@ index 02ca4058d37e..8c8fde6b1b28 100644
  source lib/efi_loader/Kconfig
  
 diff --git a/lib/string.c b/lib/string.c
-index 0bf472f1f69e..f95b8e478fa6 100644
+index 0bf472f1f6..f95b8e478f 100644
 --- a/lib/string.c
 +++ b/lib/string.c
 @@ -15,11 +15,12 @@
@@ -146,6 +147,3 @@ index 0bf472f1f69e..f95b8e478fa6 100644
  	if (unaligned_src || unaligned_dst) {
  		if (unaligned_dst != unaligned_src) {
  			unaligned_header = count;
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0047-ast2500-parse-reset-reason.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0047-ast2500-parse-reset-reason.patch
index b1b525f99..a21fb00dd 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0047-ast2500-parse-reset-reason.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0047-ast2500-parse-reset-reason.patch
@@ -1,9 +1,10 @@
-From 96eb25949b824af10cabd387cfdc6401d23ac04b Mon Sep 17 00:00:00 2001
+From 079424a954cf0c697b65492a2d6a38f1938fe1bf Mon Sep 17 00:00:00 2001
 From: Kuiying Wang <kuiying.wang@intel.com>
 Date: Tue, 7 Jul 2020 13:41:48 +0800
 Subject: [PATCH] ast2500: parse reset reason.
 
 Signed-off-by: Kuiying Wang <kuiying.wang@intel.com>
+
 ---
  arch/arm/mach-aspeed/ast-scu.c | 39 +++++++++++++++++++++++++++++++++-
  1 file changed, 38 insertions(+), 1 deletion(-)
@@ -60,6 +61,3 @@ index 28c48c1154..ff90c0fc7e 100644
  #else
  	if (rest & SCU_SYS_EXT_RESET_FLAG) {
  		printf("RST : External\n");
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0048-Add-WDT-to-u-boot-to-cover-booting-failures.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0048-Add-WDT-to-u-boot-to-cover-booting-failures.patch
index 2d2b906b5..f6b3fefcf 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0048-Add-WDT-to-u-boot-to-cover-booting-failures.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0048-Add-WDT-to-u-boot-to-cover-booting-failures.patch
@@ -1,4 +1,4 @@
-From 367c6c2734e54ff37eac2ace4691f55b0e3d6096 Mon Sep 17 00:00:00 2001
+From 18e6251fbd3b58069d2b3d7097e5c24b70b42bf9 Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 Date: Mon, 14 Sep 2020 17:38:28 -0700
 Subject: [PATCH] Add WDT to u-boot to cover booting failures
@@ -12,6 +12,7 @@ code. The early u-boot WD timeout is 5 seconds and kernel booting WD
 timeout is 100 seconds.
 
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
+
 ---
  arch/arm/mach-aspeed/flash.c       |  7 +++
  arch/arm/mach-aspeed/platform_g5.S | 78 ++++++++++++++++++++++++++++++
@@ -21,7 +22,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
  5 files changed, 121 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/mach-aspeed/flash.c b/arch/arm/mach-aspeed/flash.c
-index d33fb9e0fe78..31bbf77e9e67 100644
+index d33fb9e0fe..31bbf77e9e 100644
 --- a/arch/arm/mach-aspeed/flash.c
 +++ b/arch/arm/mach-aspeed/flash.c
 @@ -30,6 +30,7 @@
@@ -53,7 +54,7 @@ index d33fb9e0fe78..31bbf77e9e67 100644
  
  	reset_flash(info);
 diff --git a/arch/arm/mach-aspeed/platform_g5.S b/arch/arm/mach-aspeed/platform_g5.S
-index f221c97b19dc..e468ed68d687 100644
+index f221c97b19..e468ed68d6 100644
 --- a/arch/arm/mach-aspeed/platform_g5.S
 +++ b/arch/arm/mach-aspeed/platform_g5.S
 @@ -582,6 +582,31 @@ espi_early_init_done:
@@ -191,10 +192,10 @@ index f221c97b19dc..e468ed68d687 100644
      mov   lr, r4
  
 diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
-index c46bd70b71b2..92518a66fa67 100644
+index 6c193d8afb..6e43b74bc4 100644
 --- a/board/aspeed/ast-g5/ast-g5-intel.c
 +++ b/board/aspeed/ast-g5/ast-g5-intel.c
-@@ -701,6 +701,9 @@ void ast_g5_intel(void)
+@@ -673,6 +673,9 @@ void ast_g5_intel(void)
  	timer8_init();
  	enable_onboard_tpm();
  	if (intel_force_firmware_jumper_enabled()) {
@@ -205,7 +206,7 @@ index c46bd70b71b2..92518a66fa67 100644
  		id_led_control(GPIO_ID_LED, EIDLED_On);
  		id_led_control(GPIO_GREEN_LED, EIDLED_Off);
 diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c
-index 00bd92ae5f94..3f27503bce62 100644
+index 00bd92ae5f..3f27503bce 100644
 --- a/board/aspeed/ast-g5/ast-g5.c
 +++ b/board/aspeed/ast-g5/ast-g5.c
 @@ -125,9 +125,35 @@ int board_eth_init(bd_t *bd)
@@ -247,7 +248,7 @@ index 00bd92ae5f94..3f27503bce62 100644
  }
  #endif /* CONFIG_WATCHDOG */
 diff --git a/common/bootm_os.c b/common/bootm_os.c
-index b56eb39780e8..ec0e12ac84b9 100644
+index b56eb39780..ec0e12ac84 100644
 --- a/common/bootm_os.c
 +++ b/common/bootm_os.c
 @@ -473,11 +473,16 @@ __weak void arch_preboot_os(void)
@@ -267,6 +268,3 @@ index b56eb39780e8..ec0e12ac84b9 100644
  	boot_fn(state, argc, argv, images);
  
  	/* Stand-alone may return when 'autostart' is 'no' */
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0049-Fix-issue-on-host-console-is-broken-due-to-BMC-reset.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0049-Fix-issue-on-host-console-is-broken-due-to-BMC-reset.patch
index 3c1705c05..8dfa55733 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0049-Fix-issue-on-host-console-is-broken-due-to-BMC-reset.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0049-Fix-issue-on-host-console-is-broken-due-to-BMC-reset.patch
@@ -1,4 +1,4 @@
-From b6f1f040f515a43d1903f4c4020032dfe436670d Mon Sep 17 00:00:00 2001
+From a4a0c281865339c68871e4f62dd21f78504ea60e Mon Sep 17 00:00:00 2001
 From: Kuiying Wang <kuiying.wang@intel.com>
 Date: Sun, 27 Sep 2020 17:45:56 +0800
 Subject: [PATCH] Fix issue on host console is broken due to BMC reset by
@@ -88,6 +88,7 @@ ast# md 0x1e78909c
 1e78909c: 00000000 ffceff00 19000000 00000000
 
 Signed-off-by: Kuiying Wang <kuiying.wang@intel.com>
+
 ---
  arch/arm/include/asm/arch-aspeed/regs-lpc.h | 1 +
  board/aspeed/ast-g5/ast-g5.c                | 3 +++
@@ -106,7 +107,7 @@ index b0162ae4f3..b4d3da2906 100644
  
  /*	AST_LPC_HICR5 : 0x80	Host Interface Control Register 5 */
 diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c
-index 00bd92ae5f..4c5997ab8a 100644
+index 3f27503bce..6fdc06ad63 100644
 --- a/board/aspeed/ast-g5/ast-g5.c
 +++ b/board/aspeed/ast-g5/ast-g5.c
 @@ -45,6 +45,9 @@ int board_init(void)
@@ -119,6 +120,3 @@ index 00bd92ae5f..4c5997ab8a 100644
  	/* P2A, PCIe BMC */
  	val = readl(AST_SCU_BASE + AST_SCU_PCIE_CONFIG_SET);
  	val &= ~(SCU_PCIE_CONFIG_SET_BMC_DMA
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0001-image-Correct-comment-for-fit_conf_get_node.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0001-image-Correct-comment-for-fit_conf_get_node.patch
index 7e1cd0351..05e9ae9c1 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0001-image-Correct-comment-for-fit_conf_get_node.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0001-image-Correct-comment-for-fit_conf_get_node.patch
@@ -1,4 +1,4 @@
-From 07867a17f8ed7ca621107550e218b1c916b9cc19 Mon Sep 17 00:00:00 2001
+From 6455ab0f57e2a64f4952c6a1cefca1891d582139 Mon Sep 17 00:00:00 2001
 From: Simon Glass <sjg@chromium.org>
 Date: Tue, 31 Mar 2020 18:43:55 +0200
 Subject: [PATCH] image: Correct comment for fit_conf_get_node()
@@ -8,13 +8,14 @@ header file. Fix this.
 
 Signed-off-by: Simon Glass <sjg@chromium.org>
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
+
 ---
  common/image-fit.c | 18 ------------------
  include/image.h    | 19 +++++++++++++++++++
  2 files changed, 19 insertions(+), 18 deletions(-)
 
 diff --git a/common/image-fit.c b/common/image-fit.c
-index 6f920da22043..f31e93a36441 100644
+index 6f920da220..f31e93a364 100644
 --- a/common/image-fit.c
 +++ b/common/image-fit.c
 @@ -1375,24 +1375,6 @@ int fit_conf_find_compat(const void *fit, const void *fdt)
@@ -43,7 +44,7 @@ index 6f920da22043..f31e93a36441 100644
  {
  	int noffset, confs_noffset;
 diff --git a/include/image.h b/include/image.h
-index a16187f874db..b05e8552cc5b 100644
+index a16187f874..b05e8552cc 100644
 --- a/include/image.h
 +++ b/include/image.h
 @@ -908,6 +908,25 @@ int fit_image_check_comp(const void *fit, int noffset, uint8_t comp);
@@ -72,6 +73,3 @@ index a16187f874db..b05e8552cc5b 100644
  int fit_conf_get_node(const void *fit, const char *conf_uname);
  
  /**
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0002-image-Be-a-little-more-verbose-when-checking-signatu.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0002-image-Be-a-little-more-verbose-when-checking-signatu.patch
index 16ac5fb59..62594c6f3 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0002-image-Be-a-little-more-verbose-when-checking-signatu.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0002-image-Be-a-little-more-verbose-when-checking-signatu.patch
@@ -1,4 +1,4 @@
-From 3d7360b1b32f56e26bbc90bcff42d5f204d0b717 Mon Sep 17 00:00:00 2001
+From 0373da3f0baf0f5d90e978b9f735306d06e19d24 Mon Sep 17 00:00:00 2001
 From: Simon Glass <sjg@chromium.org>
 Date: Tue, 31 Mar 2020 18:43:55 +0200
 Subject: [PATCH] image: Be a little more verbose when checking signatures
@@ -8,13 +8,14 @@ Update a few messages to help with this.
 
 Signed-off-by: Simon Glass <sjg@chromium.org>
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
+
 ---
  common/image-fit.c | 2 +-
  tools/image-host.c | 3 ++-
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/common/image-fit.c b/common/image-fit.c
-index f31e93a36441..8a7c78f4c144 100644
+index f31e93a364..8a7c78f4c1 100644
 --- a/common/image-fit.c
 +++ b/common/image-fit.c
 @@ -1637,7 +1637,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
@@ -27,7 +28,7 @@ index f31e93a36441..8a7c78f4c144 100644
  		return -ENOENT;
  	}
 diff --git a/tools/image-host.c b/tools/image-host.c
-index 7effb6cea59e..01fdec276da4 100644
+index 7effb6cea5..01fdec276d 100644
 --- a/tools/image-host.c
 +++ b/tools/image-host.c
 @@ -717,7 +717,8 @@ int fit_check_sign(const void *fit, const void *key)
@@ -40,6 +41,3 @@ index 7effb6cea59e..01fdec276da4 100644
  	ret = fit_config_verify(fit, cfg_noffset);
  	if (ret)
  		return ret;
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0003-image-Return-an-error-message-from-fit_config_verify.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0003-image-Return-an-error-message-from-fit_config_verify.patch
index fd8ceecf0..d0501ff82 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0003-image-Return-an-error-message-from-fit_config_verify.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0003-image-Return-an-error-message-from-fit_config_verify.patch
@@ -1,4 +1,4 @@
-From 647e43f0aee09ef33d2159ad95c7f3499d8fd8a4 Mon Sep 17 00:00:00 2001
+From ffb95288ea143ca9f76890aebe804067bf327b68 Mon Sep 17 00:00:00 2001
 From: Simon Glass <sjg@chromium.org>
 Date: Tue, 31 Mar 2020 18:43:55 +0200
 Subject: [PATCH] image: Return an error message from fit_config_verify_sig()
@@ -9,12 +9,13 @@ what went wrong.
 
 Signed-off-by: Simon Glass <sjg@chromium.org>
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
+
 ---
  common/image-sig.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/common/image-sig.c b/common/image-sig.c
-index eda5e1353ab0..a664f4a40945 100644
+index eda5e1353a..a664f4a409 100644
 --- a/common/image-sig.c
 +++ b/common/image-sig.c
 @@ -415,13 +415,14 @@ static int fit_config_verify_sig(const void *fit, int conf_noffset,
@@ -34,6 +35,3 @@ index eda5e1353ab0..a664f4a40945 100644
  }
  
  int fit_config_verify_required_sigs(const void *fit, int conf_noffset,
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0007-image-Check-hash-nodes-when-checking-configurations.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0007-image-Check-hash-nodes-when-checking-configurations.patch
index 5a4bca485..1a2eba2e1 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0007-image-Check-hash-nodes-when-checking-configurations.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0007-image-Check-hash-nodes-when-checking-configurations.patch
@@ -1,4 +1,4 @@
-From ece10b3eac018240776bfec8aceb1e8f4947288b Mon Sep 17 00:00:00 2001
+From c77be61073581f8009a9b8bf8960f5c1ad621d63 Mon Sep 17 00:00:00 2001
 From: Simon Glass <sjg@chromium.org>
 Date: Tue, 31 Mar 2020 18:43:55 +0200
 Subject: [PATCH] image: Check hash-nodes when checking configurations
@@ -12,12 +12,13 @@ static.
 
 Signed-off-by: Simon Glass <sjg@chromium.org>
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
+
 ---
  common/image-sig.c | 36 +++++++++++++++++++++++++++++++++---
  1 file changed, 33 insertions(+), 3 deletions(-)
 
 diff --git a/common/image-sig.c b/common/image-sig.c
-index a664f4a40945..057d654c17d4 100644
+index a664f4a409..057d654c17 100644
 --- a/common/image-sig.c
 +++ b/common/image-sig.c
 @@ -283,20 +283,39 @@ int fit_image_verify_required_sigs(const void *fit, int image_noffset,
@@ -92,6 +93,3 @@ index a664f4a40945..057d654c17d4 100644
  			if (ret) {
  				puts("- ");
  			} else {
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0008-image-Load-the-correct-configuration-in-fit_check_si.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0008-image-Load-the-correct-configuration-in-fit_check_si.patch
index 4701086bc..460615410 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0008-image-Load-the-correct-configuration-in-fit_check_si.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0008-image-Load-the-correct-configuration-in-fit_check_si.patch
@@ -1,4 +1,4 @@
-From 738b8ba7ac971c10500d1322fda59ac6aa58e867 Mon Sep 17 00:00:00 2001
+From b8e5bf59f37db05fbb21832117351bd6bdda3afd Mon Sep 17 00:00:00 2001
 From: Simon Glass <sjg@chromium.org>
 Date: Tue, 31 Mar 2020 18:43:55 +0200
 Subject: [PATCH] image: Load the correct configuration in fit_check_sign
@@ -11,12 +11,13 @@ Update this function to use the selected configuration.
 
 Signed-off-by: Simon Glass <sjg@chromium.org>
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
+
 ---
  common/bootm.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/common/bootm.c b/common/bootm.c
-index 46909ecdbb1f..b39fd60c8c49 100644
+index 46909ecdbb..b39fd60c8c 100644
 --- a/common/bootm.c
 +++ b/common/bootm.c
 @@ -894,7 +894,8 @@ void memmove_wd(void *to, void *from, size_t len, ulong chunksz)
@@ -46,6 +47,3 @@ index 46909ecdbb1f..b39fd60c8c49 100644
  		if (!err && ret && ret != -ENOENT)
  			err = ret;
  	}
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0009-fit_check_sign-Allow-selecting-the-configuration-to-.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0009-fit_check_sign-Allow-selecting-the-configuration-to-.patch
index 687946e4c..4f151f84e 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0009-fit_check_sign-Allow-selecting-the-configuration-to-.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0009-fit_check_sign-Allow-selecting-the-configuration-to-.patch
@@ -1,4 +1,4 @@
-From 86a746eecc231886fbca97db6c6544997b95e49a Mon Sep 17 00:00:00 2001
+From ef74a120215a65d34b4c4658327049c7a7ac5bea Mon Sep 17 00:00:00 2001
 From: Simon Glass <sjg@chromium.org>
 Date: Tue, 31 Mar 2020 18:43:55 +0200
 Subject: [PATCH] fit_check_sign: Allow selecting the configuration to verify
@@ -9,6 +9,7 @@ the logic through.
 
 Signed-off-by: Simon Glass <sjg@chromium.org>
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
+
 ---
  tools/fdt_host.h       | 3 ++-
  tools/fit_check_sign.c | 8 ++++++--
@@ -16,7 +17,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
  3 files changed, 12 insertions(+), 5 deletions(-)
 
 diff --git a/tools/fdt_host.h b/tools/fdt_host.h
-index 134d9657139b..4eceab19dd3a 100644
+index 134d965713..4eceab19dd 100644
 --- a/tools/fdt_host.h
 +++ b/tools/fdt_host.h
 @@ -11,6 +11,7 @@
@@ -29,7 +30,7 @@ index 134d9657139b..4eceab19dd3a 100644
  
  #endif /* __FDT_HOST_H__ */
 diff --git a/tools/fit_check_sign.c b/tools/fit_check_sign.c
-index d9361b00950c..e9a489db3920 100644
+index d9361b0095..e9a489db39 100644
 --- a/tools/fit_check_sign.c
 +++ b/tools/fit_check_sign.c
 @@ -42,6 +42,7 @@ int main(int argc, char **argv)
@@ -69,7 +70,7 @@ index d9361b00950c..e9a489db3920 100644
  		ret = EXIT_SUCCESS;
  		fprintf(stderr, "Signature check OK\n");
 diff --git a/tools/image-host.c b/tools/image-host.c
-index 01fdec276da4..da374eeabf5e 100644
+index 01fdec276d..da374eeabf 100644
 --- a/tools/image-host.c
 +++ b/tools/image-host.c
 @@ -708,12 +708,13 @@ int fit_add_verification_data(const char *keydir, void *keydest, void *fit,
@@ -96,6 +97,3 @@ index 01fdec276da4..da374eeabf5e 100644
  	ret = bootm_host_load_images(fit, cfg_noffset);
  
  	return ret;
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0012-image-Use-constants-for-required-and-key-name-hint.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0012-image-Use-constants-for-required-and-key-name-hint.patch
index 4f5704e7c..a04f68fb3 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0012-image-Use-constants-for-required-and-key-name-hint.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0012-image-Use-constants-for-required-and-key-name-hint.patch
@@ -1,4 +1,4 @@
-From 82d0b38436fd44bc54372ebe3f3d3fef63835b83 Mon Sep 17 00:00:00 2001
+From dfe95ace84f7bb04b6302fd8f51f8a942a288e40 Mon Sep 17 00:00:00 2001
 From: Simon Glass <sjg@chromium.org>
 Date: Tue, 31 Mar 2020 18:43:55 +0200
 Subject: [PATCH] image: Use constants for 'required' and 'key-name-hint'
@@ -7,6 +7,7 @@ These are used in multiple places so update them to use a shared #define.
 
 Signed-off-by: Simon Glass <sjg@chromium.org>
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
+
 ---
  common/image-fit.c | 6 +++---
  common/image-sig.c | 8 +++++---
@@ -16,7 +17,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
  5 files changed, 17 insertions(+), 13 deletions(-)
 
 diff --git a/common/image-fit.c b/common/image-fit.c
-index 8a7c78f4c144..322fde728b50 100644
+index 8a7c78f4c1..322fde728b 100644
 --- a/common/image-fit.c
 +++ b/common/image-fit.c
 @@ -264,7 +264,7 @@ static void fit_image_print_data(const void *fit, int noffset, const char *p,
@@ -40,7 +41,7 @@ index 8a7c78f4c144..322fde728b50 100644
  		printf(":%s", keyname);
  	if (required)
 diff --git a/common/image-sig.c b/common/image-sig.c
-index 057d654c17d4..b49732117927 100644
+index 057d654c17..b497321179 100644
 --- a/common/image-sig.c
 +++ b/common/image-sig.c
 @@ -156,7 +156,7 @@ static int fit_image_setup_verify(struct image_sign_info *info,
@@ -73,7 +74,7 @@ index 057d654c17d4..b49732117927 100644
  			continue;
  		ret = fit_config_verify_sig(fit, conf_noffset, sig_blob,
 diff --git a/include/image.h b/include/image.h
-index b05e8552cc5b..2c6ef4de259d 100644
+index b05e8552cc..2c6ef4de25 100644
 --- a/include/image.h
 +++ b/include/image.h
 @@ -782,12 +782,14 @@ int bootz_setup(ulong image, ulong *start, ulong *end);
@@ -93,7 +94,7 @@ index b05e8552cc5b..2c6ef4de259d 100644
  /* image node */
  #define FIT_DATA_PROP		"data"
 diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c
-index 5d9716f01349..972af6b8a7e2 100644
+index 5d9716f013..972af6b8a7 100644
 --- a/lib/rsa/rsa-sign.c
 +++ b/lib/rsa/rsa-sign.c
 @@ -486,8 +486,8 @@ int rsa_add_verify_data(struct image_sign_info *info, void *keydest)
@@ -117,7 +118,7 @@ index 5d9716f01349..972af6b8a7e2 100644
  	}
  done:
 diff --git a/tools/image-host.c b/tools/image-host.c
-index da374eeabf5e..afeba22a09be 100644
+index da374eeabf..afeba22a09 100644
 --- a/tools/image-host.c
 +++ b/tools/image-host.c
 @@ -161,7 +161,7 @@ static int fit_image_setup_sig(struct image_sign_info *info,
@@ -147,6 +148,3 @@ index da374eeabf5e..afeba22a09be 100644
  
  	/* Write the public key into the supplied FDT file */
  	if (keydest) {
--- 
-2.17.1
-
author	Jason M. Bills <jason.m.bills@linux.intel.com>	2021-03-26 01:45:09 +0300
committer	Jason M. Bills <jason.m.bills@linux.intel.com>	2021-03-27 01:41:36 +0300
commit	12bef3e1bf292dec5ac15af9fb41e86f7bcfb0cb (patch)
tree	608a905372f3f545d2686e29512ae3f5f5b4a78c /meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot
parent	0a1ece0568a37de9f17fd6e0bcdfd2cad2c6503f (diff)
download	openbmc-12bef3e1bf292dec5ac15af9fb41e86f7bcfb0cb.tar.xz