Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a92b0588 authored by Daniel Laird's avatar Daniel Laird Committed by Ralf Baechle
Browse files

[MIPS] Move arch/mips/philips to arch/mips/nxp 



Signed-off-by: default avatardaniel.j.laird <daniel.j.laird@nxp.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 389310e2

arch/mips/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -310,12 +310,12 @@ config MACH_VR41XX 
	select GENERIC_HARDIRQS_NO__DO_IRQ



config PNX8550_JBS

	bool "Philips PNX8550 based JBS board"

	bool "NXP PNX8550 based JBS board"

	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN



config PNX8550_STB810

	bool "Philips PNX8550 based STB810 board"

	bool "NXP PNX8550 based STB810 board"

	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN

arch/mips/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -410,21 +410,21 @@ load-$(CONFIG_CASIO_E55) += 0xffffffff80004000 
load-$(CONFIG_TANBAC_TB022X)	+= 0xffffffff80000000



#

# Common Philips PNX8550

# Common NXP PNX8550

#

core-$(CONFIG_SOC_PNX8550)	+= arch/mips/philips/pnx8550/common/

core-$(CONFIG_SOC_PNX8550)	+= arch/mips/nxp/pnx8550/common/

cflags-$(CONFIG_SOC_PNX8550)	+= -Iinclude/asm-mips/mach-pnx8550



#

# Philips PNX8550 JBS board

# NXP PNX8550 JBS board

#

libs-$(CONFIG_PNX8550_JBS)	+= arch/mips/philips/pnx8550/jbs/

libs-$(CONFIG_PNX8550_JBS)	+= arch/mips/nxp/pnx8550/jbs/

#cflags-$(CONFIG_PNX8550_JBS)	+= -Iinclude/asm-mips/mach-pnx8550

load-$(CONFIG_PNX8550_JBS)	+= 0xffffffff80060000



# Philips PNX8550 STB810 board

# NXP PNX8550 STB810 board

#

libs-$(CONFIG_PNX8550_STB810)	+= arch/mips/philips/pnx8550/stb810/

libs-$(CONFIG_PNX8550_STB810)	+= arch/mips/nxp/pnx8550/stb810/

load-$(CONFIG_PNX8550_STB810)	+= 0xffffffff80060000



# NEC EMMA2RH boards

arch/mips/kernel/cpu-probe.c

+4 −4
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c) 
	}

}



static inline void cpu_probe_philips(struct cpuinfo_mips *c)

static inline void cpu_probe_nxp(struct cpuinfo_mips *c)

{

	decode_configs(c);

	switch (c->processor_id & 0xff00) {
@@ -799,7 +799,7 @@ static inline void cpu_probe_philips(struct cpuinfo_mips *c) 
		c->isa_level = MIPS_CPU_ISA_M32R1;

		break;

	default:

		panic("Unknown Philips Core!"); /* REVISIT: die? */

		panic("Unknown NXP Core!"); /* REVISIT: die? */

		break;

	}

}
@@ -938,8 +938,8 @@ __cpuinit void cpu_probe(void) 
	case PRID_COMP_SANDCRAFT:

		cpu_probe_sandcraft(c);

		break;

 	case PRID_COMP_PHILIPS:

		cpu_probe_philips(c);

	case PRID_COMP_NXP:

		cpu_probe_nxp(c);

		break;

	default:

		c->cputype = CPU_UNKNOWN;