linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: horms+renesas@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Second Round of Renesas ARM Based SoC Defconfig Updates for v3.20
Date: Fri, 16 Jan 2015 11:35:15 +0900	[thread overview]
Message-ID: <cover.1421371751.git.horms+renesas@verge.net.au> (raw)

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these second round of Renesas ARM based SoC defconfig updates for v3.20.

This pull request is based on the previous round of
such requests, tagged as renesas-defconfig-for-v3.20,
which I have already sent a pull-request for.

This pull request has a minor conflict in
arch/arm/configs/shmobile_defconfig with the pull-request
"Renesas ARM Based SoC Lager Board Removal for v3.20", tagged as
renesas-lager-board-removal-for-v3.20, which you have pulled into the
next/cleanup branch.

A resolution for this conflict is in the renesas-next-20150114-v3.19-rc1
tag of my renesas tree.

In words the resolution is to add CONFIG_ARCH_SH73A0=y and
remove CONFIG_MACH_LAGER=y.

The resulting area of arch/arm/configs/shmobile_defconfig should look like
this:

CONFIG_ARCH_R8A7790=y
CONFIG_ARCH_R8A7791=y
CONFIG_ARCH_R8A7794=y
CONFIG_ARCH_SH73A0=y
CONFIG_MACH_MARZEN=y
CONFIG_CPU_BPREDICT_DISABLE=y
CONFIG_PL310_ERRATA_588369=y


The following changes since commit db54d850b686c2ca81c10dd3582e98ee089a0e3a:

  ARM: shmobile: Enable DA9063 watchdog in multiplatform defconfig (2014-12-21 16:53:36 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig2-for-v3.20

for you to fetch changes up to eb4513482d1c4882e3633528ccc48d77581b7bb1:

  ARM: shmobile: Enable kzm9g board in multiplatform defconfig (2015-01-14 09:51:08 +0900)

----------------------------------------------------------------
Second Round of Renesas ARM Based SoC Defconfig Updates for v3.20

* Enable kzm9g board in multiplatform defconfig

----------------------------------------------------------------
Geert Uytterhoeven (1):
      ARM: shmobile: Enable kzm9g board in multiplatform defconfig

 arch/arm/configs/shmobile_defconfig | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

             reply	other threads:[~2015-01-16  2:35 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-16  2:35 Simon Horman [this message]
2015-01-16  2:35 ` [PATCH] ARM: shmobile: Enable kzm9g board in multiplatform defconfig Simon Horman
2015-01-21 22:52 ` [GIT PULL] Second Round of Renesas ARM Based SoC Defconfig Updates for v3.20 Olof Johansson

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=cover.1421371751.git.horms+renesas@verge.net.au \
    --to=horms+renesas@verge.net.au \
    --cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).