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

Commit c751e17b authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Add CE4100 platform support 



Add CE4100 platform support. CE4100 needs early setup like
moorestown.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDirk Brandewie <dirk.brandewie@gmail.com>
LKML-Reference: <94720fd7f5564a12ebf202cf2c4f4c0d619aab35.1289331834.git.dirk.brandewie@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6f207e9b

Documentation/x86/boot.txt

+1 −0
Original line number Diff line number Diff line
@@ -600,6 +600,7 @@ Protocol: 2.07+ 
  0x00000001	lguest

  0x00000002	Xen

  0x00000003	Moorestown MID

  0x00000004	CE4100 TV Platform



Field name:	hardware_subarch_data

Type:		write (subarch-dependent)

arch/x86/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -377,6 +377,17 @@ config X86_ELAN 


	  If unsure, choose "PC-compatible" instead.



config X86_INTEL_CE

	bool "CE4100 TV platform"

	depends on PCI

	depends on PCI_GODIRECT

	depends on X86_32

	depends on X86_EXTENDED_PLATFORM

	---help---

	  Select for the Intel CE media processor (CE4100) SOC.

	  This option compiles in support for the CE4100 SOC for settop

	  boxes and media devices.



config X86_MRST

       bool "Moorestown MID platform"

	depends on PCI

arch/x86/include/asm/bootparam.h

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ enum { 
	X86_SUBARCH_LGUEST,

	X86_SUBARCH_XEN,

	X86_SUBARCH_MRST,

	X86_SUBARCH_CE4100,

	X86_NR_SUBARCHS,

};

arch/x86/include/asm/setup.h

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ extern void x86_mrst_early_setup(void); 
static inline void x86_mrst_early_setup(void) { }

#endif



#ifdef CONFIG_X86_INTEL_CE

extern void x86_ce4100_early_setup(void);

#else

static inline void x86_ce4100_early_setup(void) { }

#endif



#ifndef _SETUP



/*

arch/x86/kernel/head32.c

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ void __init i386_start_kernel(void) 
	case X86_SUBARCH_MRST:

		x86_mrst_early_setup();

		break;

	case X86_SUBARCH_CE4100:

		x86_ce4100_early_setup();

		break;

	default:

		i386_default_early_setup();

		break;