There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
		
			
				
	
	
		
			186 lines
		
	
	
	
		
			4.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			186 lines
		
	
	
	
		
			4.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *  linux/arch/m68knommu/platform/68360/config.c
 | 
						|
 *
 | 
						|
 *  Copyright (c) 2000 Michael Leslie <mleslie@lineo.com>
 | 
						|
 *  Copyright (C) 1993 Hamish Macdonald
 | 
						|
 *  Copyright (C) 1999 D. Jeff Dionne <jeff@uclinux.org>
 | 
						|
 *
 | 
						|
 * This file is subject to the terms and conditions of the GNU General Public
 | 
						|
 * License.  See the file COPYING in the main directory of this archive
 | 
						|
 * for more details.
 | 
						|
 */
 | 
						|
 | 
						|
#include <stdarg.h>
 | 
						|
#include <linux/types.h>
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/mm.h>
 | 
						|
#include <linux/interrupt.h>
 | 
						|
#include <linux/irq.h>
 | 
						|
 | 
						|
#include <asm/setup.h>
 | 
						|
#include <asm/system.h>
 | 
						|
#include <asm/pgtable.h>
 | 
						|
#include <asm/machdep.h>
 | 
						|
#include <asm/m68360.h>
 | 
						|
 | 
						|
#ifdef CONFIG_UCQUICC
 | 
						|
#include <asm/bootstd.h>
 | 
						|
#endif
 | 
						|
 | 
						|
extern void m360_cpm_reset(void);
 | 
						|
 | 
						|
// Mask to select if the PLL prescaler is enabled.
 | 
						|
#define MCU_PREEN   ((unsigned short)(0x0001 << 13))
 | 
						|
 | 
						|
#if defined(CONFIG_UCQUICC)
 | 
						|
#define OSCILLATOR  (unsigned long int)33000000
 | 
						|
#endif
 | 
						|
 | 
						|
unsigned long int system_clock;
 | 
						|
 | 
						|
extern QUICC *pquicc;
 | 
						|
 | 
						|
/* TODO  DON"T Hard Code this */
 | 
						|
/* calculate properly using the right PLL and prescaller */
 | 
						|
// unsigned int system_clock = 33000000l;
 | 
						|
extern unsigned long int system_clock; //In kernel setup.c
 | 
						|
 | 
						|
 | 
						|
static irqreturn_t hw_tick(int irq, void *dummy)
 | 
						|
{
 | 
						|
  /* Reset Timer1 */
 | 
						|
  /* TSTAT &= 0; */
 | 
						|
 | 
						|
  pquicc->timer_ter1 = 0x0002; /* clear timer event */
 | 
						|
 | 
						|
  return arch_timer_interrupt(irq, dummy);
 | 
						|
}
 | 
						|
 | 
						|
static struct irqaction m68360_timer_irq = {
 | 
						|
	.name	 = "timer",
 | 
						|
	.flags	 = IRQF_DISABLED | IRQF_TIMER,
 | 
						|
	.handler = hw_tick,
 | 
						|
};
 | 
						|
 | 
						|
void hw_timer_init(void)
 | 
						|
{
 | 
						|
  unsigned char prescaler;
 | 
						|
  unsigned short tgcr_save;
 | 
						|
 | 
						|
#if 0
 | 
						|
  /* Restart mode, Enable int, 32KHz, Enable timer */
 | 
						|
  TCTL = TCTL_OM | TCTL_IRQEN | TCTL_CLKSOURCE_32KHZ | TCTL_TEN;
 | 
						|
  /* Set prescaler (Divide 32KHz by 32)*/
 | 
						|
  TPRER = 31;
 | 
						|
  /* Set compare register  32Khz / 32 / 10 = 100 */
 | 
						|
  TCMP = 10;                                                              
 | 
						|
 | 
						|
  request_irq(IRQ_MACHSPEC | 1, timer_routine, 0, "timer", NULL);
 | 
						|
#endif
 | 
						|
 | 
						|
  /* General purpose quicc timers: MC68360UM p7-20 */
 | 
						|
 | 
						|
  /* Set up timer 1 (in [1..4]) to do 100Hz */
 | 
						|
  tgcr_save = pquicc->timer_tgcr & 0xfff0;
 | 
						|
  pquicc->timer_tgcr  = tgcr_save; /* stop and reset timer 1 */
 | 
						|
  /* pquicc->timer_tgcr |= 0x4444; */ /* halt timers when FREEZE (ie bdm freeze) */
 | 
						|
 | 
						|
  prescaler = 8;
 | 
						|
  pquicc->timer_tmr1 = 0x001a | /* or=1, frr=1, iclk=01b */
 | 
						|
                           (unsigned short)((prescaler - 1) << 8);
 | 
						|
    
 | 
						|
  pquicc->timer_tcn1 = 0x0000; /* initial count */
 | 
						|
  /* calculate interval for 100Hz based on the _system_clock: */
 | 
						|
  pquicc->timer_trr1 = (system_clock/ prescaler) / HZ; /* reference count */
 | 
						|
 | 
						|
  pquicc->timer_ter1 = 0x0003; /* clear timer events */
 | 
						|
 | 
						|
  /* enable timer 1 interrupt in CIMR */
 | 
						|
  setup_irq(CPMVEC_TIMER1, &m68360_timer_irq);
 | 
						|
 | 
						|
  /* Start timer 1: */
 | 
						|
  tgcr_save = (pquicc->timer_tgcr & 0xfff0) | 0x0001;
 | 
						|
  pquicc->timer_tgcr  = tgcr_save;
 | 
						|
}
 | 
						|
 | 
						|
void BSP_gettod (int *yearp, int *monp, int *dayp,
 | 
						|
		   int *hourp, int *minp, int *secp)
 | 
						|
{
 | 
						|
}
 | 
						|
 | 
						|
int BSP_set_clock_mmss(unsigned long nowtime)
 | 
						|
{
 | 
						|
#if 0
 | 
						|
  short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;
 | 
						|
 | 
						|
  tod->second1 = real_seconds / 10;
 | 
						|
  tod->second2 = real_seconds % 10;
 | 
						|
  tod->minute1 = real_minutes / 10;
 | 
						|
  tod->minute2 = real_minutes % 10;
 | 
						|
#endif
 | 
						|
  return 0;
 | 
						|
}
 | 
						|
 | 
						|
void BSP_reset (void)
 | 
						|
{
 | 
						|
  local_irq_disable();
 | 
						|
  asm volatile (
 | 
						|
    "moveal #_start, %a0;\n"
 | 
						|
    "moveb #0, 0xFFFFF300;\n"
 | 
						|
    "moveal 0(%a0), %sp;\n"
 | 
						|
    "moveal 4(%a0), %a0;\n"
 | 
						|
    "jmp (%a0);\n"
 | 
						|
    );
 | 
						|
}
 | 
						|
 | 
						|
unsigned char *scc1_hwaddr;
 | 
						|
static int errno;
 | 
						|
 | 
						|
#if defined (CONFIG_UCQUICC)
 | 
						|
_bsc0(char *, getserialnum)
 | 
						|
_bsc1(unsigned char *, gethwaddr, int, a)
 | 
						|
_bsc1(char *, getbenv, char *, a)
 | 
						|
#endif
 | 
						|
 | 
						|
 | 
						|
void config_BSP(char *command, int len)
 | 
						|
{
 | 
						|
  unsigned char *p;
 | 
						|
 | 
						|
  m360_cpm_reset();
 | 
						|
 | 
						|
  /* Calculate the real system clock value. */
 | 
						|
  {
 | 
						|
     unsigned int local_pllcr = (unsigned int)(pquicc->sim_pllcr);
 | 
						|
     if( local_pllcr & MCU_PREEN ) // If the prescaler is dividing by 128
 | 
						|
     {
 | 
						|
         int mf = (int)(pquicc->sim_pllcr & 0x0fff);
 | 
						|
         system_clock = (OSCILLATOR / 128) * (mf + 1);
 | 
						|
     }
 | 
						|
     else
 | 
						|
     {
 | 
						|
         int mf = (int)(pquicc->sim_pllcr & 0x0fff);
 | 
						|
         system_clock = (OSCILLATOR) * (mf + 1);
 | 
						|
     }
 | 
						|
  }
 | 
						|
 | 
						|
  printk(KERN_INFO "\n68360 QUICC support (C) 2000 Lineo Inc.\n");
 | 
						|
 | 
						|
#if defined(CONFIG_UCQUICC) && 0
 | 
						|
  printk(KERN_INFO "uCquicc serial string [%s]\n",getserialnum());
 | 
						|
  p = scc1_hwaddr = gethwaddr(0);
 | 
						|
  printk(KERN_INFO "uCquicc hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
 | 
						|
         p[0], p[1], p[2], p[3], p[4], p[5]);
 | 
						|
 | 
						|
  p = getbenv("APPEND");
 | 
						|
  if (p)
 | 
						|
    strcpy(p,command);
 | 
						|
  else
 | 
						|
    command[0] = 0;
 | 
						|
#else
 | 
						|
  scc1_hwaddr = "\00\01\02\03\04\05";
 | 
						|
#endif
 | 
						|
 
 | 
						|
  mach_gettod          = BSP_gettod;
 | 
						|
  mach_reset           = BSP_reset;
 | 
						|
}
 |