[uClinux-dev] Re: [PATCH 0/1] m68k: merge m68k and m68knommu arch directories

[Greg Ungerer]

Hi All,

I am ready to send a request to Linus to pull this in.
Anyone not ready for this to happen?

Regards
Greg


On 22/03/11 14:43, g...@snapgear.com wrote:

The following patch merges the m68k and m68knommu arch directories.
This patch has been trimmed for review purposes - the automated file
moving and mergeing carried out by the script contained in this email
has been removed. Only the manually required changes after running the
script are shown as the patch. (So to end up with the final required
change you need to run this script then apply the patch).

This change is available as the only commit on the m68knommu git tree,
for-linux branch:

The following changes since commit a952baa034ae7c2e4a66932005cbc7ebbccfe28d:
   Linus Torvalds (1):
 Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input

are available in the git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-linus

Greg Ungerer (1):
   m68k: merge m68k and m68knommu arch directories


It is also on the for-next branch in that tree, so will get some testing
in the next tree for the next few days.

I have done some testing on both MMU and non-MMU targets, and they
worked fine. I tried a few ColdFire non-MMU builds, and I built and
ran the Atari target in the AranyM emulator. Other than some option
re-ordering the configs produced are the same.

If everyone is happy I would like to ask Linus to pull this before the
end of the current merge window.

Regards
Greg


-

#!/bin/bash

mergefile() {
BASE=${1%.?}
EXT=${1#${BASE}}
git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm${EXT}
git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no${EXT}
cat-EOF  ${TARGET}/$1
#ifdef CONFIG_MMU
#include ${BASE}_mm${EXT}
#else
#include ${BASE}_no${EXT}
#endif
EOF
git add ${TARGET}/$1
}

mergedir() {
TARGET=arch/m68k/$1
SOURCE=arch/m68knommu/$1
files=${1}_MERGE_FILES
MERGE_FILES=${!files}

echo merging files in $1
for F in $MERGE_FILES ; do
mergefile $F
done

files=${1}_NOMERGE_FILES
NOMERGE_FILES=${!files}

echo moving files in $1
for F in $NOMERGE_FILES ; do
git mv ${SOURCE}/$F ${TARGET}/$F
done

files=${1}_REMOVE_FILES
REMOVE_FILES=${!files}

echo removing common files in $1
for F in $REMOVE_FILES ; do
git rm ${SOURCE}/$F
done

if [ -e ${SOURCE}/Makefile ]; then
git mv ${TARGET}/Makefile ${TARGET}/Makefile_mm
git mv ${SOURCE}/Makefile ${TARGET}/Makefile_no
cat-EOF  ${TARGET}/Makefile
ifdef CONFIG_MMU
include ${TARGET}/Makefile_mm
else
include ${TARGET}/Makefile_no
endif
EOF
git add ${TARGET}/Makefile
fi
}

configs_MERGE_FILES=
configs_NOMERGE_FILES=m5208evb_defconfig \
m5272c3_defconfig \
m5307c3_defconfig \
m5249evb_defconfig \
m5275evb_defconfig \
m5407c3_defconfig
configs_REMOVE_FILES=
kernel_MERGE_FILES=asm-offsets.c \
dma.c entry.S \
m68k_ksyms.c \
module.c \
process.c \
ptrace.c \
setup.c \
signal.c \
sys_m68k.c \
time.c \
traps.c \
vmlinux.lds.S
kernel_NOMERGE_FILES=init_task.c \
irq.c \
syscalltable.S
kernel_REMOVE_FILES=
lib_MERGE_FILES=checksum.c \
muldi3.c
lib_NOMERGE_FILES=delay.c \
divsi3.S \
memcpy.c \
memmove.c \
memset.c \
modsi3.S \
mulsi3.S \
udivsi3.S \
umodsi3.S
lib_REMOVE_FILES=ashldi3.c \
ashrdi3.c \
lshrdi3.c
mm_MERGE_FILES=init.c kmap.c
mm_NOMERGE_FILES=
mm_REMOVE_FILES=

DIRS=configs kernel lib mm

echo STARTing merge
for dir in $DIRS ; do
echo merging $dir...
mergedir $dir
done
echo moving platform
git mv arch/m68knommu/platform arch/m68k/
git rm arch/m68knommu/defconfig

echo merging master Makefile
git mv arch/m68k/Makefile arch/m68k/Makefile_mm
git mv arch/m68knommu/Makefile arch/m68k/Makefile_no
cat-EOF  arch/m68k/Makefile
ifdef CONFIG_MMU
include arch/m68k/Makefile_mm
else
include arch/m68k/Makefile_no
endif
EOF
git add arch/m68k/Makefile

echo removing remaining m68knommu dirs
git rm -r arch/m68knommu
rm -r arch/m68knommu
exit 0

--
To 

[uClinux-dev] Re: [PATCH 0/1] m68k: merge m68k and m68knommu arch directories

[Geert Uytterhoeven]

On Thu, Mar 24, 2011 at 01:01, Greg Ungerer g...@snapgear.com wrote:
 Hi Geert,

 On 24/03/11 08:14, Geert Uytterhoeven wrote:

 On Wed, Mar 23, 2011 at 23:07, Geert Uytterhoevenge...@linux-m68k.org
  wrote:

 On Tue, Mar 22, 2011 at 05:43, ág...@snapgear.com  wrote:

 The following patch merges the m68k and m68knommu arch directories.
 This patch has been trimmed for review purposes - the automated file
 moving and mergeing carried out by the script contained in this email
 has been removed. Only the manually required changes after running the
 script are shown as the patch. (So to end up with the final required
 change you need to run this script then apply the patch).

 This change is available as the only commit on the m68knommu git tree,
 for-linux branch:

 The following changes since commit
 a952baa034ae7c2e4a66932005cbc7ebbccfe28d:
 áLinus Torvalds (1):
 á á á áMerge branch 'for-linus' of
 git://git.kernel.org/.../dtor/input

 are available in the git repository at:

 ágit://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git
 for-linus

 Greg Ungerer (1):
 á á ám68k: merge m68k and m68knommu arch directories


 It is also on the for-next branch in that tree, so will get some testing
 in the next tree for the next few days.

 defconfig is now a nommu-config, and it fails?

 BTW, haven't tried it myself yet. I'm busy bisecting an issue with
 initrds, which
 got introduced between 2.6.37 and 2.6.38.

 Init fails with init: cannot open inittab, followed by
 Kernel panic - not syncing: Attempted to kill init!.

 As I can't get ramdisks to work on ARAnyM, I need to use real hardware,
 which
 suffers a lot from long reboot/copy kernel/test cycles...

 As one data point (though not sure how useful this is to you... :-)
 I can compile for an Atari target with the merge tree and load it
 and run it on ARAnyM - using a ramdisk for root fs. Seems to work
 ok.

Strange. On ARAnyM I get:

Trying to unpack rootfs image as initramfs...
rootfs image is not initramfs (junk in compressed archive); looks
like an initrd
Freeing initrd memory: 350k freed

but later it fails with:

RAMDISK: Couldn't find valid RAM disk image starting at 0.

It works (i.e. mounts) on the Amiga, but later it fails with the
inittab error.
Will  bisect more tonight...

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
                                -- Linus Torvalds
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev

[uClinux-dev] Re: [PATCH 0/1] m68k: merge m68k and m68knommu arch directories

[Geert Uytterhoeven]

Hi Greg,

On Thu, Mar 24, 2011 at 00:00, Greg Ungerer g...@snapgear.com wrote:
 On 24/03/11 08:07, Geert Uytterhoeven wrote:
 On Tue, Mar 22, 2011 at 05:43,g...@snapgear.com  wrote:
 slso on the for-next branch in that tree, so will get some testing
 in the next tree for the next few days.

 defconfig is now a nommu-config, and it fails?

 http://kisskb.ellerman.id.au/kisskb/buildresult/4012794/

 Yep, that looks wrong. I'll move the define for KBUILD_DEFCONFIG
 into arch/m68k/Makefile (and remove the existing defines in Makefile_mm
 and Makefile_no). That will make the DEFCONFIG as it was before,
 multi_defconfig.

 arch/m68k/kernel/entry_no.S:47: Error: Unknown operator -- statement
 `save_all' ignored

 This is due to compiling for the non-mmu targets and not using
 a m68k-uclinux- toolchain. Unfortunately the compiler must define
 __uClinux__ to compile for non-mmu targets. This isn't new, we

For userland...

 have had this problem ever since the merge of the header files.
 (The exported headers need some switch to use to base some
 conditionals on, and kernel config options cannot be used in
 exported headers).

For kernels, we can explicitly define this in arch/m68k/Makefile if !MMU, right?

 But with a fixed defconfig, you won't see this anymore :-)

 I'll fix up the git commit on m68knommu git tree.

Good, thx!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
                                -- Linus Torvalds
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev

[uClinux-dev] Re: [PATCH 0/1] m68k: merge m68k and m68knommu arch directories

[Greg Ungerer]

Hi Geert,

On 24/03/11 18:06, Geert Uytterhoeven wrote:

On Thu, Mar 24, 2011 at 00:00, Greg Ungererg...@snapgear.com  wrote:

On 24/03/11 08:07, Geert Uytterhoeven wrote:

On Tue, Mar 22, 2011 at 05:43,g...@snapgear.com  áwrote:

slso on the for-next branch in that tree, so will get some testing
in the next tree for the next few days.


defconfig is now a nommu-config, and it fails?

http://kisskb.ellerman.id.au/kisskb/buildresult/4012794/


Yep, that looks wrong. I'll move the define for KBUILD_DEFCONFIG
into arch/m68k/Makefile (and remove the existing defines in Makefile_mm
and Makefile_no). That will make the DEFCONFIG as it was before,
multi_defconfig.


arch/m68k/kernel/entry_no.S:47: Error: Unknown operator -- statement
`save_all' ignored


This is due to compiling for the non-mmu targets and not using
a m68k-uclinux- toolchain. Unfortunately the compiler must define
__uClinux__ to compile for non-mmu targets. This isn't new, we


For userland...


Yes, they can't see CONFIG_MMU or otherwise.



have had this problem ever since the merge of the header files.
(The exported headers need some switch to use to base some
conditionals on, and kernel config options cannot be used in
exported headers).


For kernels, we can explicitly define this in arch/m68k/Makefile if !MMU, right?


We certainly can do that, but we don't currently...
I'll make a note to fix that.



But with a fixed defconfig, you won't see this anymore :-)

I'll fix up the git commit on m68knommu git tree.


Good, thx!


That is updated... Do you want to let this bake for another couple
of days before I ask Linus to pull it?

Regards
Greg



Gr{oetje,eeting}s,

á á á á á á á á á á á á Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
á á á á á á á á á á á á á áá áá -- Linus Torvalds






--

Greg Ungerer  --  Principal EngineerEMAIL: g...@snapgear.com
SnapGear Group, McAfee  PHONE:   +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, AustraliaWEB: http://www.SnapGear.com
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev

[uClinux-dev] Re: [PATCH 0/1] m68k: merge m68k and m68knommu arch directories

[Greg Ungerer]

On 24/03/11 18:04, Geert Uytterhoeven wrote:

On Thu, Mar 24, 2011 at 01:01, Greg Ungererg...@snapgear.com  wrote:

Hi Geert,

On 24/03/11 08:14, Geert Uytterhoeven wrote:


On Wed, Mar 23, 2011 at 23:07, Geert Uytterhoevenge...@linux-m68k.org
áwrote:


On Tue, Mar 22, 2011 at 05:43, ├íg...@snapgear.com  áwrote:


The following patch merges the m68k and m68knommu arch directories.
This patch has been trimmed for review purposes - the automated file
moving and mergeing carried out by the script contained in this email
has been removed. Only the manually required changes after running the
script are shown as the patch. (So to end up with the final required
change you need to run this script then apply the patch).

This change is available as the only commit on the m68knommu git tree,
for-linux branch:

The following changes since commit
a952baa034ae7c2e4a66932005cbc7ebbccfe28d:
áLinus Torvalds (1):
á á á áMerge branch 'for-linus' of
git://git.kernel.org/.../dtor/input

are available in the git repository at:

ágit://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git
for-linus

Greg Ungerer (1):
á á ám68k: merge m68k and m68knommu arch directories


It is also on the for-next branch in that tree, so will get some testing
in the next tree for the next few days.


defconfig is now a nommu-config, and it fails?


BTW, haven't tried it myself yet. I'm busy bisecting an issue with
initrds, which
got introduced between 2.6.37 and 2.6.38.

Init fails with init: cannot open inittab, followed by
Kernel panic - not syncing: Attempted to kill init!.

As I can't get ramdisks to work on ARAnyM, I need to use real hardware,
which
suffers a lot from long reboot/copy kernel/test cycles...


As one data point (though not sure how useful this is to you... :-)
I can compile for an Atari target with the merge tree and load it
and run it on ARAnyM - using a ramdisk for root fs. Seems to work
ok.


Strange. On ARAnyM I get:

 Trying to unpack rootfs image as initramfs...
 rootfs image is not initramfs (junk in compressed archive); looks
like an initrd
 Freeing initrd memory: 350k freed


I see that too.



but later it fails with:

 RAMDISK: Couldn't find valid RAM disk image starting at 0.


But later I get:

RAMDISK: ext2 filesystem found at block 0
RAMDISK: Loading 4096KiB [1 disk] into ram disk... done.
VFS: Mounted root (ext2 filesystem) readonly on device 1:0.


BTW the command boot args are:

Kernel command line: root=/dev/ram load_ramdisk=1 ramdisk_size=4096 
video=atafb:tthigh console=tty0 debug stram_swap=0 BOOT_IMAGE=vmlinux



It works (i.e. mounts) on the Amiga, but later it fails with the
inittab error.
Will  bisect more tonight...


Good luck :-)

Regards
Greg




Greg Ungerer  --  Principal EngineerEMAIL: g...@snapgear.com
SnapGear Group, McAfee  PHONE:   +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, AustraliaWEB: http://www.SnapGear.com
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev

[uClinux-dev] Re: [PATCH 0/1] m68k: merge m68k and m68knommu arch directories

[Geert Uytterhoeven]

On Tue, Mar 22, 2011 at 05:43,  g...@snapgear.com wrote:
 The following patch merges the m68k and m68knommu arch directories.
 This patch has been trimmed for review purposes - the automated file
 moving and mergeing carried out by the script contained in this email
 has been removed. Only the manually required changes after running the
 script are shown as the patch. (So to end up with the final required
 change you need to run this script then apply the patch).

 This change is available as the only commit on the m68knommu git tree,
 for-linux branch:

 The following changes since commit a952baa034ae7c2e4a66932005cbc7ebbccfe28d:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input

 are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-linus

 Greg Ungerer (1):
      m68k: merge m68k and m68knommu arch directories


 It is also on the for-next branch in that tree, so will get some testing
 in the next tree for the next few days.

defconfig is now a nommu-config, and it fails?

http://kisskb.ellerman.id.au/kisskb/buildresult/4012794/

arch/m68k/kernel/entry_no.S:47: Error: Unknown operator -- statement
`save_all' ignored
arch/m68k/kernel/entry_no.S:56: Error: Unknown operator -- statement
`save_all' ignored
arch/m68k/kernel/entry_no.S:92: Error: operands mismatch -- statement
`moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/kernel/entry_no.S:96: Error: operands mismatch -- statement
`moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/kernel/entry_no.S:100: Error: operands mismatch -- statement
`moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/kernel/entry_no.S:104: Error: operands mismatch -- statement
`moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/kernel/entry_no.S:108: Error: operands mismatch -- statement
`moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/kernel/entry_no.S:112: Error: operands mismatch -- statement
`moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/kernel/entry_no.S:116: Error: operands mismatch -- statement
`moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/kernel/entry_no.S:118: Error: operands mismatch -- statement
`moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/kernel/entry_no.S:122: Error: operands mismatch -- statement
`moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/kernel/entry_no.S:124: Error: operands mismatch -- statement
`moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/platform/coldfire/entry.S:65: Error: Unknown operator --
statement `save_all' ignored
arch/m68k/platform/coldfire/entry.S:92: Error: operands mismatch --
statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/platform/coldfire/entry.S:94: Error: operands mismatch --
statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/platform/coldfire/entry.S:100: Error: operands mismatch --
statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/platform/coldfire/entry.S:104: Error: operands mismatch --
statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/platform/coldfire/entry.S:144: Error: Unknown operator --
statement `restore_user' ignored
arch/m68k/platform/coldfire/entry.S:156: Error: operands mismatch --
statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/platform/coldfire/entry.S:160: Error: operands mismatch --
statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/platform/coldfire/entry.S:169: Error: Unknown operator --
statement `save_all' ignored
arch/m68k/platform/coldfire/entry.S:193: Error: Unknown operator --
statement `rdusp' ignored
arch/m68k/platform/coldfire/entry.S:196: Error: operands mismatch --
statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/platform/coldfire/entry.S:199: Error: operands mismatch --
statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/platform/coldfire/entry.S:202: Error: Unknown operator --
statement `wrusp' ignored

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
                                -- Linus Torvalds
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev

[uClinux-dev] Re: [PATCH 0/1] m68k: merge m68k and m68knommu arch directories

[Geert Uytterhoeven]

On Wed, Mar 23, 2011 at 23:07, Geert Uytterhoeven ge...@linux-m68k.org wrote:
 On Tue, Mar 22, 2011 at 05:43,  g...@snapgear.com wrote:
 The following patch merges the m68k and m68knommu arch directories.
 This patch has been trimmed for review purposes - the automated file
 moving and mergeing carried out by the script contained in this email
 has been removed. Only the manually required changes after running the
 script are shown as the patch. (So to end up with the final required
 change you need to run this script then apply the patch).

 This change is available as the only commit on the m68knommu git tree,
 for-linux branch:

 The following changes since commit a952baa034ae7c2e4a66932005cbc7ebbccfe28d:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input

 are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-linus

 Greg Ungerer (1):
      m68k: merge m68k and m68knommu arch directories


 It is also on the for-next branch in that tree, so will get some testing
 in the next tree for the next few days.

 defconfig is now a nommu-config, and it fails?

BTW, haven't tried it myself yet. I'm busy bisecting an issue with
initrds, which
got introduced between 2.6.37 and 2.6.38.

Init fails with init: cannot open inittab, followed by
Kernel panic - not syncing: Attempted to kill init!.

As I can't get ramdisks to work on ARAnyM, I need to use real hardware, which
suffers a lot from long reboot/copy kernel/test cycles...

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
                                -- Linus Torvalds
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev

[uClinux-dev] Re: [PATCH 0/1] m68k: merge m68k and m68knommu arch directories

[Greg Ungerer]

Hi Geert,

On 24/03/11 08:07, Geert Uytterhoeven wrote:

On Tue, Mar 22, 2011 at 05:43,g...@snapgear.com  wrote:

The following patch merges the m68k and m68knommu arch directories.
This patch has been trimmed for review purposes - the automated file
moving and mergeing carried out by the script contained in this email
has been removed. Only the manually required changes after running the
script are shown as the patch. (So to end up with the final required
change you need to run this script then apply the patch).

This change is available as the only commit on the m68knommu git tree,
for-linux branch:

The following changes since commit a952baa034ae7c2e4a66932005cbc7ebbccfe28d:
áLinus Torvalds (1):
á á á áMerge branch 'for-linus' of git://git.kernel.org/.../dtor/input

are available in the git repository at:

ágit://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-linus

Greg Ungerer (1):
á á ám68k: merge m68k and m68knommu arch directories


It is also on the for-next branch in that tree, so will get some testing
in the next tree for the next few days.


defconfig is now a nommu-config, and it fails?

http://kisskb.ellerman.id.au/kisskb/buildresult/4012794/


Yep, that looks wrong. I'll move the define for KBUILD_DEFCONFIG
into arch/m68k/Makefile (and remove the existing defines in Makefile_mm
and Makefile_no). That will make the DEFCONFIG as it was before,
multi_defconfig.

 arch/m68k/kernel/entry_no.S:47: Error: Unknown operator -- statement
 `save_all' ignored

This is due to compiling for the non-mmu targets and not using
a m68k-uclinux- toolchain. Unfortunately the compiler must define
__uClinux__ to compile for non-mmu targets. This isn't new, we
have had this problem ever since the merge of the header files.
(The exported headers need some switch to use to base some
conditionals on, and kernel config options cannot be used in
exported headers).

But with a fixed defconfig, you won't see this anymore :-)

I'll fix up the git commit on m68knommu git tree.

Thanks!
Greg



arch/m68k/kernel/entry_no.S:56: Error: Unknown operator -- statement
`save_all' ignored
arch/m68k/kernel/entry_no.S:92: Error: operands mismatch -- statement
`moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/kernel/entry_no.S:96: Error: operands mismatch -- statement
`moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/kernel/entry_no.S:100: Error: operands mismatch -- statement
`moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/kernel/entry_no.S:104: Error: operands mismatch -- statement
`moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/kernel/entry_no.S:108: Error: operands mismatch -- statement
`moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/kernel/entry_no.S:112: Error: operands mismatch -- statement
`moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/kernel/entry_no.S:116: Error: operands mismatch -- statement
`moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/kernel/entry_no.S:118: Error: operands mismatch -- statement
`moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/kernel/entry_no.S:122: Error: operands mismatch -- statement
`moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/kernel/entry_no.S:124: Error: operands mismatch -- statement
`moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/platform/coldfire/entry.S:65: Error: Unknown operator --
statement `save_all' ignored
arch/m68k/platform/coldfire/entry.S:92: Error: operands mismatch --
statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/platform/coldfire/entry.S:94: Error: operands mismatch --
statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/platform/coldfire/entry.S:100: Error: operands mismatch --
statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/platform/coldfire/entry.S:104: Error: operands mismatch --
statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/platform/coldfire/entry.S:144: Error: Unknown operator --
statement `restore_user' ignored
arch/m68k/platform/coldfire/entry.S:156: Error: operands mismatch --
statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/platform/coldfire/entry.S:160: Error: operands mismatch --
statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/platform/coldfire/entry.S:169: Error: Unknown operator --
statement `save_all' ignored
arch/m68k/platform/coldfire/entry.S:193: Error: Unknown operator --
statement `rdusp' ignored
arch/m68k/platform/coldfire/entry.S:196: Error: operands mismatch --
statement `moveml %a3-%a6/%d6-%d7,%sp@-' ignored
arch/m68k/platform/coldfire/entry.S:199: Error: operands mismatch --
statement `moveml %sp@+,%a3-%a6/%d6-%d7' ignored
arch/m68k/platform/coldfire/entry.S:202: Error: Unknown operator --
statement `wrusp' ignored

Gr{oetje,eeting}s,

á á á á á á á á á á á á Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
á á á á á á á á á á á á á áá 

[uClinux-dev] Re: [PATCH 0/1] m68k: merge m68k and m68knommu arch directories

[Greg Ungerer]

Hi Geert,

On 24/03/11 08:14, Geert Uytterhoeven wrote:

On Wed, Mar 23, 2011 at 23:07, Geert Uytterhoevenge...@linux-m68k.org  wrote:

On Tue, Mar 22, 2011 at 05:43, ág...@snapgear.com  wrote:

The following patch merges the m68k and m68knommu arch directories.
This patch has been trimmed for review purposes - the automated file
moving and mergeing carried out by the script contained in this email
has been removed. Only the manually required changes after running the
script are shown as the patch. (So to end up with the final required
change you need to run this script then apply the patch).

This change is available as the only commit on the m68knommu git tree,
for-linux branch:

The following changes since commit a952baa034ae7c2e4a66932005cbc7ebbccfe28d:
áLinus Torvalds (1):
á á á áMerge branch 'for-linus' of git://git.kernel.org/.../dtor/input

are available in the git repository at:

ágit://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-linus

Greg Ungerer (1):
á á ám68k: merge m68k and m68knommu arch directories


It is also on the for-next branch in that tree, so will get some testing
in the next tree for the next few days.


defconfig is now a nommu-config, and it fails?


BTW, haven't tried it myself yet. I'm busy bisecting an issue with
initrds, which
got introduced between 2.6.37 and 2.6.38.

Init fails with init: cannot open inittab, followed by
Kernel panic - not syncing: Attempted to kill init!.

As I can't get ramdisks to work on ARAnyM, I need to use real hardware, which
suffers a lot from long reboot/copy kernel/test cycles...


As one data point (though not sure how useful this is to you... :-)
I can compile for an Atari target with the merge tree and load it
and run it on ARAnyM - using a ramdisk for root fs. Seems to work
ok.

Regards
Greg



Greg Ungerer  --  Principal EngineerEMAIL: g...@snapgear.com
SnapGear Group, McAfee  PHONE:   +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, AustraliaWEB: http://www.SnapGear.com
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev