Skip to content

Commit d5d1a1a

Browse files
chleroympe
authored andcommitted
powerpc/platforms: Move files from 4xx to 44x
Only 44x uses 4xx now, so only keep one directory. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20240628121201.130802-7-mpe@ellerman.id.au
1 parent 7bf5f05 commit d5d1a1a

12 files changed

Lines changed: 20 additions & 32 deletions

File tree

arch/powerpc/platforms/44x/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
obj-y += misc_44x.o machine_check.o
2+
obj-y += misc_44x.o machine_check.o uic.o soc.o
33
ifneq ($(CONFIG_PPC4xx_CPM),y)
44
obj-y += idle.o
55
endif
@@ -12,3 +12,7 @@ obj-$(CONFIG_CANYONLANDS)+= canyonlands.o
1212
obj-$(CONFIG_CURRITUCK) += ppc476.o
1313
obj-$(CONFIG_AKEBONO) += ppc476.o
1414
obj-$(CONFIG_FSP2) += fsp2.o
15+
obj-$(CONFIG_PCI) += pci.o
16+
obj-$(CONFIG_PPC4xx_HSTA_MSI) += hsta_msi.o
17+
obj-$(CONFIG_PPC4xx_CPM) += cpm.o
18+
obj-$(CONFIG_PPC4xx_GPIO) += gpio.o

arch/powerpc/platforms/44x/machine_check.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,21 @@
99
#include <asm/reg.h>
1010
#include <asm/cacheflush.h>
1111

12+
int machine_check_4xx(struct pt_regs *regs)
13+
{
14+
unsigned long reason = regs->esr;
15+
16+
if (reason & ESR_IMCP) {
17+
printk("Instruction");
18+
mtspr(SPRN_ESR, reason & ~ESR_IMCP);
19+
} else
20+
printk("Data");
21+
22+
printk(" machine check in kernel mode.\n");
23+
24+
return 0;
25+
}
26+
1227
int machine_check_440A(struct pt_regs *regs)
1328
{
1429
unsigned long reason = regs->esr;

arch/powerpc/platforms/4xx/Makefile

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)