66d857b08b
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>
48 lines
1.3 KiB
C
48 lines
1.3 KiB
C
/***************************************************************************/
|
|
|
|
/*
|
|
* cache.c -- general ColdFire Cache maintainence code
|
|
*
|
|
* Copyright (C) 2010, Greg Ungerer (gerg@snapgear.com)
|
|
*/
|
|
|
|
/***************************************************************************/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <asm/coldfire.h>
|
|
#include <asm/mcfsim.h>
|
|
|
|
/***************************************************************************/
|
|
#ifdef CACHE_PUSH
|
|
/***************************************************************************/
|
|
|
|
/*
|
|
* Use cpushl to push all dirty cache lines back to memory.
|
|
* Older versions of GAS don't seem to know how to generate the
|
|
* ColdFire cpushl instruction... Oh well, bit stuff it for now.
|
|
*/
|
|
|
|
void mcf_cache_push(void)
|
|
{
|
|
__asm__ __volatile__ (
|
|
"clrl %%d0\n\t"
|
|
"1:\n\t"
|
|
"movel %%d0,%%a0\n\t"
|
|
"2:\n\t"
|
|
".word 0xf468\n\t"
|
|
"addl %0,%%a0\n\t"
|
|
"cmpl %1,%%a0\n\t"
|
|
"blt 2b\n\t"
|
|
"addql #1,%%d0\n\t"
|
|
"cmpil %2,%%d0\n\t"
|
|
"bne 1b\n\t"
|
|
: /* No output */
|
|
: "i" (CACHE_LINE_SIZE),
|
|
"i" (DCACHE_SIZE / CACHE_WAYS),
|
|
"i" (CACHE_WAYS)
|
|
: "d0", "a0" );
|
|
}
|
|
|
|
/***************************************************************************/
|
|
#endif /* CACHE_PUSH */
|
|
/***************************************************************************/
|