Skip to contentSkip to conversation

integrator: convert to new build system

PATCH New Linus Walleij 2 participants 3 messages Aug 12, 2011

Subsystems (2)
Arm (32-bit) Kbuild
lore
Share & tools
lore

Linus Walleij

author
#0 lore raw

PATCH v6 8/8 integrator: convert to new build system

This deletes the integrator split_by_variant.sh script and defines a number of unique board types for the core modules that are meaningful to support for the Integrator AP/CP, i.e. the ones that did not just say "unsupported core module" in split_by_variant.sh. If more core modules need to be supported they are easy to add.

We delete all the old cruft in Makefile and MAKEALL that was working around the old way of building boards. We create a unique config file per board to satisfy the build system, but they are just oneliners that include the existing integratorap.h and integratorcp.h configs.

Signed-off-by Linus Walleij <[email protected]>

---
Changes v5->v6:
- Rebased to Albert's u-boot-arm tree as requested per message <[email protected]>
- So rebased on top of commit b9a699da8123efa9f2d15290a6b3a2854e9fab84
"arm: lib: memcpy: Do not copy to same address" which is the HEAD of u-boot-arm as of writing
- NO other changes

---
 MAKEALL                                     |   22 ---
 Makefile                                    |   27 ----
 arch/arm/cpu/arm720t/cpu.c                  |    5 -
 board/armltd/integrator/split_by_variant.sh |  220 ---------------------------
 boards.cfg                                  |    8 +
 include/configs/integratorap.h              |    3 +
 include/configs/integratorcp.h              |    2 +
 7 files changed, 13 insertions(+), 274 deletions(-)
 delete mode 100755 board/armltd/integrator/split_by_variant.sh
MAKEALL +0 -22
index 0cb51f7..26685fb 100755
@@ -301,14 +301,11 @@ LIST_SA="$(boards_by_cpu sa1100)"
 #########################################################################
 
 LIST_ARM7="		\
-	ap7		\
-	ap720t		\
 	armadillo	\
 	B2		\
 	ep7312		\
 	evb4510		\
 	impa7		\
-	integratorap	\
 	lpc2292sodimm	\
 	modnet50	\
 	SMN42		\

@@ -320,17 +317,7 @@ LIST_ARM7="		\
 
 LIST_ARM9="			\
 	a320evb			\
-	ap920t			\
-	ap922_XA10		\
-	ap926ejs		\
-	ap946es			\
-	ap966			\
 	aspenite		\
-	cp920t			\
-	cp922_XA10		\
-	cp926ejs		\
-	cp946es			\
-	cp966			\
 	da830evm		\
 	da850evm		\
 	edb9301			\

@@ -389,18 +376,9 @@ LIST_ARM9="			\
 "
 
 #########################################################################
-## ARM10 Systems
-#########################################################################
-LIST_ARM10="		\
-	integratorcp	\
-	cp1026		\
-"
-
-#########################################################################
 ## ARM11 Systems
 #########################################################################
 LIST_ARM11="			\
-	cp1136			\
 	omap2420h4		\
 	apollon			\
 	imx31_litekit		\
Makefile +0 -27
index 553382f..676dc29 100644
@@ -798,32 +798,6 @@ M5485HFE_config :	unconfig
 # ARM
 #========================================================================
 
-########################################################################
-## ARM Integrator boards - see doc/README-integrator for more info.
-integratorap_config	\
-ap_config		\
-ap966_config		\
-ap922_config		\
-ap922_XA10_config	\
-ap7_config		\
-ap720t_config		\
-ap920t_config		\
-ap926ejs_config		\
-ap946es_config: unconfig
-	@board/armltd/integrator/split_by_variant.sh ap $@
-
-integratorcp_config	\
-cp_config		\
-cp920t_config		\
-cp926ejs_config		\
-cp946es_config		\
-cp1136_config		\
-cp966_config		\
-cp922_config		\
-cp922_XA10_config	\
-cp1026_config: unconfig
-	@board/armltd/integrator/split_by_variant.sh cp $@
-
 xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1))))
 
 omap1610inn_config \

@@ -970,7 +944,6 @@ 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)u-boot.lds						  \
 	       $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]	  \
 	       $(obj)arch/blackfin/cpu/init.{lds,elf}
arch/arm/cpu/arm720t/cpu.c +0 -5
index 88c71bf..ff992aa 100644
@@ -82,9 +82,4 @@ static void cache_flush (void)
 
 	asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (i));
 }
-#elif defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR)
-	/* No specific cache setup for IntegratorAP/CM720T as yet */
-	void icache_enable (void)
-	{
-	}
 #endif
board/armltd/integrator/split_by_variant.sh deleted +0 -220

220 lines not on this page · raw message

boards.cfg +8 -0
index c29d583..c31114d 100644
@@ -35,6 +35,7 @@
 # Target                     ARCH        CPU         Board name          Vendor	        SoC         Options
 ###########################################################################################################
 
+integratorcp_cm1136          arm         arm1136     integrator          armltd         -           integratorcp
 qong                         arm         arm1136     -                   davedenx       mx31
 mx31ads                      arm         arm1136     -                   freescale      mx31
 imx31_litekit                arm         arm1136     -                   logicpd        mx31

@@ -45,9 +46,12 @@ armadillo                    arm         arm720t
 ep7312                       arm         arm720t
 impa7                        arm         arm720t
 modnet50                     arm         arm720t
+integratorap_cm720t          arm         arm720t     integrator          armltd         -           integratorap
 lpc2292sodimm                arm         arm720t     -                   -              lpc2292
 SMN42                        arm         arm720t     -                   siemens        lpc2292
 evb4510                      arm         arm720t     -                   -              s3c4510b
+integratorap_cm920t          arm         arm920t     integrator          armltd         -           integratorap
+integratorcp_cm920t          arm         arm920t     integrator          armltd         -           integratorcp
 a320evb                      arm         arm920t     -                   faraday        a320
 at91rm9200ek                 arm         arm920t     at91rm9200ek        atmel          at91        at91rm9200ek
 at91rm9200ek_ram             arm         arm920t     at91rm9200ek        atmel          at91        at91rm9200ek:RAMBOOT

@@ -71,6 +75,8 @@ smdk2410                     arm         arm920t     -                   samsung
 netstar                      arm         arm925t
 voiceblue                    arm         arm925t
 omap1510inn                  arm         arm925t     -                   ti
+integratorap_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorap
+integratorcp_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorcp
 versatileqemu                arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_QEMU
 versatilepb                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_PB
 versatileab                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_AB

@@ -164,6 +170,8 @@ nhk8815_onenand              arm         arm926ejs   nhk8815             st
 omap5912osk                  arm         arm926ejs   -                   ti             omap
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
 dkb			     arm         arm926ejs   -                   Marvell        pantheon
+integratorap_cm946es         arm         arm946es    integrator          armltd         -               integratorap
+integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp
 ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
 efikamx                      arm         armv7       efikamx             -              mx5		efikamx:IMX_CONFIG=board/efikamx/imximage.cfg
 mx51evk                      arm         armv7       mx51evk             freescale      mx5		mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg
include/configs/integratorap.h +3 -0
index 2318ad3..3b983af 100644
@@ -30,6 +30,9 @@
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
+
+#define CONFIG_INTEGRATOR
+#define CONFIG_ARCH_INTEGRATOR
 /*
  * High Level Configuration Options
  * (easy to change)
include/configs/integratorcp.h +2 -0
index b0486df..e9b68c6 100644
@@ -31,6 +31,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define CONFIG_INTEGRATOR
+#define CONFIG_ARCH_INTEGRATOR
 /*
  * High Level Configuration Options
  * (easy to change)
Signature · 1 line
1.7.6
#1 lore raw

PATCH v6 8/8 integrator: convert to new build system

Hi Linus,

Quoted 14 lines · Linus Walleij

This deletes the integrator split_by_variant.sh script and defines a number of unique board types for the core modules that are meaningful to support for the Integrator AP/CP, i.e. the ones that did not just say "unsupported core module" in split_by_variant.sh. If more core modules need to be supported they are easy to add.

We delete all the old cruft in Makefile and MAKEALL that was working around the old way of building boards. We create a unique config file per board to satisfy the build system, but they are just oneliners that include the existing integratorap.h and integratorcp.h configs.

Signed-off-by Linus Walleij<[email protected]>
Quoted 9 lines

---
Changes v5->v6:
- Rebased to Albert's u-boot-arm tree as requested per message <[email protected]>
- So rebased on top of commit b9a699da8123efa9f2d15290a6b3a2854e9fab84
"arm: lib: memcpy: Do not copy to same address" which is the HEAD of u-boot-arm as of writing
- NO other changes

Just a side and general note: as tiring as it may seem, people, please always keep the full history in every patch version, so that anyone can tell what was done and why, without having to go back to mails that they may not have in their inbox any more (or never had at all).

That being said, and hoping that Wolfgang's holidays will make him forgive me when he comes back :), I'll accept the history above as it is --but only because because this new patch is at my sole request and because this will allow applying half a dozen patches, so:

Applied after patches 2 to 7 (but not 1) of V4 series to u-boot-arm/master, thanks!

Amicalement,

Signature · 1 line
Albert.
author
#2 lore raw

PATCH v6 8/8 integrator: convert to new build system

Quoted 4 lines · Albert ARIBAUD

Just a side and general note: as tiring as it may seem, people, please always keep the full history in every patch version, so that anyone can tell what was done and why, without having to go back to mails that they may not have in their inbox any more (or never had at all).

OK I will make sure to do that in the future!

Quoted 2 lines

Applied after patches 2 to 7 (but not 1) of V4 series to u-boot-arm/master, thanks!

Thanks Albert!
Linus Walleij