Skip to content

Commit 00568b8

Browse files
montjoieRussell King (Oracle)
authored andcommitted
ARM: 9148/1: handle CONFIG_CPU_ENDIAN_BE32 in arch/arm/kernel/head.S
My intel-ixp42x-welltech-epbx100 no longer boot since 4.14. This is due to commit 463dbba ("ARM: 9104/2: Fix Keystone 2 kernel mapping regression") which forgot to handle CONFIG_CPU_ENDIAN_BE32 as possible BE config. Suggested-by: Krzysztof Hałasa <[email protected]> Fixes: 463dbba ("ARM: 9104/2: Fix Keystone 2 kernel mapping regression") Signed-off-by: Corentin Labbe <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]>
1 parent 48ccc8e commit 00568b8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm/kernel/head.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ __create_page_tables:
253253
add r0, r4, #KERNEL_OFFSET >> (SECTION_SHIFT - PMD_ORDER)
254254
ldr r6, =(_end - 1)
255255
adr_l r5, kernel_sec_start @ _pa(kernel_sec_start)
256-
#ifdef CONFIG_CPU_ENDIAN_BE8
256+
#if defined CONFIG_CPU_ENDIAN_BE8 || defined CONFIG_CPU_ENDIAN_BE32
257257
str r8, [r5, #4] @ Save physical start of kernel (BE)
258258
#else
259259
str r8, [r5] @ Save physical start of kernel (LE)
@@ -266,7 +266,7 @@ __create_page_tables:
266266
bls 1b
267267
eor r3, r3, r7 @ Remove the MMU flags
268268
adr_l r5, kernel_sec_end @ _pa(kernel_sec_end)
269-
#ifdef CONFIG_CPU_ENDIAN_BE8
269+
#if defined CONFIG_CPU_ENDIAN_BE8 || defined CONFIG_CPU_ENDIAN_BE32
270270
str r3, [r5, #4] @ Save physical end of kernel (BE)
271271
#else
272272
str r3, [r5] @ Save physical end of kernel (LE)

0 commit comments

Comments
 (0)