Re: [uClinux-dev] [PATCH] m68knommu: enable device config when SPI_COLDFIRE_QSPI=m
On Sat, May 05, 2012 at 05:34:42PM -0700, Steven King wrote: Hi Greg, The qspi consolidation omitted support for device initialization when the qspi is built as a module. Signed-off-by: Steven King sfk...@fdwdc.com --- arch/m68k/platform/520x/config.c |6 +++--- arch/m68k/platform/523x/config.c |6 +++--- arch/m68k/platform/5249/config.c |6 +++--- arch/m68k/platform/527x/config.c |6 +++--- arch/m68k/platform/528x/config.c |6 +++--- arch/m68k/platform/532x/config.c |6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/m68k/platform/520x/config.c b/arch/m68k/platform/520x/config.c index 2359478..621fe15 100644 --- a/arch/m68k/platform/520x/config.c +++ b/arch/m68k/platform/520x/config.c @@ -22,7 +22,7 @@ /***/ -#ifdef CONFIG_SPI_COLDFIRE_QSPI +#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) You may use IS_ENABLED(SPI_COLDFIRE_QSPI). See include/linux/kconfig.h Sam ___ 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
Re: [uClinux-dev] [PATCH] m68k: merge mmu and non-mmu arch Makefiles
On Thu, Aug 11, 2011 at 02:39:25PM +1000, g...@snapgear.com wrote: From: Greg Ungerer g...@uclinux.org [This is a resend of this patch. If no-one has any objections then I want to push this into linux-next, for eventual inclusion in the 3.2 merge window.] Looks good. Acked-by: Sam Ravnborg s...@ravnborg.org ___ 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
Re: [uClinux-dev] [PATCH] m68k: merge the mmu and non-mmu kernel/Makefiles
On Thu, Aug 11, 2011 at 02:47:24PM +1000, g...@snapgear.com wrote: From: Greg Ungerer g...@uclinux.org [This is a resend of this patch. If no-one has any objections then I want to push this into linux-next, for eventual inclusion in the 3.2 merge window.] The few differences between the mmu and non-mmu kernel/Makefiles can easily be handled inside of a single Makefile. Merge the 2 back into a single Makefile. Looks good (except the typo that is nto a typo:-) ) Acked-by: Sam Ravnborg s...@ravnborg.org ___ 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
Re: [uClinux-dev] [PATCH] m68k: reorganize Kconfig options to improve mmu/non-mmu selections
On Thu, Aug 11, 2011 at 03:10:21PM +1000, g...@snapgear.com wrote: From: Greg Ungerer g...@uclinux.org [This is a resend of this patch. Would like to hear what others think of this change. It makes the top level configuration consistent for all m68k type processors, and makes it much easier to allow MMU enabled or disabled across all types. If no-one has any objections then I want to push this into linux-next, for eventual inclusion in the 3.2 merge window.] I like the strutured layout. diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus new file mode 100644 index 000..83263ec --- /dev/null +++ b/arch/m68k/Kconfig.bus @@ -0,0 +1,98 @@ +if MMU + +comment Bus Support + +config EISA + bool + help + The Extended Industry Standard Architecture (EISA) bus was + developed as an open alternative to the IBM MicroChannel bus. + + The EISA bus provided some of the features of the IBM MicroChannel + bus while maintaining backward compatibility with cards made for + the older ISA bus. The EISA bus saw limited use between 1988 and + 1995 when it was made obsolete by the PCI bus. + + Say Y here if you are building a kernel for an EISA-based machine. + + Otherwise, say N. + +config MCA + bool + help + MicroChannel Architecture is found in some IBM PS/2 machines and + laptops. It is a bus system similar to PCI or ISA. See + file:Documentation/mca.txt (and especially the web page given + there) before attempting to build an MCA bus kernel. + +config PCMCIA + tristate + help + Say Y here if you want to attach PCMCIA- or PC-cards to your Linux + computer. These are credit-card size devices such as network cards, + modems or hard drives often used with laptops computers. There are + actually two varieties of these cards: the older 16 bit PCMCIA cards + and the newer 32 bit CardBus cards. If you want to use CardBus + cards, you need to say Y here and also to CardBus support below. + + To use your PC-cards, you will need supporting software from David + Hinds' pcmcia-cs package (see the file file:Documentation/Changes + for location). Please also read the PCMCIA-HOWTO, available from + http://www.tldp.org/docs.html#howto. + + To compile this driver as modules, choose M here: the + modules will be called pcmcia_core and ds. + +config NUBUS + bool + depends on MAC + default y Do you really need EISA, MCA and PCMIA? They have no promt thus cannot be selected by the user. +config ISA + bool + depends on Q40 || AMIGA_PCMCIA + default y + help + Find out whether you have ISA slots on your motherboard. ISA is the + name of a bus system, i.e. the way the CPU talks to the other stuff + inside your box. Other bus systems are PCI, EISA, MicroChannel + (MCA) or VESA. ISA is an older system, now being displaced by PCI; + newer boards don't support it. If you have ISA, say Y, otherwise N. + +config GENERIC_ISA_DMA + bool + depends on Q40 || AMIGA_PCMCIA + default y def_bool ISA? That looks simpler IMO - and they are enabled by the same options. Sam ___ 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
Re: [uClinux-dev] [PATCH v2 1/6] m68k: merge mmu and non-mmu versions of muldi3
Hi Greg. + +#if defined(__mc68020__) || defined(__mc68030__) || \ +defined(__mc68040__) || defined(__mc68060__) Why use these to decide if this is MMU or not? This code is not exposed to user-space so we can rely on CONFIG_* symbols. IMO the CONIFG_* symbols is easier to read/maintain. Sam ___ 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: merge of m68knommu and m68k arch branches?
On Tue, Feb 22, 2011 at 08:40:53AM +0100, Geert Uytterhoeven wrote: On Tue, Feb 22, 2011 at 08:29, Sam Ravnborg s...@ravnborg.org wrote: Is there a plan to move m68k to the generic facilities as well ? Moving m68k to genirq is (the next thing?) on my list... If I succeed migrating sparc32 to genirq I hope to be of a little help here. It looks like a bigger task to migrate m68k than it was/is to migrate sparc32. It would be _very_ nice to get the last two architectures migrated to genirq. Aren't your forgetting s390? Hmm, I had the understanding that m68k and sparc32 was the only two remaining :-( But I did not check. s390 sees more active maintenance so if they become the last non genirq user, then they may feel a bit of pressure :-) Sam ___ 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: merge of m68knommu and m68k arch branches?
On Mon, Feb 21, 2011 at 10:43:15PM +0100, Arnd Bergmann wrote: On Friday 18 February 2011 13:01:53 Greg Ungerer wrote: Attached is a script and patch that does a kind of brute force simplistic merge of the directories and files. (Thanks to Stephen King sfk...@fdwdc.com for the initial version of this script, and to Sam Ravnborg for the m68k includes merge script this was based on). Nothing outside of the arch/m68k and arch/m68knommu directories is touched, and in the end there is no more arch/m68knommu. To apply you simply run the script from the top of a current kernel git tree (I used 2.6.38-rc5 for testing) and then apply the patch. The initial version of said script was created by Arnd IIRC. Apologies to Arnd then :-) I had absolutely no memory of having done said script, but if Sam says wrote it did, that's probably true. I was just about to say how much I like your script when I read that it was my idea... See semi original version in: 49148020bcb6910ce71417bd990a5ce7017f9bd3 Sam ___ 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: merge of m68knommu and m68k arch branches?
Is there a plan to move m68k to the generic facilities as well ? Moving m68k to genirq is (the next thing?) on my list... If I succeed migrating sparc32 to genirq I hope to be of a little help here. It looks like a bigger task to migrate m68k than it was/is to migrate sparc32. It would be _very_ nice to get the last two architectures migrated to genirq. Sam ___ 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: merge of m68knommu and m68k arch branches?
On Fri, Feb 18, 2011 at 10:07:25AM +1000, Greg Ungerer wrote: Hi All, I would like to put up for discussion a merge of the m68knommu and m68k arch branches. Attached is a script and patch that does a kind of brute force simplistic merge of the directories and files. (Thanks to Stephen King sfk...@fdwdc.com for the initial version of this script, and to Sam Ravnborg for the m68k includes merge script this was based on). Nothing outside of the arch/m68k and arch/m68knommu directories is touched, and in the end there is no more arch/m68knommu. To apply you simply run the script from the top of a current kernel git tree (I used 2.6.38-rc5 for testing) and then apply the patch. The initial version of said script was created by Arnd IIRC. Thoughts? When we merged x86, sh and sparc in the past this has in all cases helped sharing coe between the 32 and 64 bit variants. There has in all cases been some code-chrunch in the beginning, but the result has been good. What as often caused some troubles has been how to configure the individual architectures. We have for eaxample: make ARCH=x86, make ARCH=i386, make ARCH=x86_64 today. Likewise for sparc we have: make ARCH=sparc, make ARCH=sparc32, make ARCH=sparc64 So you need to consider how to deal with this for m68k. Maybe MMU is just an option so you only have ARCH=m68k in the end? You do not touch upon the maintenance of the merged trees. Today there is different maintainers for the two archs. To have a transparent flow the better solution is likely that all m68k* patches go via one of your trees so we do not have two trees that deal with m68k upstream. I assume we will sort it all out naturally and I hope that we soon will have m68k and m68knommu merged! Sam ___ 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
Re: [uClinux-dev] [PATCH] arch/m68k/ide.h fix for nommu
On Fri, Jun 11, 2010 at 10:05:27AM -0400, Jate Sujjavanich wrote: -Original Message- From: uclinux-dev-boun...@uclinux.org [mailto:uclinux-dev-boun...@uclinux.org] On Behalf Of Sam Ravnborg Sent: Monday, June 07, 2010 12:09 PM To: uClinux development list Subject: Re: [uClinux-dev] [PATCH] arch/m68k/ide.h fix for nommu - * linux/include/asm-m68k/ide.h + * arch/m68k/include/ide.h Would be nice if you could remove this redundant filename. Sure. Should the copyright comments remain? Yes - please keep these (if they are relevant for the code in question). If you are in daught keep them. Sam ___ 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
Re: [uClinux-dev] Start files from initramfs
I used also a minimal configuration for the initramfs as described at linux-2.6.33/Documentation/ramfs-rootfs-initramfs.txt. -8-8-8-8-8 dir /dev 755 0 0 nod /dev/console 644 0 0 c 5 1 nod /dev/loop0 644 0 0 b 7 0 dir /bin 755 1000 1000 slink /bin/sh busybox 777 0 0 file /bin/busybox initramfs/busybox 755 0 0 dir /proc 755 0 0 dir /sys 755 0 0 dir /mnt 755 0 0 file /init initramfs/init.sh 755 0 0 -8-8-8-8-8 Did you link busybox with all libs statically linked? Otherwise busybox will fail. Sam ___ 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] Merge m68k and m68knommu
On Sat, Oct 17, 2009 at 06:02:58PM -0700, Steven King wrote: This is a script and patch to merge the m68knommu arch into m68k. 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 The patch modifies the toplevel Makefile so that ARCH=m68knommu still works (by setting SRCARCH=m68k) and adds the m68knommu Kconfig and Makefile to the m68k Kconfig and Makefile, using the definition of ARCH to select which values to use. Thus when building for either a m68k or an m68knommu target, one still specifies either ARCH=m68k or ARCH=m68knommu and everything should build EXACTLY as it did pre-merge. (I think). Hi Steven. This looks good! The mechanical method you are using really makes it simple to do the merge. And it also nicely highlights which files that really differs. There is obviously more that can be merged later but this is the first and biggest step. Signed-off-by: Steven King sfk...@fdwdc.com Acked-by: Sam Ravnborg s...@ravnborg.org Sam ___ 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
Re: [uClinux-dev] [PATCH] m68k: Unify arch/m68k/include/asm/unistd.h
On Sun, Feb 01, 2009 at 10:46:30PM +1000, Greg Ungerer wrote:
Hi Geert,
Geert Uytterhoeven wrote:
From b708bab9dbc93bc80bd06c9222ab34530736f737 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven ge...@linux-m68k.org
Date: Thu, 29 Jan 2009 21:21:40 +0100
Subject: [PATCH] m68k: Unify arch/m68k/include/asm/unistd.h
arch/m68k/include/asm/unistd_{no,mm}.h are identical, except for whitespace
differences, so unify them.
Signed-off-by: Geert Uytterhoeven ge...@linux-m68k.org
---
Looks good to me.
I started down the track of merging similar headers on Friday too.
So far I have about 12 or so for review at in the git tree below.
(One of which is exactly this unistd.h merge :-) Still plenty of
easy merges amongst the other files too...
Glad to see this. When we merged sparc we likewise identified
more that was relatively easy to merge than at least I initially anticipated.
I am not able to help at least not the next month or so.
After that I hope to be able to have mroe Linux time again.
Sam
___
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] m68k,m68knommu: merge header files
More review, testing, comments welcome... Where to from here? I'll pull from it and give it some m68k test builds. After that, you can move it to for-next. If everything's well, it can go to Linus. Sounds like a plan. Or should I amend and add my SoB and put it in m68k for-next? I am happy to go either way. For my part I like this to reach mainline ASAP. So whatever suits the two of you is fine with me. Sam ___ 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
Re: [uClinux-dev] linux-2.6.26-uc0 M5329EVB patch 1/6
On Sat, Dec 20, 2008 at 07:16:31AM -0700, Matt Waddel wrote: This patch fixes a build error with the latest (4.3.2-45) toolchain. .text.unlikely is required in the linker script. Is this a general thing or specific to uclinux? If it is general it belongs to: include/asm-generic/vmlinux.lds.h Sam ___ 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: Merge headerfiles for m68k and m68knommu to arch/m68k/include/asm
On Tue, Dec 09, 2008 at 12:26:05AM +0100, Arnd Bergmann wrote: On Tuesday 09 December 2008, Geert Uytterhoeven wrote: I have used the following include guard: #ifdef __uClinux__ #include atomic_no.h #else #include atomic_mm.h #endif gcc -E -dM for the two compilers revealed that this was the only symbol that differed. I think you can share a toolchain for m68k and m68knommu, at least for the kernel (I used my plain m68k toolchain when experimenting with m68knommu for Amiga). With the above construct we do the right thing also for headers exported to userspace. But actually none of the headers using the above are subject for export at the moment so we could use a CONFIG_ symbol for the same. So I prefer to just check CONFIG_MMU. Some of them are, by means of include/asm-generic/Kbuild.asm, e.g. unistd.h! I'm not sure if it's entirely correct, but I think you can use #ifdef __KERNEL__ # ifdef CONFIG_MMU # include atomic_mm.h # else # include atomic_no.h # endif #else # ifndef __uClinux__ # include atomic_mm.h # else # include atomic_no.h # endif #endif I kept the original way of doing it since all reports said that __uClinux__ is set by the m68knommu toolchain. Using only this symbol makes it simpler what happens. Sam ___ 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: Merge headerfiles for m68k and m68knommu to arch/m68k/include/asm
I'm not sure if it's entirely correct, but I think you can use #ifdef __KERNEL__ # ifdef CONFIG_MMU # include atomic_mm.h # else # include atomic_no.h # endif #else # ifndef __uClinux__ # include atomic_mm.h # else # include atomic_no.h # endif #endif Can someone with a shared (m68k/m68knommu) please check if __uClinux__ is only set in the m68knommu case. Use: touch foo.h; gcc -E -dM to see what is defined by the compiler. You will also need to specify if this is for m68k or m68knommu. Any comments from the m68knommu toolchain people? None of my m68k-linux compilers set __uClinux__, as expected. A m68k-uclinux- gcc will. From a gcc-4.2.4 m68k-uclinux-gcc -E -dM /tmp/foo.h | grep -i linux #define __linux 1 #define __linux__ 1 #define __uClinux__ 1 #define __gnu_linux__ 1 #define linux 1 (I think that is one of the very few differences of m68k-linux over m68k-uclinux...) I would rather just have a m68k-linux myself, and not have a separate m68k-uclinux toolchain. A precondition for this is I expect a unified ABI for m68k and m68knommu. With the merged headers it is now much more obvious where the ABI differs, so fixing the ABI differences now got one step easier. Sam ___ 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: Merge headerfiles for m68k and m68knommu to arch/m68k/include/asm
On Mon, Dec 08, 2008 at 09:58:14PM +0100, Sam Ravnborg wrote: [this mail is cross posted to uclinux mailing list which is subscriber only] Following is a pseudo patch (a script + a patch) that merges the include files for m68k and m68knommu in one place at: I fixed the missing files so we now export a proper set of files to userspace (checked with a local fix to scripts/headers_check.pl). I will followup with a patch generated by git. So to apply it you must use git am. Note: The patch simple move files around and create a few new files so even if you have updated a few files since I created the patch git will do the right-thing. This patch unify the header files and as this thread has shown there are potential for additional unification. I see this patch as a natural first step and then we can later address all the obvious unification tasks. Please apply. Sam ___ 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: Merge headerfiles for m68k and m68knommu to arch/m68k/include/asm
On Tue, Dec 09, 2008 at 12:02:46PM +0100, Arnd Bergmann wrote: On Tuesday 09 December 2008, Geert Uytterhoeven wrote: What are the other exported headers that differ? byteorder.h, param.h, ptrace.h, setup.h, sigcontext.h, siginfo.h, signal.h and unistd.h. And diffing these files for the most part it looked like a simple job for someone with some basic m68k/m68knommu knowledge to unify these. That would be a natural next step when the headers are unified. I do not see it as a prerequisite for the merge of the header files. Sam ___ 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: Merge headerfiles for m68k and m68knommu to arch/m68k/include/asm
With the above construct we do the right thing also for headers exported to userspace. But actually none of the headers using the above are subject for export at the moment so we could use a CONFIG_ symbol for the same. One thing worth adding is that this patch fixes: make ARCH=m68knommu headers_check It did not work before - but with this patch is works as expected. Sam ___ 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
