public inbox for linux-m68k@lists.linux-m68k.org
 help / color / mirror / Atom feed
From: Greg Ungerer <gerg@snapgear.com>
To: Luis Alves <ljalvs@gmail.com>
Cc: uclinux-dev@uclinux.org, linux-m68k@vger.kernel.org
Subject: Re: [PATCH] Platform code merge for 68000 core cpus (part2)
Date: Wed, 5 Dec 2012 13:44:56 +1000	[thread overview]
Message-ID: <50BEC338.30601@snapgear.com> (raw)
In-Reply-To: <1354662289-24601-1-git-send-email-ljalvs@gmail.com>

Hi Luis,

On 05/12/12 09:04, Luis Alves wrote:
> I'm sending the patch for the 68000 core code merge to add in the 'for-next' branch.

Looks good, thanks. Added to the m68knommu for-next branch.

Regards
Greg


> Signed-off-by: Luis Alves <ljalvs@gmail.com>
> ---
>   arch/m68k/Makefile                                 |    6 +-
>   arch/m68k/platform/68000/Makefile                  |   18 ++
>   .../{68VZ328/bootlogo.h => 68000/bootlogo-vz.h}    |    0
>   arch/m68k/platform/{68328 => 68000}/bootlogo.h     |    0
>   arch/m68k/platform/{68328 => 68000}/entry.S        |    0
>   arch/m68k/platform/68000/head.S                    |  240 ++++++++++++++++++++
>   arch/m68k/platform/{68328 => 68000}/ints.c         |    2 +-
>   .../platform/{68328/config.c => 68000/m68328.c}    |    2 +-
>   .../{68EZ328/config.c => 68000/m68EZ328.c}         |    2 +-
>   .../{68VZ328/config.c => 68000/m68VZ328.c}         |    4 +-
>   arch/m68k/platform/{68328 => 68000}/romvec.S       |    2 +-
>   arch/m68k/platform/{68328 => 68000}/timers.c       |    2 +-
>   arch/m68k/platform/68328/Makefile                  |   21 --
>   arch/m68k/platform/68328/head-de2.S                |  128 -----------
>   arch/m68k/platform/68328/head-pilot.S              |  207 -----------------
>   arch/m68k/platform/68328/head-ram.S                |  141 ------------
>   arch/m68k/platform/68328/head-rom.S                |  105 ---------
>   arch/m68k/platform/68EZ328/Makefile                |    5 -
>   arch/m68k/platform/68VZ328/Makefile                |    5 -
>   19 files changed, 267 insertions(+), 623 deletions(-)
>   create mode 100644 arch/m68k/platform/68000/Makefile
>   rename arch/m68k/platform/{68VZ328/bootlogo.h => 68000/bootlogo-vz.h} (100%)
>   rename arch/m68k/platform/{68328 => 68000}/bootlogo.h (100%)
>   rename arch/m68k/platform/{68328 => 68000}/entry.S (100%)
>   create mode 100644 arch/m68k/platform/68000/head.S
>   rename arch/m68k/platform/{68328 => 68000}/ints.c (98%)
>   rename arch/m68k/platform/{68328/config.c => 68000/m68328.c} (97%)
>   rename arch/m68k/platform/{68EZ328/config.c => 68000/m68EZ328.c} (97%)
>   rename arch/m68k/platform/{68VZ328/config.c => 68000/m68VZ328.c} (98%)
>   rename arch/m68k/platform/{68328 => 68000}/romvec.S (94%)
>   rename arch/m68k/platform/{68328 => 68000}/timers.c (98%)
>   delete mode 100644 arch/m68k/platform/68328/Makefile
>   delete mode 100644 arch/m68k/platform/68328/head-de2.S
>   delete mode 100644 arch/m68k/platform/68328/head-pilot.S
>   delete mode 100644 arch/m68k/platform/68328/head-ram.S
>   delete mode 100644 arch/m68k/platform/68328/head-rom.S
>   delete mode 100644 arch/m68k/platform/68EZ328/Makefile
>   delete mode 100644 arch/m68k/platform/68VZ328/Makefile
>
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

      reply	other threads:[~2012-12-05  3:49 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-04 23:04 [PATCH] Platform code merge for 68000 core cpus (part2) Luis Alves
2012-12-05  3:44 ` Greg Ungerer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50BEC338.30601@snapgear.com \
    --to=gerg@snapgear.com \
    --cc=linux-m68k@vger.kernel.org \
    --cc=ljalvs@gmail.com \
    --cc=uclinux-dev@uclinux.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox