Commit a6930aae authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu updates from Greg Ungerer:
 "The bulk of the changes here are to clean up the ColdFire 5441x SoC
  support so that it can run with MMU enabled. We have only supported it
  with MMU disabled up to now.

  There is also a few individual bug fixes across the ColdFire support
  code"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: let clk_disable() return immediately if clk is NULL
  m68knommu: convert printk(KERN_INFO) to pr_info()
  m68knommu: clean up uClinux boot log output
  m68k: generalize uboot command line support
  m68k: don't panic if no hardware FPU defined
  m68k: only generate FPU instructions if CONFIG_FPU enabled
  m68k: always make available dump_fpu()
  m68k: generalize io memory region setup for ColdFire ACR registers
  m68k: move ColdFire _bootmem_alloc code
  m68k: report correct FPU type on ColdFire MMU platforms
  m68k: set appropriate machine type for m5411x SoC platforms
  m68k: move CONFIG_FPU set to per-CPU configuration
  m68knommu: fix IO write size in nettel pin set
  m68knommu: switch to using IO access methods in WildFire board code
  m68knommu: fix early setup to not access variables
parents d8ea757b 742859ad
...@@ -14,7 +14,6 @@ config M68K ...@@ -14,7 +14,6 @@ config M68K
select GENERIC_IOMAP select GENERIC_IOMAP
select GENERIC_STRNCPY_FROM_USER if MMU select GENERIC_STRNCPY_FROM_USER if MMU
select GENERIC_STRNLEN_USER if MMU select GENERIC_STRNLEN_USER if MMU
select FPU if MMU
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
select HAVE_FUTEX_CMPXCHG if MMU && FUTEX select HAVE_FUTEX_CMPXCHG if MMU && FUTEX
......
...@@ -62,6 +62,7 @@ config MCPU32 ...@@ -62,6 +62,7 @@ config MCPU32
config M68020 config M68020
bool "68020 support" bool "68020 support"
depends on MMU depends on MMU
select FPU
select CPU_HAS_ADDRESS_SPACES select CPU_HAS_ADDRESS_SPACES
help help
If you anticipate running this kernel on a computer with a MC68020 If you anticipate running this kernel on a computer with a MC68020
...@@ -72,6 +73,7 @@ config M68020 ...@@ -72,6 +73,7 @@ config M68020
config M68030 config M68030
bool "68030 support" bool "68030 support"
depends on MMU && !MMU_SUN3 depends on MMU && !MMU_SUN3
select FPU
select CPU_HAS_ADDRESS_SPACES select CPU_HAS_ADDRESS_SPACES
help help
If you anticipate running this kernel on a computer with a MC68030 If you anticipate running this kernel on a computer with a MC68030
...@@ -81,6 +83,7 @@ config M68030 ...@@ -81,6 +83,7 @@ config M68030
config M68040 config M68040
bool "68040 support" bool "68040 support"
depends on MMU && !MMU_SUN3 depends on MMU && !MMU_SUN3
select FPU
select CPU_HAS_ADDRESS_SPACES select CPU_HAS_ADDRESS_SPACES
help help
If you anticipate running this kernel on a computer with a MC68LC040 If you anticipate running this kernel on a computer with a MC68LC040
...@@ -91,6 +94,7 @@ config M68040 ...@@ -91,6 +94,7 @@ config M68040
config M68060 config M68060
bool "68060 support" bool "68060 support"
depends on MMU && !MMU_SUN3 depends on MMU && !MMU_SUN3
select FPU
select CPU_HAS_ADDRESS_SPACES select CPU_HAS_ADDRESS_SPACES
help help
If you anticipate running this kernel on a computer with a MC68060 If you anticipate running this kernel on a computer with a MC68060
...@@ -259,6 +263,7 @@ config M547x ...@@ -259,6 +263,7 @@ config M547x
bool "MCF547x" bool "MCF547x"
select M54xx select M54xx
select MMU_COLDFIRE if MMU select MMU_COLDFIRE if MMU
select FPU if MMU
select HAVE_CACHE_CB select HAVE_CACHE_CB
select HAVE_MBAR select HAVE_MBAR
select CPU_NO_EFFICIENT_FFS select CPU_NO_EFFICIENT_FFS
...@@ -268,6 +273,7 @@ config M547x ...@@ -268,6 +273,7 @@ config M547x
config M548x config M548x
bool "MCF548x" bool "MCF548x"
select MMU_COLDFIRE if MMU select MMU_COLDFIRE if MMU
select FPU if MMU
select M54xx select M54xx
select HAVE_CACHE_CB select HAVE_CACHE_CB
select HAVE_MBAR select HAVE_MBAR
......
...@@ -101,6 +101,10 @@ EXPORT_SYMBOL(clk_enable); ...@@ -101,6 +101,10 @@ EXPORT_SYMBOL(clk_enable);
void clk_disable(struct clk *clk) void clk_disable(struct clk *clk)
{ {
unsigned long flags; unsigned long flags;
if (!clk)
return;
spin_lock_irqsave(&clk_lock, flags); spin_lock_irqsave(&clk_lock, flags);
if ((--clk->enabled == 0) && clk->clk_ops) if ((--clk->enabled == 0) && clk->clk_ops)
clk->clk_ops->disable(clk); clk->clk_ops->disable(clk);
......
...@@ -280,10 +280,10 @@ _clear_bss: ...@@ -280,10 +280,10 @@ _clear_bss:
movel %d0,m68k_cputype /* Mark us as a ColdFire */ movel %d0,m68k_cputype /* Mark us as a ColdFire */
movel #MMU_COLDFIRE,%d0 movel #MMU_COLDFIRE,%d0
movel %d0,m68k_mmutype movel %d0,m68k_mmutype
movel #FPU_COLDFIRE,%d0 movel #FPUTYPE,%d0
movel %d0,m68k_fputype movel %d0,m68k_fputype /* Mark FPU type */
movel #MACH_M54XX,%d0 movel #MACHINE,%d0
movel %d0,m68k_machtype /* Mark us as a 54xx machine */ movel %d0,m68k_machtype /* Mark machine type */
lea init_task,%a2 /* Set "current" init task */ lea init_task,%a2 /* Set "current" init task */
#endif #endif
......
...@@ -102,14 +102,14 @@ void wildfiremod_halt(void) ...@@ -102,14 +102,14 @@ void wildfiremod_halt(void)
printk(KERN_INFO "WildFireMod hibernating...\n"); printk(KERN_INFO "WildFireMod hibernating...\n");
/* Set portE.5 to Digital IO */ /* Set portE.5 to Digital IO */
MCF5282_GPIO_PEPAR &= ~(1 << (5 * 2)); writew(readw(MCFGPIO_PEPAR) & ~(1 << (5 * 2)), MCFGPIO_PEPAR);
/* Make portE.5 an output */ /* Make portE.5 an output */
MCF5282_GPIO_DDRE |= (1 << 5); writeb(readb(MCFGPIO_PDDR_E) | (1 << 5), MCFGPIO_PDDR_E);
/* Now toggle portE.5 from low to high */ /* Now toggle portE.5 from low to high */
MCF5282_GPIO_PORTE &= ~(1 << 5); writeb(readb(MCFGPIO_PODR_E) & ~(1 << 5), MCFGPIO_PODR_E);
MCF5282_GPIO_PORTE |= (1 << 5); writeb(readb(MCFGPIO_PODR_E) | (1 << 5), MCFGPIO_PODR_E);
printk(KERN_EMERG "Failed to hibernate. Halting!\n"); printk(KERN_EMERG "Failed to hibernate. Halting!\n");
} }
......
...@@ -271,9 +271,6 @@ void __init config_BSP(char *commandp, int size) ...@@ -271,9 +271,6 @@ void __init config_BSP(char *commandp, int size)
#define NAND_FLASH_ADDRESS (0xD0000000) #define NAND_FLASH_ADDRESS (0xD0000000)
int sys_clk_khz = 0;
int sys_clk_mhz = 0;
void wtm_init(void); void wtm_init(void);
void scm_init(void); void scm_init(void);
void gpio_init(void); void gpio_init(void);
...@@ -286,9 +283,8 @@ int get_sys_clock (void); ...@@ -286,9 +283,8 @@ int get_sys_clock (void);
asmlinkage void __init sysinit(void) asmlinkage void __init sysinit(void)
{ {
sys_clk_khz = clock_pll(0, 0); clock_pll(0, 0);
sys_clk_mhz = sys_clk_khz/1000;
wtm_init(); wtm_init();
scm_init(); scm_init();
gpio_init(); gpio_init();
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <asm/m54xxgpt.h> #include <asm/m54xxgpt.h>
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <linux/pfn.h>
#endif #endif
/***************************************************************************/ /***************************************************************************/
...@@ -78,47 +77,10 @@ static void mcf54xx_reset(void) ...@@ -78,47 +77,10 @@ static void mcf54xx_reset(void)
/***************************************************************************/ /***************************************************************************/
#ifdef CONFIG_MMU
unsigned long num_pages;
static void __init mcf54xx_bootmem_alloc(void)
{
unsigned long start_pfn;
unsigned long memstart;
/* _rambase and _ramend will be naturally page aligned */
m68k_memory[0].addr = _rambase;
m68k_memory[0].size = _ramend - _rambase;
/* compute total pages in system */
num_pages = PFN_DOWN(_ramend - _rambase);
/* page numbers */
memstart = PAGE_ALIGN(_ramstart);
min_low_pfn = PFN_DOWN(_rambase);
start_pfn = PFN_DOWN(memstart);
max_pfn = max_low_pfn = PFN_DOWN(_ramend);
high_memory = (void *)_ramend;
m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6;
module_fixup(NULL, __start_fixup, __stop_fixup);
/* setup bootmem data */
m68k_setup_node(0);
memstart += init_bootmem_node(NODE_DATA(0), start_pfn,
min_low_pfn, max_low_pfn);
free_bootmem_node(NODE_DATA(0), memstart, _ramend - memstart);
}
#endif /* CONFIG_MMU */
/***************************************************************************/
void __init config_BSP(char *commandp, int size) void __init config_BSP(char *commandp, int size)
{ {
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
mcf54xx_bootmem_alloc(); cf_bootmem_alloc();
mmu_context_init(); mmu_context_init();
#endif #endif
mach_reset = mcf54xx_reset; mach_reset = mcf54xx_reset;
......
...@@ -22,6 +22,12 @@ extern void save_bootinfo(const struct bi_record *bi); ...@@ -22,6 +22,12 @@ extern void save_bootinfo(const struct bi_record *bi);
static inline void save_bootinfo(const struct bi_record *bi) {} static inline void save_bootinfo(const struct bi_record *bi) {}
#endif #endif
#ifdef CONFIG_UBOOT
void process_uboot_commandline(char *commandp, int size);
#else
static inline void process_uboot_commandline(char *commandp, int size) {}
#endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
#define CPU_NAME "COLDFIRE(m5441x)" #define CPU_NAME "COLDFIRE(m5441x)"
#define CPU_INSTR_PER_JIFFY 2 #define CPU_INSTR_PER_JIFFY 2
#define MCF_BUSCLK (MCF_CLK / 2) #define MCF_BUSCLK (MCF_CLK / 2)
#define MACHINE MACH_M5441X
#define FPUTYPE 0
#define IOMEMBASE 0xe0000000
#define IOMEMSIZE 0x20000000
#include <asm/m54xxacr.h> #include <asm/m54xxacr.h>
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
* register region as non-cacheable. And then we map all our RAM as * register region as non-cacheable. And then we map all our RAM as
* cacheable and supervisor access only. * cacheable and supervisor access only.
*/ */
#define ACR0_MODE (ACR_BA(CONFIG_MBAR)+ACR_ADMSK(0x1000000)+ \ #define ACR0_MODE (ACR_BA(IOMEMBASE)+ACR_ADMSK(IOMEMSIZE)+ \
ACR_ENABLE+ACR_SUPER+ACR_CM_OFF_PRE+ACR_SP) ACR_ENABLE+ACR_SUPER+ACR_CM_OFF_PRE+ACR_SP)
#if defined(CONFIG_CACHE_COPYBACK) #if defined(CONFIG_CACHE_COPYBACK)
#define ACR1_MODE (ACR_BA(CONFIG_RAMBASE)+ACR_ADMSK(CONFIG_RAMSIZE)+ \ #define ACR1_MODE (ACR_BA(CONFIG_RAMBASE)+ACR_ADMSK(CONFIG_RAMSIZE)+ \
......
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
#define CPU_NAME "COLDFIRE(m54xx)" #define CPU_NAME "COLDFIRE(m54xx)"
#define CPU_INSTR_PER_JIFFY 2 #define CPU_INSTR_PER_JIFFY 2
#define MCF_BUSCLK (MCF_CLK / 2) #define MCF_BUSCLK (MCF_CLK / 2)
#define MACHINE MACH_M54XX
#define FPUTYPE FPU_COLDFIRE
#define IOMEMBASE MCF_MBAR
#define IOMEMSIZE 0x01000000
#include <asm/m54xxacr.h> #include <asm/m54xxacr.h>
......
...@@ -105,6 +105,7 @@ static inline void mmu_write(u32 a, u32 v) ...@@ -105,6 +105,7 @@ static inline void mmu_write(u32 a, u32 v)
__asm__ __volatile__ ("nop"); __asm__ __volatile__ ("nop");
} }
void cf_bootmem_alloc(void);
int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word); int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word);
#endif #endif
......
...@@ -92,7 +92,7 @@ static __inline__ unsigned int mcf_getppdata(void) ...@@ -92,7 +92,7 @@ static __inline__ unsigned int mcf_getppdata(void)
static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits) static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits)
{ {
write((readw(MCFSIM_PBDAT) & ~mask) | bits, MCFSIM_PBDAT); writew((readw(MCFSIM_PBDAT) & ~mask) | bits, MCFSIM_PBDAT);
} }
#endif #endif
......
...@@ -81,6 +81,7 @@ struct mem_info { ...@@ -81,6 +81,7 @@ struct mem_info {
#define MACH_Q40 10 #define MACH_Q40 10
#define MACH_SUN3X 11 #define MACH_SUN3X 11
#define MACH_M54XX 12 #define MACH_M54XX 12
#define MACH_M5441X 13
/* /*
......
...@@ -24,6 +24,7 @@ obj-$(CONFIG_HAS_DMA) += dma.o ...@@ -24,6 +24,7 @@ obj-$(CONFIG_HAS_DMA) += dma.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
obj-$(CONFIG_BOOTINFO_PROC) += bootinfo_proc.o obj-$(CONFIG_BOOTINFO_PROC) += bootinfo_proc.o
obj-$(CONFIG_UBOOT) += uboot.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
...@@ -203,11 +203,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, ...@@ -203,11 +203,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
} }
/* Fill in the fpu structure for a core dump. */ /* Fill in the fpu structure for a core dump. */
#ifdef CONFIG_FPU
int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu) int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu)
{ {
char fpustate[216];
if (FPU_IS_EMU) { if (FPU_IS_EMU) {
int i; int i;
...@@ -222,37 +219,40 @@ int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu) ...@@ -222,37 +219,40 @@ int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu)
return 1; return 1;
} }
/* First dump the fpu context to avoid protocol violation. */ if (IS_ENABLED(CONFIG_FPU)) {
asm volatile ("fsave %0" :: "m" (fpustate[0]) : "memory"); char fpustate[216];
if (!CPU_IS_060 ? !fpustate[0] : !fpustate[2])
return 0;
if (CPU_IS_COLDFIRE) { /* First dump the fpu context to avoid protocol violation. */
asm volatile ("fmovel %/fpiar,%0\n\t" asm volatile ("fsave %0" :: "m" (fpustate[0]) : "memory");
"fmovel %/fpcr,%1\n\t" if (!CPU_IS_060 ? !fpustate[0] : !fpustate[2])
"fmovel %/fpsr,%2\n\t" return 0;
"fmovemd %/fp0-%/fp7,%3"
: if (CPU_IS_COLDFIRE) {
: "m" (fpu->fpcntl[0]), asm volatile ("fmovel %/fpiar,%0\n\t"
"m" (fpu->fpcntl[1]), "fmovel %/fpcr,%1\n\t"
"m" (fpu->fpcntl[2]), "fmovel %/fpsr,%2\n\t"
"m" (fpu->fpregs[0]) "fmovemd %/fp0-%/fp7,%3"
: "memory"); :
} else { : "m" (fpu->fpcntl[0]),
asm volatile ("fmovem %/fpiar/%/fpcr/%/fpsr,%0" "m" (fpu->fpcntl[1]),
: "m" (fpu->fpcntl[2]),
: "m" (fpu->fpcntl[0]) "m" (fpu->fpregs[0])
: "memory"); : "memory");
asm volatile ("fmovemx %/fp0-%/fp7,%0" } else {
: asm volatile ("fmovem %/fpiar/%/fpcr/%/fpsr,%0"
: "m" (fpu->fpregs[0]) :
: "memory"); : "m" (fpu->fpcntl[0])
: "memory");
asm volatile ("fmovemx %/fp0-%/fp7,%0"
:
: "m" (fpu->fpregs[0])
: "memory");
}
} }
return 1; return 1;
} }
EXPORT_SYMBOL(dump_fpu); EXPORT_SYMBOL(dump_fpu);
#endif /* CONFIG_FPU */
unsigned long get_wchan(struct task_struct *p) unsigned long get_wchan(struct task_struct *p)
{ {
......
...@@ -245,7 +245,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -245,7 +245,7 @@ void __init setup_arch(char **cmdline_p)
* We should really do our own FPU check at startup. * We should really do our own FPU check at startup.
* [what do we do with buggy 68LC040s? if we have problems * [what do we do with buggy 68LC040s? if we have problems
* with them, we should add a test to check_bugs() below] */ * with them, we should add a test to check_bugs() below] */
#ifndef CONFIG_M68KFPU_EMU_ONLY #if defined(CONFIG_FPU) && !defined(CONFIG_M68KFPU_EMU_ONLY)
/* clear the fpu if we have one */ /* clear the fpu if we have one */
if (m68k_fputype & (FPU_68881|FPU_68882|FPU_68040|FPU_68060|FPU_COLDFIRE)) { if (m68k_fputype & (FPU_68881|FPU_68882|FPU_68040|FPU_68060|FPU_COLDFIRE)) {
volatile int zero = 0; volatile int zero = 0;
...@@ -274,6 +274,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -274,6 +274,7 @@ void __init setup_arch(char **cmdline_p)
strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE); strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE);
m68k_command_line[CL_SIZE - 1] = 0; m68k_command_line[CL_SIZE - 1] = 0;
#endif /* CONFIG_BOOTPARAM */ #endif /* CONFIG_BOOTPARAM */
process_uboot_commandline(&m68k_command_line[0], CL_SIZE);
*cmdline_p = m68k_command_line; *cmdline_p = m68k_command_line;
memcpy(boot_command_line, *cmdline_p, CL_SIZE); memcpy(boot_command_line, *cmdline_p, CL_SIZE);
...@@ -341,6 +342,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -341,6 +342,7 @@ void __init setup_arch(char **cmdline_p)
#endif #endif
#ifdef CONFIG_COLDFIRE #ifdef CONFIG_COLDFIRE
case MACH_M54XX: case MACH_M54XX:
case MACH_M5441X:
config_BSP(NULL, 0); config_BSP(NULL, 0);
break; break;
#endif #endif
...@@ -548,7 +550,7 @@ module_init(proc_hardware_init); ...@@ -548,7 +550,7 @@ module_init(proc_hardware_init);
void check_bugs(void) void check_bugs(void)
{ {
#ifndef CONFIG_M68KFPU_EMU #if defined(CONFIG_FPU) && !defined(CONFIG_M68KFPU_EMU)
if (m68k_fputype == 0) { if (m68k_fputype == 0) {
pr_emerg("*** YOU DO NOT HAVE A FLOATING POINT UNIT, " pr_emerg("*** YOU DO NOT HAVE A FLOATING POINT UNIT, "
"WHICH IS REQUIRED BY LINUX/M68K ***\n"); "WHICH IS REQUIRED BY LINUX/M68K ***\n");
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/rtc.h> #include <linux/rtc.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/bootinfo.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -82,69 +83,6 @@ void (*mach_power_off)(void); ...@@ -82,69 +83,6 @@ void (*mach_power_off)(void);
#define CPU_INSTR_PER_JIFFY 16 #define CPU_INSTR_PER_JIFFY 16
#endif #endif
#if defined(CONFIG_UBOOT)
/*
* parse_uboot_commandline
*
* Copies u-boot commandline arguments and store them in the proper linux
* variables.
*
* Assumes:
* _init_sp global contains the address in the stack pointer when the
* kernel starts (see head.S::_start)
*
* U-Boot calling convention:
* (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
*
* _init_sp can be parsed as such
*
* _init_sp+00 = u-boot cmd after jsr into kernel (skip)
* _init_sp+04 = &kernel board_info (residual data)
* _init_sp+08 = &initrd_start
* _init_sp+12 = &initrd_end
* _init_sp+16 = &cmd_start
* _init_sp+20 = &cmd_end
*
* This also assumes that the memory locations pointed to are still
* unmodified. U-boot places them near the end of external SDRAM.
*
* Argument(s):
* commandp = the linux commandline arg container to fill.
* size = the sizeof commandp.
*
* Returns:
*/
static void __init parse_uboot_commandline(char *commandp, int size)
{
extern unsigned long _init_sp;
unsigned long *sp;
unsigned long uboot_kbd;
unsigned long uboot_initrd_start, uboot_initrd_end;
unsigned long uboot_cmd_start, uboot_cmd_end;
sp = (unsigned long *)_init_sp;
uboot_kbd = sp[1];
uboot_initrd_start = sp[2];
uboot_initrd_end = sp[3];
uboot_cmd_start = sp[4];
uboot_cmd_end = sp[5];
if (uboot_cmd_start && uboot_cmd_end)
strncpy(commandp, (const char *)uboot_cmd_start, size);
#if defined(CONFIG_BLK_DEV_INITRD)
if (uboot_initrd_start && uboot_initrd_end &&
(uboot_initrd_end > uboot_initrd_start)) {
initrd_start = uboot_initrd_start;
initrd_end = uboot_initrd_end;
ROOT_DEV = Root_RAM0;
printk(KERN_INFO "initrd at 0x%lx:0x%lx\n",
initrd_start, initrd_end);
}
#endif /* if defined(CONFIG_BLK_DEV_INITRD) */
}
#endif /* #if defined(CONFIG_UBOOT) */
void __init setup_arch(char **cmdline_p) void __init setup_arch(char **cmdline_p)
{ {
int bootmap_size; int bootmap_size;
...@@ -164,53 +102,38 @@ void __init setup_arch(char **cmdline_p) ...@@ -164,53 +102,38 @@ void __init setup_arch(char **cmdline_p)
command_line[sizeof(command_line) - 1] = 0; command_line[sizeof(command_line) - 1] = 0;
#endif /* CONFIG_BOOTPARAM */ #endif /* CONFIG_BOOTPARAM */
#if defined(CONFIG_UBOOT) process_uboot_commandline(&command_line[0], sizeof(command_line));
/* CONFIG_UBOOT and CONFIG_BOOTPARAM defined, concatenate cmdline */
#if defined(CONFIG_BOOTPARAM)
/* Add the whitespace separator */
command_line[strlen(CONFIG_BOOTPARAM_STRING)] = ' ';
/* Parse uboot command line into the rest of the buffer */
parse_uboot_commandline(
&command_line[(strlen(CONFIG_BOOTPARAM_STRING)+1)],
(sizeof(command_line) -
(strlen(CONFIG_BOOTPARAM_STRING)+1)));
/* Only CONFIG_UBOOT defined, create cmdline */
#else
parse_uboot_commandline(&command_line[0], sizeof(command_line));
#endif /* CONFIG_BOOTPARAM */
command_line[sizeof(command_line) - 1] = 0;
#endif /* CONFIG_UBOOT */
printk(KERN_INFO "\x0F\r\n\nuClinux/" CPU_NAME "\n"); pr_info("uClinux with CPU " CPU_NAME "\n");
#ifdef CONFIG_UCDIMM #ifdef CONFIG_UCDIMM
printk(KERN_INFO "uCdimm by Lineo, Inc. <www.lineo.com>\n"); pr_info("uCdimm by Lineo, Inc. <www.lineo.com>\n");
#endif #endif
#ifdef CONFIG_M68VZ328 #ifdef CONFIG_M68VZ328
printk(KERN_INFO "M68VZ328 support by Evan Stawnyczy <e@lineo.ca>\n"); pr_info("M68VZ328 support by Evan Stawnyczy <e@lineo.ca>\n");
#endif #endif
#ifdef CONFIG_COLDFIRE #ifdef CONFIG_COLDFIRE
printk(KERN_INFO "COLDFIRE port done by Greg Ungerer, gerg@snapgear.com\n"); pr_info("COLDFIRE port done by Greg Ungerer, gerg@snapgear.com\n");
#ifdef CONFIG_M5307 #ifdef CONFIG_M5307
printk(KERN_INFO "Modified for M5307 by Dave Miller, dmiller@intellistor.com\n"); pr_info("Modified for M5307 by Dave Miller, dmiller@intellistor.com\n");
#endif #endif
#ifdef CONFIG_ELITE #ifdef CONFIG_ELITE
printk(KERN_INFO "Modified for M5206eLITE by Rob Scott, rscott@mtrob.fdns.net\n"); pr_info("Modified for M5206eLITE by Rob Scott, rscott@mtrob.fdns.net\n");
#endif #endif
#endif #endif
printk(KERN_INFO "Flat model support (C) 1998,1999 Kenneth Albanowski, D. Jeff Dionne\n"); pr_info("Flat model support (C) 1998,1999 Kenneth Albanowski, D. Jeff Dionne\n");
#if defined( CONFIG_PILOT ) && defined( CONFIG_M68328 ) #if defined( CONFIG_PILOT ) && defined( CONFIG_M68328 )
printk(KERN_INFO "TRG SuperPilot FLASH card support <info@trgnet.com>\n"); pr_info("TRG SuperPilot FLASH card support <info@trgnet.com>\n");
#endif #endif
#if defined( CONFIG_PILOT ) && defined( CONFIG_M68EZ328 ) #if defined( CONFIG_PILOT ) && defined( CONFIG_M68EZ328 )
printk(KERN_INFO "PalmV support by Lineo Inc. <jeff@uclinux.com>\n"); pr_info("PalmV support by Lineo Inc. <jeff@uclinux.com>\n");
#endif #endif
#ifdef CONFIG_DRAGEN2 #ifdef CONFIG_DRAGEN2
printk(KERN_INFO "DragonEngine II board support by Georges Menie\n"); pr_info("DragonEngine II board support by Georges Menie\n");
#endif #endif
#ifdef CONFIG_M5235EVB #ifdef CONFIG_M5235EVB
printk(KERN_INFO "Motorola M5235EVB support (C)2005 Syn-tech Systems, Inc. (Jate Sujjavanich)\n"); pr_info("Motorola M5235EVB support (C)2005 Syn-tech Systems, Inc. (Jate Sujjavanich)\n");
#endif #endif
pr_debug("KERNEL -> TEXT=0x%p-0x%p DATA=0x%p-0x%p BSS=0x%p-0x%p\n", pr_debug("KERNEL -> TEXT=0x%p-0x%p DATA=0x%p-0x%p BSS=0x%p-0x%p\n",
......
/*
* uboot.c -- uboot arguments support
*
* 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 <linux/kernel.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/fb.h>
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/console.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/bootmem.h>
#include <linux/seq_file.h>
#include <linux/init.h>
#include <linux/initrd.h>
#include <linux/root_dev.h>
#include <linux/rtc.h>
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/machdep.h>
#include <asm/pgtable.h>
#include <asm/sections.h>
/*
* parse_uboot_commandline
*
* Copies u-boot commandline arguments and store them in the proper linux
* variables.
*
* Assumes:
* _init_sp global contains the address in the stack pointer when the
* kernel starts (see head.S::_start)
*
* U-Boot calling convention:
* (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
*
* _init_sp can be parsed as such
*
* _init_sp+00 = u-boot cmd after jsr into kernel (skip)
* _init_sp+04 = &kernel board_info (residual data)
* _init_sp+08 = &initrd_start
* _init_sp+12 = &initrd_end
* _init_sp+16 = &cmd_start
* _init_sp+20 = &cmd_end
*
* This also assumes that the memory locations pointed to are still
* unmodified. U-boot places them near the end of external SDRAM.
*
* Argument(s):
* commandp = the linux commandline arg container to fill.
* size = the sizeof commandp.
*
* Returns:
*/
static void __init parse_uboot_commandline(char *commandp, int size)
{
extern unsigned long _init_sp;
unsigned long *sp;
unsigned long uboot_kbd;
unsigned long uboot_initrd_start, uboot_initrd_end;
unsigned long uboot_cmd_start, uboot_cmd_end;
sp = (unsigned long *)_init_sp;
uboot_kbd = sp[1];
uboot_initrd_start = sp[2];
uboot_initrd_end = sp[3];
uboot_cmd_start = sp[4];
uboot_cmd_end = sp[5];
if (uboot_cmd_start && uboot_cmd_end)
strncpy(commandp, (const char *)uboot_cmd_start, size);
#if defined(CONFIG_BLK_DEV_INITRD)
if (uboot_initrd_start && uboot_initrd_end &&
(uboot_initrd_end > uboot_initrd_start)) {
initrd_start = uboot_initrd_start;
initrd_end = uboot_initrd_end;
ROOT_DEV = Root_RAM0;
printk(KERN_INFO "initrd at 0x%lx:0x%lx\n",
initrd_start, initrd_end);
}
#endif /* if defined(CONFIG_BLK_DEV_INITRD) */
}
__init void process_uboot_commandline(char *commandp, int size)
{
int len, n;
n = strnlen(commandp, size);
commandp += n;
len = size - n;
if (len) {
/* Add the whitespace separator */
*commandp++ = ' ';
len--;
}
parse_uboot_commandline(commandp, len);
commandp[size - 1] = 0;
}
...@@ -27,7 +27,7 @@ mm_context_t next_mmu_context; ...@@ -27,7 +27,7 @@ mm_context_t next_mmu_context;
unsigned long context_map[LAST_CONTEXT / BITS_PER_LONG + 1]; unsigned long context_map[LAST_CONTEXT / BITS_PER_LONG + 1];
atomic_t nr_free_contexts; atomic_t nr_free_contexts;
struct mm_struct *context_mm[LAST_CONTEXT+1]; struct mm_struct *context_mm[LAST_CONTEXT+1];
extern unsigned long num_pages; unsigned long num_pages;
/* /*
* ColdFire paging_init derived from sun3. * ColdFire paging_init derived from sun3.
...@@ -150,6 +150,35 @@ int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word) ...@@ -150,6 +150,35 @@ int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word)
return 0; return 0;
} }
void __init cf_bootmem_alloc(void)
{
unsigned long start_pfn;
unsigned long memstart;
/* _rambase and _ramend will be naturally page aligned */
m68k_memory[0].addr = _rambase;
m68k_memory[0].size = _ramend - _rambase;
/* compute total pages in system */
num_pages = PFN_DOWN(_ramend - _rambase);
/* page numbers */
memstart = PAGE_ALIGN(_ramstart);
min_low_pfn = PFN_DOWN(_rambase);
start_pfn = PFN_DOWN(memstart);
max_pfn = max_low_pfn = PFN_DOWN(_ramend);
high_memory = (void *)_ramend;
m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6;
module_fixup(NULL, __start_fixup, __stop_fixup);
/* setup bootmem data */
m68k_setup_node(0);
memstart += init_bootmem_node(NODE_DATA(0), start_pfn,
min_low_pfn, max_low_pfn);
free_bootmem_node(NODE_DATA(0), memstart, _ramend - memstart);
}
/* /*
* Initialize the context management stuff. * Initialize the context management stuff.
* The following was taken from arch/ppc/mmu_context.c * The following was taken from arch/ppc/mmu_context.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment