[U-Boot-Users] [PATCH 1/5]: add AcTux board support (common)

[U-Boot-Users] [PATCH 1/5]: add AcTux board support (common)

[Michael Schwingen]

Hi,

since all prerequisites seem to be in master (or on the way), I think I can
finally submit the patch set for the IXP42x boards I have been working on.
The boards are called AcTux-1 .. AcTux-4. This patch contains the files that
contain changes for multiple boards, the board-specific files follow as
single patches.

I am not sure about the MACH_TYPE definitions - are these automatically
pulled from the Linux master file?

cu
Michael

Signed-off-by: Michael Schwingen <michael@schwingen.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 2ef2f5c..9291f48 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -536,6 +536,13 @@ Alex Z?pke <azu@sysgo.de>
 	lart			SA1100
 	dnp1110			SA1110

+Michael Schwingen <michael@schwingen.org>
+
+	actux1			xscale
+	actux2			xscale
+	actux3			xscale
+	actux4			xscale
+
 #########################################################################
 # x86 Systems:								#
 #									#
diff --git a/MAKEALL b/MAKEALL
index ebc5a22..7e39b2c 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -516,4 +516,8 @@ LIST_ixp="		\
 	ixdpg425	\
 	pdnb3		\
 	scpu		\
+	actux1		\
+	actux2		\
+	actux3		\
+	actux4		\
 "


diff --git a/Makefile b/Makefile
index 1983ca0..10ab3df 100644
--- a/Makefile
+++ b/Makefile
@@ -2430,2 +2430,2 @@ ixdp425_config	:	unconfig
 ixdpg425_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm ixp ixdp425

+actux1_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux1
+
+actux2_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux2
+
+actux3_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux3
+
+actux4_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux4
+
 lubbock_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm pxa lubbock

diff --git a/board/actux3/Makefile b/board/actux3/Makefile
new file mode 100644
index 0000000..f7a6091
--- /dev/null
+++ b/board/actux3/Makefile
@@ -0,0 +1,50 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).a
+
+COBJS	:= actux3.o
+
+SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+SOBJS	:= $(addprefix $(obj),$(SOBJS))
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+
+clean:
+	rm -f $(SOBJS) $(OBJS)
+
+distclean:	clean
+	rm -f $(LIB) core *.bak .depend
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h
index ab19047..01bfecb 100644
--- a/include/asm-arm/mach-types.h
+++ b/include/asm-arm/mach-types.h
@@ -742,3 +742,7 @@ extern unsigned int __machine_arch_type;
 #define MACH_TYPE_AT91SAM9260EK       1099
 #define MACH_TYPE_AT91RM9200DF        1119
 #define MACH_TYPE_AT91SAM9263EK       1202
+#define MACH_TYPE_ACTUX1              1479
+#define MACH_TYPE_ACTUX2              1480
+#define MACH_TYPE_ACTUX3              1481
+#define MACH_TYPE_ACTUX4              1532

 #ifdef CONFIG_ARCH_EBSA110
 # ifdef machine_arch_type

[U-Boot-Users] resend [PATCH 1/5]: add AcTux board support (common)

[Michael Schwingen]

Hi,

resend of the previous patch set with formatting fixed (hopefully).

The patch adds 4 boards, called AcTux-1 .. AcTux-4. This patch contains the files that
contain changes for multiple boards, the board-specific files follow as
separate patches.

cu
Michael

Signed-off-by: Michael Schwingen <michael@schwingen.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 2ef2f5c..9291f48 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -536,6 +536,13 @@ Alex Z?pke <azu@sysgo.de>
 	lart			SA1100
 	dnp1110			SA1110
 
+Michael Schwingen <michael@schwingen.org>
+
+	actux1			xscale
+	actux2			xscale
+	actux3			xscale
+	actux4			xscale
+
 #########################################################################
 # x86 Systems:								#
 #									#
diff --git a/MAKEALL b/MAKEALL
index ebc5a22..7e39b2c 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -516,6 +516,10 @@ LIST_ixp="		\
 	ixdpg425	\
 	pdnb3		\
 	scpu		\
+	actux1		\
+	actux2		\
+	actux3		\
+	actux4		\
 "
 
 
diff --git a/Makefile b/Makefile
index 1983ca0..10ab3df 100644
--- a/Makefile
+++ b/Makefile
@@ -2430,6 +2430,18 @@ ixdp425_config	:	unconfig
 ixdpg425_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm ixp ixdp425
 
+actux1_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux1
+
+actux2_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux2
+
+actux3_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux3
+
+actux4_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux4
+
 lubbock_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm pxa lubbock
 
diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h
index ab19047..01bfecb 100644
--- a/include/asm-arm/mach-types.h
+++ b/include/asm-arm/mach-types.h
@@ -742,6 +742,10 @@ extern unsigned int __machine_arch_type;
 #define MACH_TYPE_AT91SAM9260EK       1099
 #define MACH_TYPE_AT91RM9200DF        1119
 #define MACH_TYPE_AT91SAM9263EK       1202
+#define MACH_TYPE_ACTUX1              1479
+#define MACH_TYPE_ACTUX2              1480
+#define MACH_TYPE_ACTUX3              1481
+#define MACH_TYPE_ACTUX4              1532
 
 #ifdef CONFIG_ARCH_EBSA110
 # ifdef machine_arch_type

[U-Boot-Users] resend [PATCH 1/5]: add AcTux board support (common)

[Wolfgang Denk]

In message <20080113125113.GA27114@discworld.dascon.de> you wrote:
> 
> diff --git a/MAKEALL b/MAKEALL
> index ebc5a22..7e39b2c 100755
> --- a/MAKEALL
> +++ b/MAKEALL
> @@ -516,6 +516,10 @@ LIST_ixp=3D"		\
>  	ixdpg425	\
>  	pdnb3		\
>  	scpu		\
> +	actux1		\
> +	actux2		\
> +	actux3		\
> +	actux4		\

Please don't append, but keep lists sorted.

> diff --git a/Makefile b/Makefile
> index 1983ca0..10ab3df 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2430,6 +2430,18 @@ ixdp425_config	:	unconfig
>  ixdpg425_config	:	unconfig
>  	@$(MKCONFIG) $(@:_config=3D) arm ixp ixdp425
>  =
> 
> +actux1_config	:	unconfig
> +	@$(MKCONFIG) $(@:_config=3D) arm ixp actux1
> +
> +actux2_config	:	unconfig
> +	@$(MKCONFIG) $(@:_config=3D) arm ixp actux2
> +
> +actux3_config	:	unconfig
> +	@$(MKCONFIG) $(@:_config=3D) arm ixp actux3
> +
> +actux4_config	:	unconfig
> +	@$(MKCONFIG) $(@:_config=3D) arm ixp actux4
> +
>  lubbock_config	:	unconfig
>  	@$(MKCONFIG) $(@:_config=3D) arm pxa lubbock

Ditto.

> diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h
> index ab19047..01bfecb 100644
> --- a/include/asm-arm/mach-types.h
> +++ b/include/asm-arm/mach-types.h
> @@ -742,6 +742,10 @@ extern unsigned int __machine_arch_type;
>  #define MACH_TYPE_AT91SAM9260EK       1099
>  #define MACH_TYPE_AT91RM9200DF        1119
>  #define MACH_TYPE_AT91SAM9263EK       1202
> +#define MACH_TYPE_ACTUX1              1479
> +#define MACH_TYPE_ACTUX2              1480
> +#define MACH_TYPE_ACTUX3              1481
> +#define MACH_TYPE_ACTUX4              1532

Please provide a correct update of the mach-types.h file (complete
copy of the original sitribution).

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Any technology distinguishable from magic is insufficiently advanced.

[U-Boot-Users] resend [PATCH 1/5]: add AcTux board support (common)

[Michael Schwingen]

Wolfgang Denk wrote:
> In message <20080113125113.GA27114@discworld.dascon.de> you wrote:
>   
>> diff --git a/MAKEALL b/MAKEALL
>> index ebc5a22..7e39b2c 100755
>> --- a/MAKEALL
>> +++ b/MAKEALL
>> @@ -516,6 +516,10 @@ LIST_ixp=3D"		\
>>  	ixdpg425	\
>>  	pdnb3		\
>>  	scpu		\
>> +	actux1		\
>> +	actux2		\
>> +	actux3		\
>> +	actux4		\
>>     
>
> Please don't append, but keep lists sorted.
>   
Will do.


>> diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h
>> index ab19047..01bfecb 100644
>> --- a/include/asm-arm/mach-types.h
>> +++ b/include/asm-arm/mach-types.h
>> @@ -742,6 +742,10 @@ extern unsigned int __machine_arch_type;
>>  #define MACH_TYPE_AT91SAM9260EK       1099
>>  #define MACH_TYPE_AT91RM9200DF        1119
>>  #define MACH_TYPE_AT91SAM9263EK       1202
>> +#define MACH_TYPE_ACTUX1              1479
>> +#define MACH_TYPE_ACTUX2              1480
>> +#define MACH_TYPE_ACTUX3              1481
>> +#define MACH_TYPE_ACTUX4              1532
>>     
>
> Please provide a correct update of the mach-types.h file (complete
> copy of the original sitribution).
>   
There is no original distribution - the mach-types.h file is generated 
by an awk script from the machine database - at least for the Linux 
kernel it is.

The original file is linux/arch/arm/tools/mach-types, however, that can 
not be used by u-boot since the script + Makefile part to generate 
mach-types.h is missing - maybe it would be a good idea to import that 
from Linux.

I can generate a current mach-types.h file and include it in the patch, 
however, the generated file is >500K, and the patch is still 330K in 
size, so it will not fit the list limit.

Shall I provide a http link to that part of the patch?

cu
Michael

[U-Boot-Users] resend #2 [PATCH 1/5]: add AcTux board support (common)

[Michael Schwingen]

Hi,
 
2nd resend of the previous patch set with formatting fixed (hopefully).

The patch adds 4 boards, called AcTux-1 .. AcTux-4. This patch contains the files that
contain changes for multiple boards, the board-specific files follow as
separate patches.

I have kept the small version of the mach-types.h patch to fir the list size
limit - the full version of the patch, with mach-types.h generated from the
current ARM machine database, is at:

http://www.schwingen.org/actux.diff

cu
Michael

Signed-off-by: Michael Schwingen <michael@schwingen.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 2ef2f5c..9291f48 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -536,6 +536,13 @@ Alex Z?pke <azu@sysgo.de>
 	lart			SA1100
 	dnp1110			SA1110
 
+Michael Schwingen <michael@schwingen.org>
+
+	actux1			xscale
+	actux2			xscale
+	actux3			xscale
+	actux4			xscale
+
 #########################################################################
 # x86 Systems:								#
 #									#
diff --git a/MAKEALL b/MAKEALL
index ebc5a22..a058869 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -512,6 +512,10 @@ LIST_pxa="		\
 "
 
 LIST_ixp="		\
+	actux1		\
+	actux2		\
+	actux3		\
+	actux4		\
 	ixdp425		\
 	ixdpg425	\
 	pdnb3		\
diff --git a/Makefile b/Makefile
index 1983ca0..9a4d5c9 100644
--- a/Makefile
+++ b/Makefile
@@ -2406,6 +2406,18 @@ SMN42_config	:	unconfig
 ## XScale Systems
 #########################################################################
 
+actux1_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux1
+
+actux2_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux2
+
+actux3_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux3
+
+actux4_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm ixp actux4
+
 adsvix_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm pxa adsvix
diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h
index ab19047..01bfecb 100644
--- a/include/asm-arm/mach-types.h
+++ b/include/asm-arm/mach-types.h
@@ -742,6 +742,10 @@ extern unsigned int __machine_arch_type;
 #define MACH_TYPE_AT91SAM9260EK       1099
 #define MACH_TYPE_AT91RM9200DF        1119
 #define MACH_TYPE_AT91SAM9263EK       1202
+#define MACH_TYPE_ACTUX1              1479
+#define MACH_TYPE_ACTUX2              1480
+#define MACH_TYPE_ACTUX3              1481
+#define MACH_TYPE_ACTUX4              1532

 #ifdef CONFIG_ARCH_EBSA110
 # ifdef machine_arch_type
 

[U-Boot-Users] resend #2 [PATCH 1/5]: add AcTux board support (common)

[Jean-Christophe PLAGNIOL-VILLARD]

On 09:02 Mon 14 Jan     , Michael Schwingen wrote:
> Hi,
>  
> 2nd resend of the previous patch set with formatting fixed (hopefully).
> 
> The patch adds 4 boards, called AcTux-1 .. AcTux-4. This patch contains the files that
> contain changes for multiple boards, the board-specific files follow as
> separate patches.
> 
> I have kept the small version of the mach-types.h patch to fir the list size
> limit - the full version of the patch, with mach-types.h generated from the
> current ARM machine database, is at:
> 
> http://www.schwingen.org/actux.diff
> 
> cu
> Michael
> 
> Signed-off-by: Michael Schwingen <michael@schwingen.org>
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 2ef2f5c..9291f48 100644
Nack,

I've an error when applying this patch
fatal: corrupt patch at line 56
Patch failed at 0014.

could you fix it and resend your patch thanks

[U-Boot-Users] resend #2 [PATCH 1/5]: add AcTux board support (common)

[Wolfgang Denk]

In message <20080114234040.GA27359@game.jcrosoft.org> you wrote:
>
> > I have kept the small version of the mach-types.h patch to fir the list size
> > limit - the full version of the patch, with mach-types.h generated from the
> > current ARM machine database, is at:
> > 
> > http://www.schwingen.org/actux.diff
> > 
> > cu
> > Michael
> > 
> > Signed-off-by: Michael Schwingen <michael@schwingen.org>
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 2ef2f5c..9291f48 100644
> Nack,
> 
> I've an error when applying this patch
> fatal: corrupt patch at line 56
> Patch failed at 0014.

Sorry, forgot to mention this - I wnet ahead and updated the
mach-types file. Please rebase your patches against TOT, and your
patch size should go down significantly.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Computers make excellent and efficient servants, but I have  no  wish
to  serve under them. Captain, a starship also runs on loyalty to one
man. And nothing can replace it or him.
	-- Spock, "The Ultimate Computer", stardate 4729.4

[U-Boot-Users] resend #3 [PATCH 1/5]: add AcTux board support (common)

[Michael Schwingen]

On Tue, Jan 15, 2008 at 01:02:15AM +0100, Wolfgang Denk wrote:
> > > diff --git a/MAINTAINERS b/MAINTAINERS
> > > index 2ef2f5c..9291f48 100644
> > Nack,
> > 
> > I've an error when applying this patch
> > fatal: corrupt patch at line 56
> > Patch failed at 0014.
> 
> Sorry, forgot to mention this - I wnet ahead and updated the
> mach-types file. Please rebase your patches against TOT, and your
> patch size should go down significantly.

Thanks - the diff is now around 90k, so I compressed it.

Unless requested, I will not resend the other 4 patches - OK?

Should we (at some future point) modify the Makefiles to auto-generate the
mach-types.h file like Linux does?

Signed-off-by: Michael Schwingen <michael@schwingen.org>

cu
Michael
-------------- next part --------------
A non-text attachment was scrubbed...
Name: actux.diff.bz2
Type: application/octet-stream
Size: 7680 bytes
Desc: not available
Url : http://lists.denx.de/pipermail/u-boot/attachments/20080115/348b1639/attachment.obj 

[U-Boot-Users] resend #3 [PATCH 1/5]: add AcTux board support (common)

[Jean-Christophe PLAGNIOL-VILLARD]

On 09:16 Tue 15 Jan     , Michael Schwingen wrote:
> On Tue, Jan 15, 2008 at 01:02:15AM +0100, Wolfgang Denk wrote:
> > > > diff --git a/MAINTAINERS b/MAINTAINERS
> > > > index 2ef2f5c..9291f48 100644
> > > Nack,
> > > 
> > > I've an error when applying this patch
> > > fatal: corrupt patch at line 56
> > > Patch failed at 0014.
> > 
> > Sorry, forgot to mention this - I wnet ahead and updated the
> > mach-types file. Please rebase your patches against TOT, and your
> > patch size should go down significantly.
> 
> Thanks - the diff is now around 90k, so I compressed it.
> 
> Unless requested, I will not resend the other 4 patches - OK?
> 
> Should we (at some future point) modify the Makefiles to auto-generate the
> mach-types.h file like Linux does?
> 
> Signed-off-by: Michael Schwingen <michael@schwingen.org>
> 
> cu
> Michael

Please wait untill tomorrow to resend your I may have more comment on
it.

Best Regards,
J.


> -------------------------------------------------------------------------
> Check out the new SourceForge.net Marketplace.
> It's the best place to buy or sell services for
> just about anything Open Source.
> http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
> _______________________________________________
> U-Boot-Users mailing list
> U-Boot-Users at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/u-boot-users