diff options
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files')
6 files changed, 49 insertions, 32 deletions
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 d82acc623..950b3247d 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 @@ -145,8 +145,8 @@ index e79235c8d0..c2a8b33aec 100644 + value = readl(AST_LPC_BASE + HICRB) | HICRB_EN80HSGIO; + writel(value, AST_LPC_BASE + HICRB); + -+ /* set the gpio clock to pclk/(2*(5+1)) or ~2 MHz */ -+ value = SGPIO_CLK_DIV(256) | SGPIO_BYTES(10) | SGPIO_ENABLE; ++ /* set the gpio clock to 2MHz */ ++ value = SGPIO_CLK_DIV(24) | SGPIO_BYTES(10) | SGPIO_ENABLE; + writel(value, AST_GPIO_BASE + GPIO254); +} 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 76606db0a..eaccfa99e 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,4 +1,4 @@ -From 3ed477feebb959749bd20a22e3acd8b39e22c193 Mon Sep 17 00:00:00 2001 +From 8a2f6a42c3be0426803fc0a70444ba95bf73443f 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] Manufacturing mode physical presence detection @@ -24,10 +24,10 @@ Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.co Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> --- board/aspeed/ast-g5/ast-g5-gpio.h | 2 +- - board/aspeed/ast-g5/ast-g5-intel.c | 42 ++++++++++++++++++++++++++++++ + board/aspeed/ast-g5/ast-g5-intel.c | 57 ++++++++++++++++++++++++++++++ board/aspeed/ast-g5/ast-g5.c | 2 -- - common/autoboot.c | 16 ++++++++++-- - 4 files changed, 57 insertions(+), 5 deletions(-) + common/autoboot.c | 16 +++++++-- + 4 files changed, 72 insertions(+), 5 deletions(-) diff --git a/board/aspeed/ast-g5/ast-g5-gpio.h b/board/aspeed/ast-g5/ast-g5-gpio.h index 54b7388a22f5..8ccf4373460b 100644 @@ -43,7 +43,7 @@ index 54b7388a22f5..8ccf4373460b 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 45ecd83fd3f0..79de13caa0af 100644 +index 45ecd83fd3f0..6ea7f0060c57 100644 --- a/board/aspeed/ast-g5/ast-g5-intel.c +++ b/board/aspeed/ast-g5/ast-g5-intel.c @@ -24,6 +24,7 @@ enum gpio_names { @@ -74,7 +74,7 @@ index 45ecd83fd3f0..79de13caa0af 100644 static void sgpio_init(void) { uint32_t value; -@@ -403,6 +410,30 @@ static void update_bootargs_cmd(const char *key, const char *value) +@@ -403,6 +410,44 @@ static void update_bootargs_cmd(const char *key, const char *value) free(buf); } @@ -87,8 +87,10 @@ index 45ecd83fd3f0..79de13caa0af 100644 + */ + const uint32_t delay_in_ms = 100; + const uint32_t read_count = ((15 * 1000) / delay_in_ms); -+ const uint32_t delay_for_indication = 10 * 1000; -+ for (uint32_t count = 0; count < read_count; ++count) { ++ const uint32_t delay_for_indication = 2 * 1000; ++ uint32_t count; ++ ++ for (count = 0; count < read_count; ++count) { + if (!gpio_get_value(GPIO_FP_PWR_BTN)) + return false; + @@ -96,8 +98,20 @@ index 45ecd83fd3f0..79de13caa0af 100644 + } + debug("is_mfg_mode_phy_req : detected mfg mode request\n"); + id_led_control(GPIO_GREEN_LED, EIDLED_Blink_3HZ); -+ /* Delay the boot to do physical indication for mfg mode */ -+ mdelay(delay_for_indication); ++ /* ++ * Delay up to 15 seconds until the power button is released to prevent ++ * unintentional power button overriding to PCH through GPIO ++ * pass-through. ++ */ ++ for (count = 0; count < read_count; ++count) { ++ if (!gpio_get_value(GPIO_FP_PWR_BTN)) ++ break; ++ ++ mdelay(delay_in_ms); ++ } ++ /* Keep the indication at least for 2 seconds */ ++ if (delay_in_ms * count < delay_for_indication) ++ mdelay(delay_for_indication - (delay_in_ms * count)); + + return true; +} @@ -105,7 +119,7 @@ index 45ecd83fd3f0..79de13caa0af 100644 void ast_g5_intel_late_init(void) { char value[32]; -@@ -450,6 +481,17 @@ void ast_g5_intel_late_init(void) +@@ -450,6 +495,18 @@ void ast_g5_intel_late_init(void) ast_scu_write(0, AST_SCU_SYS_CTRL); update_bootargs_cmd("resetreason", value); @@ -115,11 +129,12 @@ index 45ecd83fd3f0..79de13caa0af 100644 + update_bootargs_cmd("special", "mfg"); + else + update_bootargs_cmd("special", NULL); ++ ++ ast_enable_pass_through(); +} + +void board_pre_abort_autoboot(void) +{ -+ ast_enable_pass_through(); } static void pwm_init(void) 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 fe95ef466..129b6be88 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 777d3db853a7a9e6ec6e19d97ed12db689faa051 Mon Sep 17 00:00:00 2001 +From 8c2a3f6489c86d8dae57cae03d617de2296774ab 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 @@ -18,11 +18,11 @@ 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 4eaed429e327..4190fb05acbe 100644 +index 6ea7f0060c57..5196a1a41299 100644 --- a/board/aspeed/ast-g5/ast-g5-intel.c +++ b/board/aspeed/ast-g5/ast-g5-intel.c -@@ -492,6 +492,26 @@ void board_pre_abort_autoboot(void) - ast_enable_pass_through(); +@@ -509,6 +509,26 @@ void board_pre_abort_autoboot(void) + { } +static void uart_init(void) @@ -48,7 +48,7 @@ index 4eaed429e327..4190fb05acbe 100644 static void pwm_init(void) { uint32_t val; -@@ -543,6 +563,7 @@ extern void espi_init(void); +@@ -560,6 +580,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/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 3e7727c32..bd612e691 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,4 +1,4 @@ -From 655a30e879704b72e1934bdc8e47d93166978c38 Mon Sep 17 00:00:00 2001 +From 8fe68fe9b30d1da027281b5468492aa45ca0b052 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] Reboot into UBOOT on Watchdog Failures @@ -30,7 +30,7 @@ index a88521a1b3c7..64f4ed17bfd5 100644 #endif diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c -index d05de5c4a274..9b546cffee77 100644 +index 5196a1a41299..6b8395754f00 100644 --- a/board/aspeed/ast-g5/ast-g5-intel.c +++ b/board/aspeed/ast-g5/ast-g5-intel.c @@ -114,7 +114,23 @@ static const GPIOValue gpio_table[] = { @@ -69,7 +69,7 @@ index d05de5c4a274..9b546cffee77 100644 void arch_preboot_os(void) { // last second before booting... set the LEDs -@@ -438,6 +459,7 @@ void ast_g5_intel_late_init(void) +@@ -452,6 +473,7 @@ void ast_g5_intel_late_init(void) { char value[32]; u32 reset_reason = 0; @@ -77,7 +77,7 @@ index d05de5c4a274..9b546cffee77 100644 /* By default host serail A and B use normal speed */ uint32_t host_serial_cfg = 0; -@@ -482,6 +504,13 @@ void ast_g5_intel_late_init(void) +@@ -496,6 +518,13 @@ void ast_g5_intel_late_init(void) update_bootargs_cmd("resetreason", value); 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 456763398..eea9e035a 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,4 +1,4 @@ -From d248ebf5bddd0c0bc6f7e287867b651d0c17aafe Mon Sep 17 00:00:00 2001 +From 5861b964317bb52defb30215efff52fab5e11df4 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] Increase default fan speed for cooper city @@ -9,14 +9,13 @@ 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 8ccf437346..7f0c06d88f 100644 +index 8ccf4373460b..7f0c06d88f5a 100644 --- a/board/aspeed/ast-g5/ast-g5-gpio.h +++ b/board/aspeed/ast-g5/ast-g5-gpio.h @@ -71,9 +71,15 @@ @@ -36,7 +35,7 @@ index 8ccf437346..7f0c06d88f 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 e05a6da468..4b017269f9 100644 +index 5536efde1d43..3a0e15eaac82 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 { @@ -74,7 +73,7 @@ index e05a6da468..4b017269f9 100644 }; #define LPC_SNOOP_ADDR 0x80 -@@ -117,6 +138,8 @@ static const GPIOValue gpio_table[] = { +@@ -118,6 +139,8 @@ static const GPIOValue gpio_table[] = { #define POWERON_RESET_BIT BIT(0) #define BOOT_FAILURE_LIMIT 0x3 @@ -118,7 +117,7 @@ index e05a6da468..4b017269f9 100644 static inline uint32_t ast_scu_read(uint32_t reg) -@@ -606,6 +650,8 @@ void ast_g5_intel(void) +@@ -626,6 +670,8 @@ void ast_g5_intel(void) id_led_control(GPIO_GREEN_LED, EIDLED_Off); id_led_control(GPIO_AMBER_LED, EIDLED_On); kcs_init(); @@ -127,3 +126,6 @@ index e05a6da468..4b017269f9 100644 /* TODO: need to stop the booting here. */ } } +-- +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 ad99773d1..944ae4558 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 94cecaf3d944ee0b2a24b5628131db92de7cbaf3 Mon Sep 17 00:00:00 2001 +From fd386708fdea5f1c6c0311077907df55a5ac2c3d 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 @@ -19,7 +19,7 @@ Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com> 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 511bf32f94ac..66423d9b55a8 100644 +index 07a180a489f5..7b238b59aba3 100644 --- a/board/aspeed/ast-g5/ast-g5-intel.c +++ b/board/aspeed/ast-g5/ast-g5-intel.c @@ -137,6 +137,7 @@ static const GPIOValue gpio_table[] = { @@ -30,7 +30,7 @@ index 511bf32f94ac..66423d9b55a8 100644 #define POWERON_RESET_BIT BIT(0) #define BOOT_FAILURE_LIMIT 0x3 -@@ -551,7 +552,8 @@ void ast_g5_intel_late_init(void) +@@ -565,7 +566,8 @@ void ast_g5_intel_late_init(void) boot_failures = get_boot_failures(); |