Skip to contentSkip to conversation

: add AcTux board support (common)

PATCH NAK Michael Schwingen 4 participants 9 messages Jan 12, 2008 – Jan 15, 2008 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 : add AcTux board support (common)

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

MAINTAINERS +7 -0
index 2ef2f5c..9291f48 100644
@@ -536,6 +536,13 @@ Alex Z?pke <[email protected]>
 	lart			SA1100
 	dnp1110			SA1110
 
+Michael Schwingen <[email protected]>
+
+	actux1			xscale
+	actux2			xscale
+	actux3			xscale
+	actux4			xscale
+
 #########################################################################
 # x86 Systems:								#
 #									#
MAKEALL +4 -0
index ebc5a22..7e39b2c 100755
@@ -516,4 +516,8 @@ LIST_ixp="		\
 	ixdpg425	\
 	pdnb3		\
 	scpu		\
+	actux1		\
+	actux2		\
+	actux3		\
+	actux4		\
 "
Makefile +0 -0
index 1983ca0..10ab3df 100644
@@ -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

board/actux3/Makefile new file +50 -0

50 lines not on this page · raw message

include/asm-arm/mach-types.h +4 -0
index ab19047..01bfecb 100644
@@ -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
#1 lore raw

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

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

MAINTAINERS +7 -0
index 2ef2f5c..9291f48 100644
@@ -536,6 +536,13 @@ Alex Z?pke <[email protected]>
 	lart			SA1100
 	dnp1110			SA1110
 
+Michael Schwingen <[email protected]>
+
+	actux1			xscale
+	actux2			xscale
+	actux3			xscale
+	actux4			xscale
+
 #########################################################################
 # x86 Systems:								#
 #									#
MAKEALL +4 -0
index ebc5a22..7e39b2c 100755
@@ -516,6 +516,10 @@ LIST_ixp="		\
 	ixdpg425	\
 	pdnb3		\
 	scpu		\
+	actux1		\
+	actux2		\
+	actux3		\
+	actux4		\
 "
 
 
Makefile +12 -0
index 1983ca0..10ab3df 100644
@@ -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
 
include/asm-arm/mach-types.h +4 -0
index ab19047..01bfecb 100644
@@ -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
#2 lore raw

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

MAKEALL LIST_ixp=3D" \ · line 522

Quoted 13 lines · In message <[email protected]> you wrote:
MAKEALL +4 -0
index ebc5a22..7e39b2c 100755
@@ -516,6 +516,10 @@ LIST_ixp=3D"		\
 	ixdpg425	\
 	pdnb3		\
 	scpu		\
+	actux1		\
+	actux2		\
+	actux3		\
+	actux4		\

Please don't append, but keep lists sorted.

Quoted 13 lines
Makefile +4 -0
index 1983ca0..10ab3df 100644
@@ -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

Makefile ixdp425_config : unconfig · line 2447

Quoted 10 lines
Makefile +8 -0
+	@$(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.

include/asm-arm/mach-types.h extern unsigned int __machine_arch_type; · line 748

Quoted 12 lines
include/asm-arm/mach-types.h +4 -0
index ab19047..01bfecb 100644
@@ -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

Signature · 4 lines
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.
#3 lore raw

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

Quoted 18 lines · Wolfgang Denk

MAKEALL LIST_ixp=3D" \ · line 523

Quoted 13 lines · In message <[email protected]> you wrote:
MAKEALL +4 -0
index ebc5a22..7e39b2c 100755
@@ -516,6 +516,10 @@ LIST_ixp=3D"		\
 	ixdpg425	\
 	pdnb3		\
 	scpu		\
+	actux1		\
+	actux2		\
+	actux3		\
+	actux4		\
 

Please don't append, but keep lists sorted.

Will do.

Quoted 8 lines
Quoted 8 lines
include/asm-arm/mach-types.h +0 -0
index ab19047..01bfecb 100644
@@ -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
Quoted 9 lines

include/asm-arm/mach-types.h extern unsigned int __machine_arch_type; · line 749

Quoted 5 lines
include/asm-arm/mach-types.h +4 -0
+#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

#4 lore raw

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

In reply to 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

MAINTAINERS +7 -0
index 2ef2f5c..9291f48 100644
@@ -536,6 +536,13 @@ Alex Z?pke <[email protected]>
 	lart			SA1100
 	dnp1110			SA1110
 
+Michael Schwingen <[email protected]>
+
+	actux1			xscale
+	actux2			xscale
+	actux3			xscale
+	actux4			xscale
+
 #########################################################################
 # x86 Systems:								#
 #									#
MAKEALL +4 -0
index ebc5a22..a058869 100755
@@ -512,6 +512,10 @@ LIST_pxa="		\
 "
 
 LIST_ixp="		\
+	actux1		\
+	actux2		\
+	actux3		\
+	actux4		\
 	ixdp425		\
 	ixdpg425	\
 	pdnb3		\
Makefile +12 -0
index 1983ca0..9a4d5c9 100644
@@ -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
include/asm-arm/mach-types.h +4 -0
index ab19047..01bfecb 100644
@@ -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
#5 lore raw

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

MAINTAINERS

Quoted 21 lines · 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

MAINTAINERS +0 -0
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

#6 lore raw

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

Quoted 12 lines · In message <[email protected]> you wrote:
Quoted 12 lines

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

Quoted 7 lines

MAINTAINERS

Quoted 2 lines
MAINTAINERS +0 -0
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

Signature · 7 lines
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
#7 lore raw

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

Quoted 11 lines · Wolfgang Denk
Quoted 7 lines

MAINTAINERS

Quoted 2 lines
MAINTAINERS +0 -0
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?

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

#8 lore raw

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

Quoted 17 lines · Michael Schwingen
Quoted 11 lines · Wolfgang Denk
Quoted 7 lines

MAINTAINERS

Quoted 2 lines
MAINTAINERS +0 -0
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?

Quoted 7 lines

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

cu
Michael

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

Best Regards,
J.

Quoted 9 lines

-------------------------------------------------------------------------
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