Hi All,
An updated uClinux patch is available at:
http://www.uclinux.org/pub/uClinux/uClinux-2.5.x/linux-2.5.44uc1.patch.gz
Changelog (alot :-)
1. v850 updates (Miles Bader)
2. mm cleanups (Christoph Hellwig)
3. cleanup of arch/m68knommu (me)
- common files moved to ~/arch/m68knomu/kernel
- arch Makefiles rewritten
- 68360 drivers moved to drivers directory
- lots of other miscelleneous changes
Smaller specific patches:
. FEC ColdFire 5272 and 68360 ethernet drivers
http://www.uclinux.org/pub/uClinux/uClinux-2.5.x/linux-2.5.44uc1-fec.patch.gz
. m68k/ColdFire/v850 serial drivers
http://www.uclinux.org/pub/uClinux/uClinux-2.5.x/linux-2.5.44uc1-serial.patch.gz
. 68328 frame buffer
http://www.uclinux.org/pub/uClinux/uClinux-2.5.x/linux-2.5.44uc1-fb.patch.gz
. binfmt_flat loader
http://www.uclinux.org/pub/uClinux/uClinux-2.5.x/linux-2.5.44uc1-binflat.patch.gz
. m68knommu architecture
http://www.uclinux.org/pub/uClinux/uClinux-2.5.x/linux-2.5.44uc1-m68knommu.patch.gz
. v850 architecture
http://www.uclinux.org/pub/uClinux/uClinux-2.5.x/linux-2.5.44uc1-v850.patch.gz
. mm (MMU-less) only patch
http://www.uclinux.org/pub/uClinux/uClinux-2.5.x/linux-2.5.44uc1-mm.patch.gz
Regards
Greg
------------------------------------------------------------------------
Greg Ungerer -- Chief Software Wizard EMAIL: [email protected]
Snapgear Pty Ltd PHONE: +61 7 3279 1822
825 Stanley St, FAX: +61 7 3279 1820
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com
On Sun, Oct 27, 2002 at 02:19:38AM +1000, Greg Ungerer wrote:
> - arch Makefiles rewritten
Took a look at them.
See comments below.
Sam
diff -Naur linux-2.5.44/arch/m68knommu/Makefile linux-2.5.44uc1/arch/m68knommu/Makefile
--- linux-2.5.44/arch/m68knommu/Makefile Thu Jan 1 10:00:00 1970
+++ linux-2.5.44uc1/arch/m68knommu/Makefile Sun Oct 27 02:09:09 2002
+PLATFORM = $(platform-y)
Use := no late evaluation required.
+MODEL = $(model-y)
See above.
+cpuclass-$(CONFIG_M68VZ328) := 68328
+CPUCLASS = $(cpuclass-y)
+CLASSDIR = arch/m68knommu/platform/$(cpuclass-y)/
ditto
+CLEAN_FILES += include/asm-$(ARCH)/asm-offsets.h.tmp \
+ include/asm-$(ARCH)/asm-offsets.h \
+ arch/$(ARCH)/kernel/asm-offsets.s
Use the new clean infrastrucute.
clean-files := include/asm-$(ARCH)/asm-offsets.h.tmp \
include/asm-$(ARCH)/asm-offsets.h \
arch/$(ARCH)/kernel/asm-offsets.s
+prepare: include/asm-$(ARCH)/asm-offsets.h
+archclean:
Add a call to clean boot - something like
$(call descend arch/$(ARCH)/boot, subdirclean)
+
+arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
+ include/config/MARKER
+
+include/asm-$(ARCH)/asm-offsets.h.tmp: arch/$(ARCH)/kernel/asm-offsets.s
+ @$(generate-asm-offsets.h) < $< > $@
+
+include/asm-$(ARCH)/asm-offsets.h: include/asm-$(ARCH)/asm-offsets.h.tmp
+ @echo -n ' Generating $@'
+ @$(update-if-changed)
Combine it like this instead:
include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
include/asm include/linux/version.h \
include/config/MARKER
@echo -n ' Generating $@'
@$(generate-asm-offsets.h) < $< > $@
@$(update-if-changed)
Thats more readable, and follow te normal way of doing it.
diff -Naur linux-2.5.44/arch/m68knommu/boot/Makefile linux-2.5.44uc1/arch/m68knommu/boot/Makefile
--- linux-2.5.44/arch/m68knommu/boot/Makefile Thu Jan 1 10:00:00 1970
+++ linux-2.5.44uc1/arch/m68knommu/boot/Makefile Sun Oct 27 02:09:08 2002
@@ -0,0 +1,5 @@
+clean:
+ rm -f *.[oa]
+
+dep depend:
+ :
The above can safely be deleted.
General comment.
Use
EXTRA_TARGET :=
in replacement for
EXTRA_TARGETS =
Thas is required in many platform specific makefiles
diff -Naur linux-2.5.44/arch/m68knommu/platform/68328/Makefile linux-2.5.44uc1/arch/m68knommu/platform/68328/Makefile
+
+arch/m68knommu/platform/68328/$(BOARD)/bootlogo.rh: arch/m68knommu/platform/68328/bootlogo.h
+ perl arch/m68knommu/platform/68328/bootlogo.pl \
+ < arch/m68knommu/platform/68328/bootlogo.h \
+ > arch/m68knommu/platform/68328/$(BOARD)/bootlogo.rh
The following is more readable:
$obj)/$(BOARD)/bootlogo.rh: $(src)/bootlogo.h
$(PERL) $(src)/bootlogo.pl < $(src)/bootlogo.h
> $(obj)/$(BOARD)/bootlogo.rh
diff -Naur linux-2.5.44/arch/m68knommu/platform/68EZ328/Makefile linux-2.5.44uc1/arch/m68knommu/platform/68EZ328/Makefile
+
$(obj)/$(BOARD)/bootlogo.rh: $(src)/bootlogo.h
$(PERL) $(src)/bootlogo.pl < $(src)/bootlogo.h \
> $(obj)/$(BOARD)/bootlogo.rh
The same changes a listed above.
diff -Naur linux-2.5.44/arch/m68knommu/platform/68VZ328/Makefile linux-2.5.44uc1/arch/m68knommu/platform/68VZ328/Makefile
+arch/m68knommu/platform/68VZ328/$(BOARD)/bootlogo.rh: arch/m68knommu/platform/68EZ328/bootlogo.h
+ perl arch/m68knommu/platform/68328/bootlogo.pl \
+ < arch/m68knommu/platform/68EZ328/bootlogo.h \
+ > arch/m68knommu/platform/68VZ328/$(BOARD)/bootlogo.rh
Again - use $(obj) - $(src)
diff -Naur linux-2.5.44/arch/m68knommu/platform/Makefile linux-2.5.44uc1/arch/m68knommu/platform/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the arch/m68knommu/platform.
+#
+
+include $(TOPDIR)/Rules.make
+
This makefile looks not at all usefull for me.
Sam Ravnborg <[email protected]>:
> +arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
> + include/config/MARKER
> +
> +include/asm-$(ARCH)/asm-offsets.h.tmp: arch/$(ARCH)/kernel/asm-offsets.s
> + @$(generate-asm-offsets.h) < $< > $@
> +
> +include/asm-$(ARCH)/asm-offsets.h: include/asm-$(ARCH)/asm-offsets.h.tmp
> + @echo -n ' Generating $@'
> + @$(update-if-changed)
>
> Combine it like this instead:
>
> include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
> include/asm include/linux/version.h \
> include/config/MARKER
> @echo -n ' Generating $@'
> @$(generate-asm-offsets.h) < $< > $@
> @$(update-if-changed)
>
> Thats more readable, and follow te normal way of doing it.
It may be more readable, but I don't think you can say it's the `normal way
of doing it,' at least in linux -- almost all the arch Makefiles have code
pretty much identical to Greg's (presumably all derived from a single
original source).
Perhaps they should all be changed.
-Miles
[the threading info on this msg is wrong because MARC's `Download message
RAW' option doesn't provide the message headers; quite annoying, that...]
--
"1971 pickup truck; will trade for guns"
On Sun, Oct 27, 2002 at 01:04:07PM +0900, Miles Bader wrote:
> It may be more readable, but I don't think you can say it's the `normal way
> of doing it,' at least in linux -- almost all the arch Makefiles have code
> pretty much identical to Greg's (presumably all derived from a single
> original source).
>
> Perhaps they should all be changed.
Well, most arch Makefiles could use some cleaning up - also with respect
to te construct above. My point was that there is no need to list
prerequisites as several rules when they can be combined as one.
And the fact that a temporary is generated could well be hidden.
By the way I made a mistake, it should be:
include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
include/asm include/linux/version.h \
include/config/MARKER
@echo -n ' Generating $@'
@$(generate-asm-offsets.h) < $< > [email protected]
@$(update-if-changed)
Sam
On Sun, Oct 27, 2002 at 08:48:09AM +0100, Sam Ravnborg wrote:
> Well, most arch Makefiles could use some cleaning up - also with respect
> to the construct above. My point was that there is no need to list
> prerequisites as several rules when they can be combined as one.
Well, sure. I'm just trying to say that this shouldn't be considered a
problem with Greg's patch. Since he's aiming for inclusion, I think a bit of
conservatism is a good thing... :-)
-Miles
--
P.S. All information contained in the above letter is false,
for reasons of military security.
Hi Sam,
Sam Ravnborg wrote:
> On Sun, Oct 27, 2002 at 02:19:38AM +1000, Greg Ungerer wrote:
>
>> - arch Makefiles rewritten
>
> Took a look at them.
> See comments below.
Thanks.
Rolled on these in to the next patch set.
Had to make one small adjustment:
> +
> +arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
> + include/config/MARKER
> +
> +include/asm-$(ARCH)/asm-offsets.h.tmp: arch/$(ARCH)/kernel/asm-offsets.s
> + @$(generate-asm-offsets.h) < $< > $@
> +
> +include/asm-$(ARCH)/asm-offsets.h: include/asm-$(ARCH)/asm-offsets.h.tmp
> + @echo -n ' Generating $@'
> + @$(update-if-changed)
> Combine it like this instead:
> include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
> include/asm include/linux/version.h \
> include/config/MARKER
> @echo -n ' Generating $@'
> @$(generate-asm-offsets.h) < $< > $@
^^^
This needs to be [email protected], "update-if-changed" specifically looks
for the .tmp named file.
Regards
Greg
------------------------------------------------------------------------
Greg Ungerer -- Chief Software Wizard EMAIL: [email protected]
Snapgear Pty Ltd PHONE: +61 7 3279 1822
825 Stanley St, FAX: +61 7 3279 1820
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com
Hi,
2.5.44uc1 doesn't seem to include the latest v850 changes I sent you (on
21 Oct, against 2.5.44uc0), though DaveM responded saying he had applied
that patch.
Did something get screwed up, or is 2.5.44uc1 just very old?
[The message-ID of the message containing that patch is
<[email protected]>]
Thanks,
-Miles
--
Yo mama's so fat when she gets on an elevator it HAS to go down.
Miles Bader <[email protected]> writes:
> 2.5.44uc1 doesn't seem to include the latest v850 changes I sent you (on
> 21 Oct, against 2.5.44uc0), though DaveM responded saying he had applied
> that patch.
2.5.44uc2's the same BTW (doesn't include my changes).
-Miles
--
`Life is a boundless sea of bitterness'
Hi Miles,
Miles Bader wrote:
> 2.5.44uc1 doesn't seem to include the latest v850 changes I sent you (on
> 21 Oct, against 2.5.44uc0), though DaveM responded saying he had applied
> that patch.
>
> Did something get screwed up, or is 2.5.44uc1 just very old?
Sorry, my mistake. I forgot to update those files in my local tree.
I just pushed out a linux-2.5.44uc3 that contains them.
Regards
Greg
------------------------------------------------------------------------
Greg Ungerer -- Chief Software Wizard EMAIL: [email protected]
SnapGear Pty Ltd PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com