summaryrefslogtreecommitdiff
path: root/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch')
-rw-r--r--[-rwxr-xr-x]meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch57
1 files changed, 29 insertions, 28 deletions
diff --git a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch
index cccdd04b5..b39659506 100755..100644
--- a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch
+++ b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch
@@ -1,6 +1,6 @@
-From ca2c08a7e710e4beff2fdf17bba5a74adff13db8 Mon Sep 17 00:00:00 2001
-From: Manikandan Elumalai <manikandan.hcl.ers.epl@gmail.com>
-Date: Wed, 10 Jun 2020 17:53:59 +0530
+From 99fdec9719987ce93e4582d31cb7d08c5beb51ef Mon Sep 17 00:00:00 2001
+From: Logananth Sundararaj <logananth.s@hcl.com>
+Date: Mon, 20 Dec 2021 16:51:22 +0530
Subject: [PATCH] spl-host-console-handle
This patch adds four 1S server console through debug card
@@ -13,25 +13,25 @@ GPIOAA5 ---SW_ID2
GPIOAA4 ---SW_ID1
SW_ID8 SW_ID4 SW_ID2 SW_ID1 Position Descritpion
-L L L L 1 1s server slot1 select
+L L L L 1 1s server slot1 select
-L L H 2 1s server slot2 select
+L L L H 2 1s server slot2 select
-L L H L 3 1s server slot3 select
+L L H L 3 1s server slot3 select
-L L H H 4 1s server slot4 select
+L L H H 4 1s server slot4 select
-L H L L 5 BMC Debug port select
+L H L L 5 BMC Debug port select
-L H L H 6 1s server slot1 select
+L H L H 6 1s server slot1 select
-L H H L 7 1s server slot2 select
+L H H L 7 1s server slot2 select
-L H H H 8 1s server slot3 select
+L H H H 8 1s server slot3 select
-H L L L 9 1s server slot4 select
+H L L L 9 1s server slot4 select
-H L L H 10 BMC Debug port select
+H L L H 10 BMC Debug port select
BMC and Hosts UART control flow
GPIOE0 --- DEBUG_UART_SEL_0
@@ -40,25 +40,25 @@ GPIOE2 --- DEBUG_UART_SEL_2
GPIOE2 --- DEBUG_UART_RX_SEL_N
SEL_2 SEL_1 SEL_0 RX_SEL_N CONSOLE
-0 0 0 0 SLOT1
-0 0 1 0 SLOT2
-0 1 0 0 SLOT3
-0 1 1 0 SLOT4
-1 0 0 1 BMC Debug
+0 0 0 0 SLOT1
+0 0 1 0 SLOT2
+0 1 0 0 SLOT3
+0 1 1 0 SLOT4
+1 0 0 1 BMC Debug
-Signed-off-by: Manikandan Elumalai <manikandan.hcl.ers.epl@gmail.com>
+Signed-off-by: Logananth Sundararaj <logananth.s@hcl.com>
---
- arch/arm/mach-aspeed/platform_g5.S | 68 +++++++++++++++++++++++++++++++++-----
- 1 file changed, 60 insertions(+), 8 deletions(-)
+ arch/arm/mach-aspeed/platform_g5.S | 69 ++++++++++++++++++++++++++----
+ 1 file changed, 61 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-aspeed/platform_g5.S b/arch/arm/mach-aspeed/platform_g5.S
-index c3ce077..29daa7a 100644
+index f14b5acc6b..340d7b2b91 100644
--- a/arch/arm/mach-aspeed/platform_g5.S
+++ b/arch/arm/mach-aspeed/platform_g5.S
-@@ -315,6 +315,58 @@ orr r1, r1, #0xC
+@@ -315,6 +315,59 @@ orr r1, r1, #0xC
str r1, [r0]
.endm
-
+
+ .macro console_slot1
+ ldr r0, =0x1e780024
+ ldr r1, [r0]
@@ -111,10 +111,11 @@ index c3ce077..29daa7a 100644
+ str r1, [r0]
+ .endm
+
++
.macro console_sel
-
+
// Disable SoL UARTs[1-4]
-@@ -354,28 +406,28 @@ dbg_card_pres\@:
+@@ -354,28 +407,28 @@ dbg_card_pres\@:
ldr r1, =0x00
cmp r0, r1
bne case_pos2\@
@@ -147,7 +148,7 @@ index c3ce077..29daa7a 100644
b case_end\@
case_pos5\@:
//Test for position#5
-@@ -389,28 +441,28 @@ case_pos6\@:
+@@ -389,28 +442,28 @@ case_pos6\@:
ldr r1, =0x05
cmp r0, r1
bne case_pos7\@
@@ -181,4 +182,4 @@ index c3ce077..29daa7a 100644
case_pos10\@:
//Test for position#10
--
-2.7.4
+2.17.1