summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0035-PFR-platform-EXTRST-reset-mask-selection.patch
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2020-10-14 00:56:36 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2020-10-14 22:11:17 +0300
commit989cbcf37fea988ef6b76b9bc1cc5774bacda2cf (patch)
tree9d27faf8a6212d0833064e6e4893af1289123f01 /meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0035-PFR-platform-EXTRST-reset-mask-selection.patch
parent5d3fc64c142786581d792d145231c835afbcdded (diff)
downloadopenbmc-989cbcf37fea988ef6b76b9bc1cc5774bacda2cf.tar.xz
Update to internal 0.74-82
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0035-PFR-platform-EXTRST-reset-mask-selection.patch')
-rw-r--r--meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0035-PFR-platform-EXTRST-reset-mask-selection.patch8
1 files changed, 4 insertions, 4 deletions
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..99222f418 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
@@ -103,7 +103,7 @@ diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-int
index 06c6708..e6dd2e6 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);
+@@ -662,6 +662,15 @@ extern void espi_init(void);
extern void kcs_init(void);
void ast_g5_intel(void)
{
@@ -116,9 +116,9 @@ index 06c6708..e6dd2e6 100644
+ */
+ ast_scu_write(AST_WDT_RESET_MASK, AST_SCU_WDT_RESET);
+
- /* Disable uart port debug function */
- ast_scu_write(ast_scu_read(AST_SCU_MISC1_CTRL) |
- SCU_MISC_UART_DEBUG_DIS, AST_SCU_MISC1_CTRL);
+ #ifdef USE_SOC_UART_DEBUG
+ /* Enable uart port debug function */
+ ast_scu_write(ast_scu_read(AST_SCU_MISC1_CTRL) &
--
2.7.4