| 7bc1e4d8d506462c7d40118196f79a709f3fecfd |
|
21-Aug-2013 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k: Add support to export bootinfo in procfs
Add optional support to export the bootinfo used to boot the kernel in a
"bootinfo" file in procfs. This is useful with kexec.
This is based on the similar feature for ATAGS on ARM.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
| 7a15dd5c4b9d916cb1734dfd79dbdd5773772abb |
|
18-Oct-2013 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k/atari: Call paging_init() before nf_init()
nf_init() uses virt_to_phys(), which depends on m68k_memoffset being set and
module_fixup() having been called, but this is only done in paging_init().
Hence call paging_init() before nf_init().
This went unnoticed, as virt_to_phys() is a no-op on Atari, unless you start
fiddling with the memory blocks in the bootinfo manually.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
| abe48101c17eaf1b5d85270272392e6111562626 |
|
04-Oct-2013 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
| 799300840c18e7fdc0a3dace70d9b56a189fd1ab |
|
02-Oct-2013 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k/UAPI: Move generic definitions to <asm/bootinfo.h>
Move generic definitions used by bootstraps to uapi/asm/bootinfo.h:
- Machine types,
- CPU, FPU, and MMU types,
- struct mem_info.
Keep a copy of struct mem_info for in-kernel use, and rename it to struct
m68k_mem_info, as the exported one will be modified later.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
| 29a202035753dd0e5810caaefe885ed8934bfd46 |
|
09-Sep-2013 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k: The bootinfo is located right after the kernel
Since the introduction of init sections (which are located after BSS), the
bootinfo is no longer located right after the BSS, but after all kernel
sections.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
| 6074a13934202c7a68c77fd5f37da8dce731f181 |
|
26-Jun-2013 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k/setup: Use pr_*() and __func__ instead of plain printk()
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
| a4df02a217e9787a4b967197d9d9030c3e3c1088 |
|
25-Jun-2013 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k: Mark functions only called from setup_arch() __init
Some functions that are only called (indirectly) from setup_arch() lack
__init annotations.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
| 84b16b7b0d5c818fadc731a69965dc76dce0c91e |
|
06-Apr-2013 |
Michael Schmitz <schmitz@opal.biophys.uni-duesseldorf.de> |
m68k/atari: ROM port ISA adapter support
Atari ROM port ISA adapter support for EtherNEC and NetUSBee adapters
16 bit access for ROM port adapters follows debugging and
clarification by David Galvez <dgalvez75@gmail.com>. The NetUSBee
ISP1160 USB chip uses these macros.
Signed-off-by: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
| c8d5ba1891eda2aa63800f052cb5af128283d130 |
|
08-Nov-2012 |
Stephen Warren <swarren@nvidia.com> |
m68k: set arch_gettimeoffset directly
remove m68k's mach_gettimeoffset function pointer, and instead directly
set the arch_gettimeoffset function pointer. This requires multiplying
all function results by 1000, since the removed m68k_gettimeoffset() did
this. Also, s/unsigned long/u32/ just to make the function prototypes
exactly match that of arch_gettimeoffset.
Cc: Joshua Thompson <funaho@jurai.org>
Cc: Sam Creasey <sammy@sammy.net>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
|
| 0a2796da1182a7dcfba41f796f45986237bc1688 |
|
19-Oct-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68k: add ColdFire FPU support for the V4e ColdFire CPUs
The V4e ColdFire CPU family also has an integrated FPU (as well as the MMU).
So add code to support this hardware along side the existing m68k FPU code.
The ColdFire FPU is of course different to all previous 68k FP units. It is
close in operation to the 68060, but not completely compatible. The biggest
issue to deal with is that the ColdFire FPU multi-move instructions are
different. It does not support multi-moving the FP control registers, and
the multi-move of the FP data registers uses a different instruction
mnemonic.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Matt Waddel <mwaddel@yahoo.com>
Acked-by: Kurt Mahan <kmahan@xmission.com>
|
| 3731454033432abd37e1a6701eb0f1d73a47d680 |
|
19-Oct-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68k: add code to setup a ColdFire 54xx platform when MMU enabled
We use the same setup code for ColdFire MMU enabled platforms as
standard m68k. So add support for it to setup our 54xx ColdFire
platforms. They do not support the same bootinfo parsing as other
m68k platforms.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Matt Waddel <mwaddel@yahoo.com>
Acked-by: Kurt Mahan <kmahan@xmission.com>
|
| 060632adc1973452745512a2897bae126f7eaae4 |
|
14-Oct-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68k: show ColdFire CPU/FPU/MMU type
Update the show_cpuinfo() code to display info about ColdFire cores.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Matt Waddel <mwaddel@yahoo.com>
Acked-by: Kurt Mahan <kmahan@xmission.com>
|
| d1db9120cd7df0872385fd29a25257f23cb70527 |
|
19-Oct-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68k: support configure time command line for MMU m68k
The non-MMU builds of m68k allow a fixed kernel boot command line to
be configured at configure time. Allow this MMU builds as well.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
|
| b2cb92417d301f46801695243df5061a9bd31dd5 |
|
08-Jun-2011 |
Geert Uytterhoeven <geert@linux-m68k.org> |
m68k: Kill warning in setup_arch() when compiling for Sun3
arch/m68k/kernel/setup_mm.c: In function ‘setup_arch’:
arch/m68k/kernel/setup_mm.c:219: warning: unused variable ‘i’
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
| 66d857b08b8c3ed5c72c361f863cce77d2a978d7 |
|
22-Mar-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68k: merge m68k and m68knommu arch directories
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>
|