Patchwork [U-Boot,14/52] ARM: remove broken "integratorap" board

login
register
mail settings
Submitter Wolfgang Denk
Date July 17, 2011, 10:16 p.m.
Message ID <1310941040-6526-15-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/105128/
State Not Applicable
Delegated to: Albert ARIBAUD
Headers show

Comments

Wolfgang Denk - July 17, 2011, 10:16 p.m.
Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 MAKEALL  |    1 -
 Makefile |    3 +--
 2 files changed, 1 insertions(+), 3 deletions(-)
Linus Walleij - July 17, 2011, 10:46 p.m.
As mentioned I'm assuming maintainership for the integratorap,
patch is on the list since two days or so.

Thanks,
Linus Walleij
Albert ARIBAUD - July 18, 2011, 8:33 a.m.
Hi all,

Le 18/07/2011 00:46, Linus Walleij a écrit :
> As mentioned I'm assuming maintainership for the integratorap,
> patch is on the list since two days or so.

Patch 14/52 marked 'deferred' in patchwork pending inclusion of 
integratorap patches.

Amicalement,
Wolfgang Denk - July 18, 2011, noon
Dear Linus, dear Albert ARIBAUD,

In message <4E23EFE4.8030409@aribaud.net> Albert ARIBAUD wrote:
> 
> Le 18/07/2011 00:46, Linus Walleij a écrit :
> > As mentioned I'm assuming maintainership for the integratorap,
> > patch is on the list since two days or so.
> 
> Patch 14/52 marked 'deferred' in patchwork pending inclusion of 
> integratorap patches.

The situation is more complex here.

The patches that have been submitted jus tfix the immediate compile
problems, but they don't fix the mess we have with the
board/armltd/integrator/split_by_variant.sh script.  Actually nobody
ever bothered to convert these boards to use boards.cfg instead.
And split_by_variant.sh makes it virtually impossible to see which
board is doing what, so I decided to get rid of this alltogether.

Linus, do you see a way to adapt the board(s) you are taking
responibility for to using configuration through bopards.cfg, so we
can get rid of the split_by_variant.sh stuff?

Thanks.

Best regards,

Wolfgang Denk
Linus Walleij - July 18, 2011, 7:33 p.m.
On Mon, Jul 18, 2011 at 2:00 PM, Wolfgang Denk <wd@denx.de> wrote:

> Linus, do you see a way to adapt the board(s) you are taking
> responibility for to using configuration through bopards.cfg, so we
> can get rid of the split_by_variant.sh stuff?

I will try, it doesn't look too hard.

The integrator[ap|cp] are special in that any core module (CM)
can be plugged onto the actual board itself, so the same board
permutes in a number of variants. But I guess I can just give
them all unique names like integratorap_cm920t etc and it'll
just work, I'll hack something up so we can see what it'll look
like.

Thanks,
Linus Walleij
Albert ARIBAUD - Aug. 12, 2011, 1:05 p.m.
Hi Linus, Wolfgang,

On 18/07/2011 21:33, Linus Walleij wrote:
> On Mon, Jul 18, 2011 at 2:00 PM, Wolfgang Denk<wd@denx.de>  wrote:
>
>> Linus, do you see a way to adapt the board(s) you are taking
>> responibility for to using configuration through bopards.cfg, so we
>> can get rid of the split_by_variant.sh stuff?
>
> I will try, it doesn't look too hard.
>
> The integrator[ap|cp] are special in that any core module (CM)
> can be plugged onto the actual board itself, so the same board
> permutes in a number of variants. But I guess I can just give
> them all unique names like integratorap_cm920t etc and it'll
> just work, I'll hack something up so we can see what it'll look
> like.
>
> Thanks,
> Linus Walleij

Boards now build again thanks to Linus' patchset. Therefore I have 
marked this patch 14/52 'Not Applicable'.

Amicalement,

Patch

diff --git a/MAKEALL b/MAKEALL
index 9134c00..f1f1ad3 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -303,7 +303,6 @@  LIST_SA="$(boards_by_cpu sa1100)"
 #########################################################################
 
 LIST_ARM7="		\
-	integratorap	\
 	lpc2292sodimm	\
 	modnet50	\
 	SMN42		\
diff --git a/Makefile b/Makefile
index 760111b..89b3832 100644
--- a/Makefile
+++ b/Makefile
@@ -894,7 +894,6 @@  TNY_A9260_config	:	unconfig
 
 ########################################################################
 ## ARM Integrator boards - see doc/README-integrator for more info.
-integratorap_config	\
 ap_config		\
 ap966_config		\
 ap922_config		\
@@ -1071,7 +1070,7 @@  clean:
 	       $(obj)board/matrix_vision/*/bootscript.img		  \
 	       $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}	  \
 	       $(obj)board/voiceblue/eeprom 				  \
-	       $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds  \
+	       $(obj)board/armltd/integratorcp/u-boot.lds		  \
 	       $(obj)u-boot.lds						  \
 	       $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]
 	@rm -f $(obj)include/bmp_logo.h