This patch moves the cris defconfigs to arch/cris/configs/ where they

belong.
As a side effect they can now directly be used through e.g.

  make ARCH=cris artpec_3_defconfig
The default defconfig is set through KBUILD_DEFCONFIG.
Signed-off-by: Adrian Bunk <adrian.bunk@movial.fi>
---
 arch/cris/Makefile                         |    2 +

 arch/cris/artpec_3_defconfig               |  582 -------------------

 arch/cris/configs/artpec_3_defconfig       |  582 +++++++++++++++++++

 arch/cris/configs/etrax-100lx_v2_defconfig |  580 +++++++++++++++++++

 arch/cris/configs/etraxfs_defconfig        |  585 ++++++++++++++++++++

 arch/cris/defconfig                        |  580 -------------------

 arch/cris/etraxfs_defconfig                |  585 --------------------

 7 files changed, 1749 insertions(+), 1747 deletions(-)
506b62a0e7b1316a0389052692882f568e93ad2a diff --git a/arch/cris/Makefile b/arch/cris/Makefile

index 838cd2a..c6f5f5a 100644

--- a/arch/cris/Makefile

+++ b/arch/cris/Makefile

@@ -10,6 +10,8 @@

 # License.  See the file "COPYING" in the main directory of this archive

 # for more details.
+KBUILD_DEFCONFIG := etrax-100lx_v2_defconfig

+

 arch-y := v10

 arch-$(CONFIG_ETRAX_ARCH_V10) := v10

 arch-$(CONFIG_ETRAX_ARCH_V32) := v32

diff --git a/arch/cris/artpec_3_defconfig b/arch/cris/artpec_3_defconfig

deleted file mode 100644

index 41fe674..0000000

--- a/arch/cris/artpec_3_defconfig

+++ /dev/null

@@ -1,582 +0,0 @@

-#

-# Automatically generated make config: don't edit

-# Linux kernel version: 2.6.24-rc3

-# Mon Dec  3 11:18:54 2007

-#

-CONFIG_MMU=y

-CONFIG_ZONE_DMA=y

-CONFIG_RWSEM_GENERIC_SPINLOCK=y

-CONFIG_GENERIC_IOMAP=y

-# CONFIG_ARCH_HAS_ILOG2_U32 is not set

-# CONFIG_ARCH_HAS_ILOG2_U64 is not set

-CONFIG_GENERIC_FIND_NEXT_BIT=y

-CONFIG_GENERIC_HWEIGHT=y

-CONFIG_GENERIC_CALIBRATE_DELAY=y

-CONFIG_NO_IOPORT=y

-CONFIG_FORCE_MAX_ZONEORDER=6

-CONFIG_CRIS=y

-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

-

-#

-# General setup

-#

-C...
[ message continues ]

Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Thanks!
/^JN - Jesper Nilsson

--

               Jesper Nilsson -- jesper.nilsson@axis.com

--

This patch moves the cris defconfigs to arch/cris/configs/ where they

belong.
As a side effect they can now be used directly through e.g.

  make ARCH=cris artpec_3_defconfig
The default defconfig is set through KBUILD_DEFCONFIG.
Signed-off-by: Adrian Bunk <adrian.bunk@movial.fi>
---
Patch updated after I discovered an additional defconfig in

arch/cris/arch-v10/defconfig
 arch/cris/Makefile                         |    2

 arch/cris/arch-v10/defconfig               |  502 ------------------

 arch/cris/artpec_3_defconfig               |  582 --------------------

 arch/cris/configs/artpec_3_defconfig       |  582 ++++++++++++++++++++

 arch/cris/configs/etrax-100lx_defconfig    |  502 ++++++++++++++++++

 arch/cris/configs/etrax-100lx_v2_defconfig |  580 ++++++++++++++++++++

 arch/cris/configs/etraxfs_defconfig        |  585 +++++++++++++++++++++

 arch/cris/defconfig                        |  580 --------------------

 arch/cris/etraxfs_defconfig                |  585 ---------------------

 9 files changed, 2251 insertions(+), 2249 deletions(-)
f43d92ac3143510427416af956e3a093acc51a00 diff --git a/arch/cris/Makefile b/arch/cris/Makefile

index 838cd2a..c6f5f5a 100644

--- a/arch/cris/Makefile

+++ b/arch/cris/Makefile

@@ -10,6 +10,8 @@

 # License.  See the file "COPYING" in the main directory of this archive

 # for more details.
+KBUILD_DEFCONFIG := etrax-100lx_v2_defconfig

+

 arch-y := v10

 arch-$(CONFIG_ETRAX_ARCH_V10) := v10

 arch-$(CONFIG_ETRAX_ARCH_V32) := v32

diff --git a/arch/cris/arch-v10/defconfig b/arch/cris/arch-v10/defconfig

deleted file mode 100644

index 572f119..0000000

--- a/arch/cris/arch-v10/defconfig

+++ /dev/null

@@ -1,502 +0,0 @@

-#

-# Automatically generated make config: don't edit

-#

-CONFIG_UID16=y

-CONFIG_RWSEM_GENERIC_SPINLOCK=y

-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set

-

-#

-# Code maturity level options

-#

-CONFIG_EXPERIMENTAL=y

-

-#

-# General setup

-#

-CONFIG_NET=y

-CONFIG_SYSVIPC=y

-# CONFIG_BSD_PROCESS_ACCT is ...
[ message continues ]

That could probably have been nuked, it's ancient.
I'll put this in my queue. Thanks!
/^JN - Jesper Nilsson

--

               Jesper Nilsson -- jesper.nilsson@axis.com

--

If you blindly apply this patch then make sure you do not end

up with zero size files. They are disliked by the kerne and

make distclean will delete them - and git becomes unhappy.
	Sam

--

At least GNU patch will correctly remove the files with my patch.
Please name the tools that are that broken that they wouldn't apply this 
cu

Adrian
-- 
       "Is there not promise of rain?" Ling Tan asked suddenly out

        of the darkness. There had been need of rain for many days.

       "Only a promise," Lao Er said.

                                       Pearl S. Buck - Dragon Seed
--

It is only one or two weeks ago we ended up with a zero size file

in the kernel tree - and I do not know why.

I just wanted to make sure we did not see this happen again.
	Sam

--

Then research first what went wrong in this case.
But it is not funny when you wrongly accuse me publically of sending 
cu

Adrian
-- 
       "Is there not promise of rain?" Ling Tan asked suddenly out

        of the darkness. There had been need of rain for many days.

       "Only a promise," Lao Er said.

                                       Pearl S. Buck - Dragon Seed
--

Maybe it was not obvious in my previous reply - but I did not

intent in any way to accuse you of anything.

Sorry for accusing you.
	Sam

--