From ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Tue, 28 Sep 2021 12:04:51 -0700 Subject: Update to internal 0.75 Signed-off-by: Jason M. Bills --- ...SPI-initialization-in-u-boot-for-normal-boo.patch | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0032-Disable-eSPI-initialization-in-u-boot-for-normal-boo.patch') diff --git a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0032-Disable-eSPI-initialization-in-u-boot-for-normal-boo.patch b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0032-Disable-eSPI-initialization-in-u-boot-for-normal-boo.patch index aa1f0cc65..018ab07cf 100644 --- a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0032-Disable-eSPI-initialization-in-u-boot-for-normal-boo.patch +++ b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0032-Disable-eSPI-initialization-in-u-boot-for-normal-boo.patch @@ -1,4 +1,4 @@ -From e152d718da6bfdf71d309b7ec885d2050fc19d01 Mon Sep 17 00:00:00 2001 +From 08f2b4f0464ef8abcf32511f8549233359d16eed Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo Date: Wed, 2 Jun 2021 13:03:47 -0700 Subject: [PATCH] Disable eSPI initialization in u-boot for normal booting @@ -21,27 +21,25 @@ eSPI will be initialized in u-boot only in these specific cases: Signed-off-by: Jae Hyun Yoo --- - board/aspeed/ast2600_intel/intel.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) + board/aspeed/ast2600_intel/intel.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/board/aspeed/ast2600_intel/intel.c b/board/aspeed/ast2600_intel/intel.c -index aff0c8593759..fc2f3c8feea7 100644 +index 54f53d77c476..f3f1d8114616 100644 --- a/board/aspeed/ast2600_intel/intel.c +++ b/board/aspeed/ast2600_intel/intel.c -@@ -201,7 +201,11 @@ static void gpio_passthru_init(void) +@@ -201,6 +201,10 @@ static void gpio_passthru_init(void) void board_pre_abort_autoboot(void) { -- gpio_passthru_init(); + if (!read_ffuj()) { + espi_init(); -+ gpio_passthru_init(); + kcs_init(); + } } #define AST_LPC_BASE 0x1e789000 -@@ -662,7 +666,6 @@ int board_late_init(void) +@@ -625,7 +629,6 @@ int board_late_init(void) #endif pwm_init(); @@ -49,14 +47,14 @@ index aff0c8593759..fc2f3c8feea7 100644 /* Add reset reason to bootargs */ snprintf(value, sizeof(value), "0x%x", gd->reset_reason); -@@ -684,6 +687,7 @@ int board_late_init(void) - update_bootargs_cmd("special", "mfg"); +@@ -645,6 +648,7 @@ int board_late_init(void) + gpio_passthru_init(); if (read_ffuj()) { + espi_init(); - gpio_passthru_init(); kcs_init(); } + -- 2.17.1 -- cgit v1.2.3