[Gc-linux-cvs] linux/arch/powerpc/kernel cputable.c, 1.7, 1.8 head_32.S, 1.8, 1.9 udbg.c, 1.4, 1.5

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/kernel
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28099/arch/powerpc/kernel

Modified Files:
	cputable.c head_32.S udbg.c 
Log Message:
Rewind to v2.6.29.


Index: udbg.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/udbg.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** udbg.c	1 Feb 2009 18:29:35 -0000	1.4
--- udbg.c	25 Oct 2009 18:33:46 -0000	1.5
***************
*** 60,65 ****
  #elif defined(CONFIG_PPC_EARLY_DEBUG_CPM)
  	udbg_init_cpm();
- #elif defined(CONFIG_PPC_EARLY_DEBUG_USBGECKO)
- 	udbg_init_usbgecko();
  #endif
  
--- 60,63 ----

Index: head_32.S
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/head_32.S,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** head_32.S	28 Mar 2009 20:44:19 -0000	1.8
--- head_32.S	25 Oct 2009 18:33:46 -0000	1.9
***************
*** 161,167 ****
  	bl	setup_cpm_bat
  #endif
- #ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
- 	bl	setup_usbgecko_bat
- #endif
  
  /*
--- 161,164 ----
***************
*** 1277,1298 ****
  #endif
  
- #ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO
- setup_usbgecko_bat:
- 	/* prepare a BAT for early io */
- 	lis	r8, 0x0c00
- 	ori	r8, r8, 0x002a	/* uncached, guarded ,rw */
- 	lis	r11, 0xcc00
- 	ori	r11, r11, 0x3	/* 128K */
- #ifdef CONFIG_WII
- 	oris	r8, r8, 0x0100
- 	oris	r11, r11, 0x0100
- #endif
- 	mtspr	SPRN_DBAT1L, r8
- 	mtspr	SPRN_DBAT1U, r11
- 	sync
- 	isync
- 	blr
- #endif
- 
  #ifdef CONFIG_8260
  /* Jump into the system reset for the rom.
--- 1274,1277 ----

Index: cputable.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/kernel/cputable.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cputable.c	2 Mar 2009 19:26:37 -0000	1.7
--- cputable.c	25 Oct 2009 18:33:46 -0000	1.8
***************
*** 683,691 ****
  		.platform		= "ppc750",
  	},
! 	{	/* 745/755 */
! 		.pvr_mask		= 0xfffff000,
! 		.pvr_value		= 0x00083000,
! 		.cpu_name		= "745/755",
! 		.cpu_features		= CPU_FTRS_750,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
  		.mmu_features		= MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS,
--- 683,691 ----
  		.platform		= "ppc750",
  	},
! 	{	/* 750CL */
! 		.pvr_mask		= 0xfffff0f0,
! 		.pvr_value		= 0x00087010,
! 		.cpu_name		= "750CL",
! 		.cpu_features		= CPU_FTRS_750CL,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
  		.mmu_features		= MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS,
***************
*** 698,708 ****
  		.platform		= "ppc750",
  	},
! 	{	/* 750CL (and "Broadway") */
! 		.pvr_mask		= 0xfffff0e0,
! 		.pvr_value		= 0x00087000,
! 		.cpu_name		= "750CL",
! 		.cpu_features		= CPU_FTRS_750CL,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
! 		.mmu_features		= MMU_FTR_HPTE_TABLE | MMU_FTR_USE_HIGH_BATS,
  		.icache_bsize		= 32,
  		.dcache_bsize		= 32,
--- 698,708 ----
  		.platform		= "ppc750",
  	},
! 	{	/* 745/755 */
! 		.pvr_mask		= 0xfffff000,
! 		.pvr_value		= 0x00083000,
! 		.cpu_name		= "745/755",
! 		.cpu_features		= CPU_FTRS_750,
  		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,
! 		.mmu_features		= MMU_FTR_HPTE_TABLE,
  		.icache_bsize		= 32,
  		.dcache_bsize		= 32,