July 2011 - U-Boot

[U-Boot] [PATCH v2] integrator: convert to new build system
by Linus Walleij 21 Jul '11

21 Jul '11

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 <linus.walleij(a)linaro.org> --- Changes v1->v2: provide one config file per board variant intead of a plethora. --- 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 diff --git a/MAKEALL b/MAKEALL index 4adaeb8..0292809 100755 --- a/MAKEALL +++ b/MAKEALL @@ -303,14 +303,11 @@ LIST_SA="$(boards_by_cpu sa1100)" ######################################################################### LIST_ARM7=" \ - ap7 \ - ap720t \ armadillo \ B2 \ ep7312 \ evb4510 \ impa7 \ - integratorap \ lpc2292sodimm \ modnet50 \ SMN42 \ @@ -322,17 +319,7 @@ LIST_ARM7=" \ LIST_ARM9=" \ a320evb \ - ap920t \ - ap922_XA10 \ - ap926ejs \ - ap946es \ - ap966 \ aspenite \ - cp920t \ - cp922_XA10 \ - cp926ejs \ - cp946es \ - cp966 \ da830evm \ da850evm \ edb9301 \ @@ -391,18 +378,9 @@ LIST_ARM9=" \ " ######################################################################### -## ARM10 Systems -######################################################################### -LIST_ARM10=" \ - integratorcp \ - cp1026 \ -" - -######################################################################### ## ARM11 Systems ######################################################################### LIST_ARM11=" \ - cp1136 \ omap2420h4 \ apollon \ imx31_litekit \ diff --git a/Makefile b/Makefile index e56fa02..7dc0cf7 100644 --- a/Makefile +++ b/Makefile @@ -892,32 +892,6 @@ TNY_A9260_config : unconfig @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h @$(MKCONFIG) -n $@ -a tny_a9260 arm arm926ejs tny_a9260 calao at91 -######################################################################## -## 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 \ @@ -1073,7 +1047,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] @rm -f $(obj)include/bmp_logo.h diff --git a/arch/arm/cpu/arm720t/cpu.c b/arch/arm/cpu/arm720t/cpu.c index 88c71bf..ff992aa 100644 --- a/arch/arm/cpu/arm720t/cpu.c +++ b/arch/arm/cpu/arm720t/cpu.c @@ -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 diff --git a/board/armltd/integrator/split_by_variant.sh b/board/armltd/integrator/split_by_variant.sh deleted file mode 100755 index 19fc832..0000000 --- a/board/armltd/integrator/split_by_variant.sh +++ /dev/null @@ -1,220 +0,0 @@ -#!/bin/sh - -mkdir -p ${obj}include -mkdir -p ${obj}board/armltd/integrator - -config_file=${obj}include/config.h - -if [ "$1" = "ap" ] -then -# --------------------------------------------------------- -# Set the platform defines -# --------------------------------------------------------- -cat > ${config_file} << _EOF -/* Integrator configuration implied by Makefile target */ -#define CONFIG_INTEGRATOR /* Integrator board */ -#define CONFIG_ARCH_INTEGRATOR 1 /* Integrator/AP */ -_EOF - -# --------------------------------------------------------- -# Set the core module defines according to Core Module -# --------------------------------------------------------- -cpu="arm_intcm" -variant="unknown core module" - -if [ "$2" = "" ] -then - echo "$0:: No parameters - using arm_intcm" -else - case "$2" in - ap7_config) - cpu="arm_intcm" - variant="unported core module CM7TDMI" - ;; - - ap966) - cpu="arm_intcm" - variant="unported core module CM966E-S" - ;; - - ap922_config) - cpu="arm_intcm" - variant="unported core module CM922T" - ;; - - integratorap_config | \ - ap_config) - cpu="arm_intcm" - variant="unspecified core module" - ;; - - ap720t_config) - cpu="arm720t" - echo "#define CONFIG_CM720T 1 /* CPU core is ARM720T */" \ - >> ${config_file} - variant="Core module CM720T" - ;; - - ap922_XA10_config) - cpu="arm_intcm" - variant="unported core module CM922T_XA10" - echo "#define CONFIG_CM922T_XA10 1 /* CPU core is ARM922T_XA10 */" \ - >> ${config_file} - ;; - - ap920t_config) - cpu="arm920t" - variant="Core module CM920T" - echo "#define CONFIG_CM920T 1 /* CPU core is ARM920T */" \ - >> ${config_file} - ;; - - ap926ejs_config) - cpu="arm926ejs" - variant="Core module CM926EJ-S" - echo "#define CONFIG_CM926EJ_S 1 /* CPU core is ARM926EJ-S */" \ - >> ${config_file} - ;; - - ap946es_config) - cpu="arm946es" - variant="Core module CM946E-S" - echo "#define CONFIG_CM946E_S 1 /* CPU core is ARM946E-S */" \ - >> ${config_file} - ;; - - *) - echo "$0:: Unknown core module" - variant="unknown core module" - cpu="arm_intcm" - ;; - - esac -fi - -case "$cpu" in - arm_intcm) - cat >> ${config_file} << _EOF -/* Core module undefined/not ported */ -#define CONFIG_ARM_INTCM 1 -#undef CONFIG_CM_MULTIPLE_SSRAM /* CM may not have multiple SSRAM mapping */ -#undef CONFIG_CM_SPD_DETECT /* CM may not support SPD query */ -#undef CONFIG_CM_REMAP /* CM may not support remapping */ -#undef CONFIG_CM_INIT /* CM may not have initialization reg */ -#undef CONFIG_CM_TCRAM /* CM may not have TCRAM */ -/* May not be processor without cache support */ -#define CONFIG_SYS_ICACHE_OFF 1 -#define CONFIG_SYS_DCACHE_OFF 1 -_EOF - ;; - - arm720t) - cat >> ${config_file} << _EOF -/* May not be processor without cache support */ -#define CONFIG_SYS_ICACHE_OFF 1 -#define CONFIG_SYS_DCACHE_OFF 1 -_EOF - ;; -esac - -else - -# --------------------------------------------------------- -# Set the platform defines -# --------------------------------------------------------- -cat >> ${config_file} << _EOF -/* Integrator configuration implied by Makefile target */ -#define CONFIG_INTEGRATOR /* Integrator board */ -#define CONFIG_ARCH_CINTEGRATOR 1 /* Integrator/CP */ -_EOF - -cpu="arm_intcm" -variant="unknown core module" - -if [ "$2" = "" ] -then - echo "$0:: No parameters - using arm_intcm" -else - case "$2" in - ap966) - cpu="arm_intcm" - variant="unported core module CM966E-S" - ;; - - ap922_config) - cpu="arm_intcm" - variant="unported core module CM922T" - ;; - - integratorcp_config | \ - cp_config) - cpu="arm_intcm" - variant="unspecified core module" - ;; - - cp922_XA10_config) - cpu="arm_intcm" - variant="unported core module CM922T_XA10" - echo "#define CONFIG_CM922T_XA10 1 /* CPU core is ARM922T_XA10 */" \ - >> ${config_file} - ;; - - cp920t_config) - cpu="arm920t" - variant="Core module CM920T" - echo "#define CONFIG_CM920T 1 /* CPU core is ARM920T */" \ - >> ${config_file} - ;; - - cp926ejs_config) - cpu="arm926ejs" - variant="Core module CM926EJ-S" - echo "#define CONFIG_CM926EJ_S 1 /* CPU core is ARM926EJ-S */" \ - >> ${config_file} - ;; - - - cp946es_config) - cpu="arm946es" - variant="Core module CM946E-S" - echo "#define CONFIG_CM946E_S 1 /* CPU core is ARM946E-S */" \ - >> ${config_file} - ;; - - cp1136_config) - cpu="arm1136" - variant="Core module CM1136EJF-S" - echo "#define CONFIG_CM1136EJF_S 1 /* CPU core is ARM1136JF-S */" \ - >> ${config_file} - ;; - - *) - echo "$0:: Unknown core module" - variant="unknown core module" - cpu="arm_intcm" - ;; - - esac - -fi - -if [ "$cpu" = "arm_intcm" ] -then - cat >> ${config_file} << _EOF -/* Core module undefined/not ported */ -#define CONFIG_ARM_INTCM 1 -#undef CONFIG_CM_MULTIPLE_SSRAM /* CM may not have multiple SSRAM mapping */ -#undef CONFIG_CM_SPD_DETECT /* CM may not support SPD query */ -#undef CONFIG_CM_REMAP /* CM may not support remapping */ -#undef CONFIG_CM_INIT /* CM may not have initialization reg */ -#undef CONFIG_CM_TCRAM /* CM may not have TCRAM */ -_EOF -fi - -fi # ap - -# --------------------------------------------------------- -# Complete the configuration -# --------------------------------------------------------- -$MKCONFIG -a -n "${2%%_config}" integrator$1 arm $cpu integrator armltd -echo "Variant: $variant with core $cpu" diff --git a/boards.cfg b/boards.cfg index 4522ea7..0bad037 100644 --- a/boards.cfg +++ b/boards.cfg @@ -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 aspenite arm arm926ejs - Marvell armada100 afeb9260 arm arm926ejs - - at91 at91cap9adk arm arm926ejs - atmel at91 @@ -138,6 +144,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 mx51evk:IMX_CONFIG=board/efikamx/imximage.cfg mx51evk arm armv7 mx51evk freescale mx5 mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 2318ad3..3b983af 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -30,6 +30,9 @@ #ifndef __CONFIG_H #define __CONFIG_H + +#define CONFIG_INTEGRATOR +#define CONFIG_ARCH_INTEGRATOR /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index b0486df..e9b68c6 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -31,6 +31,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_INTEGRATOR +#define CONFIG_ARCH_INTEGRATOR /* * High Level Configuration Options * (easy to change) -- 1.7.6

1 0

[U-Boot] [PATCH] integrator: convert to new build system
by Linus Walleij 21 Jul '11

21 Jul '11

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 <linus.walleij(a)linaro.org> --- This patch goes on top of the previous git pull request and fix the final request from Wolfgang to convert the Integrator boards over to the new build system. --- 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/integratorap_cm720t.h | 1 + include/configs/integratorap_cm920t.h | 1 + include/configs/integratorap_cm926ejs.h | 1 + include/configs/integratorap_cm946es.h | 1 + include/configs/integratorcp.h | 2 + include/configs/integratorcp_cm1136.h | 1 + include/configs/integratorcp_cm920t.h | 1 + include/configs/integratorcp_cm926ejs.h | 1 + include/configs/integratorcp_cm946es.h | 1 + 15 files changed, 21 insertions(+), 274 deletions(-) delete mode 100755 board/armltd/integrator/split_by_variant.sh create mode 100644 include/configs/integratorap_cm720t.h create mode 100644 include/configs/integratorap_cm920t.h create mode 100644 include/configs/integratorap_cm926ejs.h create mode 100644 include/configs/integratorap_cm946es.h create mode 100644 include/configs/integratorcp_cm1136.h create mode 100644 include/configs/integratorcp_cm920t.h create mode 100644 include/configs/integratorcp_cm926ejs.h create mode 100644 include/configs/integratorcp_cm946es.h diff --git a/MAKEALL b/MAKEALL index 4adaeb8..0292809 100755 --- a/MAKEALL +++ b/MAKEALL @@ -303,14 +303,11 @@ LIST_SA="$(boards_by_cpu sa1100)" ######################################################################### LIST_ARM7=" \ - ap7 \ - ap720t \ armadillo \ B2 \ ep7312 \ evb4510 \ impa7 \ - integratorap \ lpc2292sodimm \ modnet50 \ SMN42 \ @@ -322,17 +319,7 @@ LIST_ARM7=" \ LIST_ARM9=" \ a320evb \ - ap920t \ - ap922_XA10 \ - ap926ejs \ - ap946es \ - ap966 \ aspenite \ - cp920t \ - cp922_XA10 \ - cp926ejs \ - cp946es \ - cp966 \ da830evm \ da850evm \ edb9301 \ @@ -391,18 +378,9 @@ LIST_ARM9=" \ " ######################################################################### -## ARM10 Systems -######################################################################### -LIST_ARM10=" \ - integratorcp \ - cp1026 \ -" - -######################################################################### ## ARM11 Systems ######################################################################### LIST_ARM11=" \ - cp1136 \ omap2420h4 \ apollon \ imx31_litekit \ diff --git a/Makefile b/Makefile index e56fa02..7dc0cf7 100644 --- a/Makefile +++ b/Makefile @@ -892,32 +892,6 @@ TNY_A9260_config : unconfig @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h @$(MKCONFIG) -n $@ -a tny_a9260 arm arm926ejs tny_a9260 calao at91 -######################################################################## -## 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 \ @@ -1073,7 +1047,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] @rm -f $(obj)include/bmp_logo.h diff --git a/arch/arm/cpu/arm720t/cpu.c b/arch/arm/cpu/arm720t/cpu.c index 88c71bf..ff992aa 100644 --- a/arch/arm/cpu/arm720t/cpu.c +++ b/arch/arm/cpu/arm720t/cpu.c @@ -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 diff --git a/board/armltd/integrator/split_by_variant.sh b/board/armltd/integrator/split_by_variant.sh deleted file mode 100755 index 19fc832..0000000 --- a/board/armltd/integrator/split_by_variant.sh +++ /dev/null @@ -1,220 +0,0 @@ -#!/bin/sh - -mkdir -p ${obj}include -mkdir -p ${obj}board/armltd/integrator - -config_file=${obj}include/config.h - -if [ "$1" = "ap" ] -then -# --------------------------------------------------------- -# Set the platform defines -# --------------------------------------------------------- -cat > ${config_file} << _EOF -/* Integrator configuration implied by Makefile target */ -#define CONFIG_INTEGRATOR /* Integrator board */ -#define CONFIG_ARCH_INTEGRATOR 1 /* Integrator/AP */ -_EOF - -# --------------------------------------------------------- -# Set the core module defines according to Core Module -# --------------------------------------------------------- -cpu="arm_intcm" -variant="unknown core module" - -if [ "$2" = "" ] -then - echo "$0:: No parameters - using arm_intcm" -else - case "$2" in - ap7_config) - cpu="arm_intcm" - variant="unported core module CM7TDMI" - ;; - - ap966) - cpu="arm_intcm" - variant="unported core module CM966E-S" - ;; - - ap922_config) - cpu="arm_intcm" - variant="unported core module CM922T" - ;; - - integratorap_config | \ - ap_config) - cpu="arm_intcm" - variant="unspecified core module" - ;; - - ap720t_config) - cpu="arm720t" - echo "#define CONFIG_CM720T 1 /* CPU core is ARM720T */" \ - >> ${config_file} - variant="Core module CM720T" - ;; - - ap922_XA10_config) - cpu="arm_intcm" - variant="unported core module CM922T_XA10" - echo "#define CONFIG_CM922T_XA10 1 /* CPU core is ARM922T_XA10 */" \ - >> ${config_file} - ;; - - ap920t_config) - cpu="arm920t" - variant="Core module CM920T" - echo "#define CONFIG_CM920T 1 /* CPU core is ARM920T */" \ - >> ${config_file} - ;; - - ap926ejs_config) - cpu="arm926ejs" - variant="Core module CM926EJ-S" - echo "#define CONFIG_CM926EJ_S 1 /* CPU core is ARM926EJ-S */" \ - >> ${config_file} - ;; - - ap946es_config) - cpu="arm946es" - variant="Core module CM946E-S" - echo "#define CONFIG_CM946E_S 1 /* CPU core is ARM946E-S */" \ - >> ${config_file} - ;; - - *) - echo "$0:: Unknown core module" - variant="unknown core module" - cpu="arm_intcm" - ;; - - esac -fi - -case "$cpu" in - arm_intcm) - cat >> ${config_file} << _EOF -/* Core module undefined/not ported */ -#define CONFIG_ARM_INTCM 1 -#undef CONFIG_CM_MULTIPLE_SSRAM /* CM may not have multiple SSRAM mapping */ -#undef CONFIG_CM_SPD_DETECT /* CM may not support SPD query */ -#undef CONFIG_CM_REMAP /* CM may not support remapping */ -#undef CONFIG_CM_INIT /* CM may not have initialization reg */ -#undef CONFIG_CM_TCRAM /* CM may not have TCRAM */ -/* May not be processor without cache support */ -#define CONFIG_SYS_ICACHE_OFF 1 -#define CONFIG_SYS_DCACHE_OFF 1 -_EOF - ;; - - arm720t) - cat >> ${config_file} << _EOF -/* May not be processor without cache support */ -#define CONFIG_SYS_ICACHE_OFF 1 -#define CONFIG_SYS_DCACHE_OFF 1 -_EOF - ;; -esac - -else - -# --------------------------------------------------------- -# Set the platform defines -# --------------------------------------------------------- -cat >> ${config_file} << _EOF -/* Integrator configuration implied by Makefile target */ -#define CONFIG_INTEGRATOR /* Integrator board */ -#define CONFIG_ARCH_CINTEGRATOR 1 /* Integrator/CP */ -_EOF - -cpu="arm_intcm" -variant="unknown core module" - -if [ "$2" = "" ] -then - echo "$0:: No parameters - using arm_intcm" -else - case "$2" in - ap966) - cpu="arm_intcm" - variant="unported core module CM966E-S" - ;; - - ap922_config) - cpu="arm_intcm" - variant="unported core module CM922T" - ;; - - integratorcp_config | \ - cp_config) - cpu="arm_intcm" - variant="unspecified core module" - ;; - - cp922_XA10_config) - cpu="arm_intcm" - variant="unported core module CM922T_XA10" - echo "#define CONFIG_CM922T_XA10 1 /* CPU core is ARM922T_XA10 */" \ - >> ${config_file} - ;; - - cp920t_config) - cpu="arm920t" - variant="Core module CM920T" - echo "#define CONFIG_CM920T 1 /* CPU core is ARM920T */" \ - >> ${config_file} - ;; - - cp926ejs_config) - cpu="arm926ejs" - variant="Core module CM926EJ-S" - echo "#define CONFIG_CM926EJ_S 1 /* CPU core is ARM926EJ-S */" \ - >> ${config_file} - ;; - - - cp946es_config) - cpu="arm946es" - variant="Core module CM946E-S" - echo "#define CONFIG_CM946E_S 1 /* CPU core is ARM946E-S */" \ - >> ${config_file} - ;; - - cp1136_config) - cpu="arm1136" - variant="Core module CM1136EJF-S" - echo "#define CONFIG_CM1136EJF_S 1 /* CPU core is ARM1136JF-S */" \ - >> ${config_file} - ;; - - *) - echo "$0:: Unknown core module" - variant="unknown core module" - cpu="arm_intcm" - ;; - - esac - -fi - -if [ "$cpu" = "arm_intcm" ] -then - cat >> ${config_file} << _EOF -/* Core module undefined/not ported */ -#define CONFIG_ARM_INTCM 1 -#undef CONFIG_CM_MULTIPLE_SSRAM /* CM may not have multiple SSRAM mapping */ -#undef CONFIG_CM_SPD_DETECT /* CM may not support SPD query */ -#undef CONFIG_CM_REMAP /* CM may not support remapping */ -#undef CONFIG_CM_INIT /* CM may not have initialization reg */ -#undef CONFIG_CM_TCRAM /* CM may not have TCRAM */ -_EOF -fi - -fi # ap - -# --------------------------------------------------------- -# Complete the configuration -# --------------------------------------------------------- -$MKCONFIG -a -n "${2%%_config}" integrator$1 arm $cpu integrator armltd -echo "Variant: $variant with core $cpu" diff --git a/boards.cfg b/boards.cfg index 4522ea7..81a69ad 100644 --- a/boards.cfg +++ b/boards.cfg @@ -35,6 +35,7 @@ # Target ARCH CPU Board name Vendor SoC Options ########################################################################################################### +integratorcp_cm1136 arm arm1136 integrator armltd 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 lpc2292sodimm arm arm720t - - lpc2292 SMN42 arm arm720t - siemens lpc2292 evb4510 arm arm720t - - s3c4510b +integratorap_cm920t arm arm920t integrator armltd +integratorcp_cm920t arm arm920t integrator armltd 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 +integratorcp_cm926ejs arm arm926ejs integrator armltd aspenite arm arm926ejs - Marvell armada100 afeb9260 arm arm926ejs - - at91 at91cap9adk arm arm926ejs - atmel at91 @@ -138,6 +144,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 +integratorcp_cm946es arm arm946es integrator armltd ca9x4_ct_vxp arm armv7 vexpress armltd efikamx arm armv7 efikamx - mx5 mx51evk:IMX_CONFIG=board/efikamx/imximage.cfg mx51evk arm armv7 mx51evk freescale mx5 mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 7b8aea6..e89772d 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -30,6 +30,9 @@ #ifndef __CONFIG_H #define __CONFIG_H + +#define CONFIG_INTEGRATOR +#define CONFIG_ARCH_INTEGRATOR /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/integratorap_cm720t.h b/include/configs/integratorap_cm720t.h new file mode 100644 index 0000000..523ebbe --- /dev/null +++ b/include/configs/integratorap_cm720t.h @@ -0,0 +1 @@ +#include "integratorap.h" diff --git a/include/configs/integratorap_cm920t.h b/include/configs/integratorap_cm920t.h new file mode 100644 index 0000000..523ebbe --- /dev/null +++ b/include/configs/integratorap_cm920t.h @@ -0,0 +1 @@ +#include "integratorap.h" diff --git a/include/configs/integratorap_cm926ejs.h b/include/configs/integratorap_cm926ejs.h new file mode 100644 index 0000000..523ebbe --- /dev/null +++ b/include/configs/integratorap_cm926ejs.h @@ -0,0 +1 @@ +#include "integratorap.h" diff --git a/include/configs/integratorap_cm946es.h b/include/configs/integratorap_cm946es.h new file mode 100644 index 0000000..523ebbe --- /dev/null +++ b/include/configs/integratorap_cm946es.h @@ -0,0 +1 @@ +#include "integratorap.h" diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 2c8ca2d..210bc9d 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -31,6 +31,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_INTEGRATOR +#define CONFIG_ARCH_INTEGRATOR /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/integratorcp_cm1136.h b/include/configs/integratorcp_cm1136.h new file mode 100644 index 0000000..523ebbe --- /dev/null +++ b/include/configs/integratorcp_cm1136.h @@ -0,0 +1 @@ +#include "integratorap.h" diff --git a/include/configs/integratorcp_cm920t.h b/include/configs/integratorcp_cm920t.h new file mode 100644 index 0000000..523ebbe --- /dev/null +++ b/include/configs/integratorcp_cm920t.h @@ -0,0 +1 @@ +#include "integratorap.h" diff --git a/include/configs/integratorcp_cm926ejs.h b/include/configs/integratorcp_cm926ejs.h new file mode 100644 index 0000000..523ebbe --- /dev/null +++ b/include/configs/integratorcp_cm926ejs.h @@ -0,0 +1 @@ +#include "integratorap.h" diff --git a/include/configs/integratorcp_cm946es.h b/include/configs/integratorcp_cm946es.h new file mode 100644 index 0000000..523ebbe --- /dev/null +++ b/include/configs/integratorcp_cm946es.h @@ -0,0 +1 @@ +#include "integratorap.h" -- 1.7.6

2 4

Re: [U-Boot] [PATCH 1/2] gpio: Add GPIO driver framework for Marvell SoCs
by Ajay Bhargav 21 Jul '11

21 Jul '11

----- "Lei Wen" <adrian.wenl(a)gmail.com> wrote: > Hi Ajay, > > Please put this get_gpio_base into arch's self directory, since > different soc may have > different number of banks. For example, mmp3 has 6 banks. > > Best regards, > Lei > was out of my mind... I think having a macro for this would be better coz individual arch can have their own macros. Anymore comments? Regards, Ajay Bhargav

1 0

[U-Boot] SAUDARA
by Cindy 20 Jul '11

20 Jul '11

-- Saya anak tunggal dari orang tua saya. Apa yang terjadi sekarang? Orang tua saya telah meninggal karena kecelakaan mobil. Ayah saya ternyata telah menikah dua istri. Ibu dari Indonesia. Kami bahagia hidup bersama di Pulau Sumatra sebelum gempa bumi. Setelah gempa, kami memutuskan untuk pindah ke negaranya , Inggris. Ini adalah pilihan ayah saya. Ternyata dia benar-benar ada istri lain di Inggris. Sejak kami tiba di London, masalah datang pada setiap hari. Ayah saya dan ibu saya lalu meninggal pada kecelakaan motor. Sekarang ibu tiri saya memperlakukan saya dengan kejam. Ayah saya memiliki uang yang disimpan dengan nama saya di sini di Inggris. Menurut dia, uang itu bisa diberikan untuk saya hanya ketika saya menikah atau dengan saudara saya di Indonesia. Saya butuh informasi Anda sekarang. Anda bantu saya sebagai adik saya atau suami saya sehingga dana bisa dilkeluarkan. Saya berjuang di neraka hidup untuk makan dan menjadi manusia. Tolong bantu saya karena saya di dalam perang kehidupan yang besar dalam bentuk emosional dan kehidupan. SEKARANG untuk membantu saya. Dari seorang yang butuh bantuan. Cindy

1 0

[U-Boot] POST - Hardware Diagnose Commands methodologies
by Vega, Ferdinand (ESEA MESA) 20 Jul '11

20 Jul '11

Hi, I would like to know if there's any methodology or requirement documentation available for the POST Hardware Diagnose Commands from U-Boot, for microprocessor MPC8378? Thanks, Ferdinand Vega Systems Engineer II (ESEA MESA) Honeywell Aerospace San Antonio Industrial Park Road #110 North Km. 5.9 Aguadilla, PR 00604 ( 787-658-2265 * <mailto:Yanira.Vega@Honeywell.com> Ferdinand.Vega(a)Honeywell.com This e-mail message and any attachments are for the use of the intended recipient(s) and may be controlled by U.S. export control laws. Any unauthorized review, use, disclosure or distribution of this communication in whole or in part without the express written consent of Honeywell, or the U.S. Government as required, is prohibited. If you are not the intended recipient(s), please contact the sender by reply e-mail and destroy the original message and any copies of the message as well as any attachment(s) to the original message. P We have a responsibility to the environment. Before printing this e-mail or any other document, let's ask ourselves whether we really need a hard copy.

2 1

[U-Boot] [PATCH v2 0/3] improve build for UNIX like non GNU platforms
by Jeroen Hofstee 20 Jul '11

20 Jul '11

Changes for v2: - updated mkconfig patch to make minimal changes and changed commit message, since it now relies on GNU and BSD extensions. Jeroen Hofstee (3): include/compiler.h: typedef ulong for FreeBSD rules.mk: replace GNU specific \w with POSIX equivalant mkconfig: also create CONFIG defines with BSD sed -- 1.7.5.4

1 0

[U-Boot] [RFC] gpio command: return value on write, additional actions
by Andreas Pretzsch 20 Jul '11

20 Jul '11

As of today (2011.06), the generic gpio command (common/cmd_gpio.c) gpio <input|set|clear|toggle> <port><pin> - input/set/clear/toggle the specified pin (e.g. PF10) always returns the value read or set. While this is sensible for read (input) and maybe (questionable) for toggle, I don't see an usage for write (set/clear). Also, this leads to unexpected side effects with complex constructs, e.g. consider this environment: setA=gpio set PF1 setB=gpio clear PF2 setAB_separate=env run setA ; env run setB setAB_concatenated=env run setA setB setBA_concatenated=env run setB setA While executing "setAB_separate" and "setBA_concatenated" work as expected, "setAB_concatenated" will only run setA, but not setB, as setA "failed" (ret=1). [1] The same would apply to e.g. && constructs. As it works this way in the release and hence the behaviour is essentially fixed, changing the return value is probably not an option. OTOH, the breakage here might be negligible, at least for set/clear. But in any case, it should be documented. Beside this, I'd like to extend the gpio command with the additional actions "0" and "1", always returning 0 (given the write was successful): gpio <input|set|clear|toggle|0|1> <port><pin> As a nice benefit, it would strip down constructs like if test ${LED_x} -eq 0;then gpio set PF1;else gpio clear PF1;fi to a simple "gpio ${LED_x} PF1". Any comments or objections before I submit a patch ? [1] http://www.denx.de/wiki/DULG/CommandLineParsing "General rules" -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521573 89073 Ulm, Germany email: apr(a)cn-eng.de

4 10

[U-Boot] Get these great inspirational books and songs
by Great Promos Inc 20 Jul '11

20 Jul '11

Hi, The determination to explore new ways of doing things, especially by reading important life changing books, easily brings about a sustainable progressive and successful life ------G.P.I. Among these great highly motivational and inspirational books are;- WAYS OF ATTAINING BUSINESS SUCCESSES Achieving True Love And Lasting Relationship DISCOVERING SECRETS OF SUCCESS AND RICHES OVERCOMING LIFE DIFFICULTIES IMPOSSIBILITY TO POSSIBILITY RELATIONSHIPS THAT WORK CAREER DEVELOPMENT AND MANAGEMENT IDEAS THAT CREATE WEALTH TACKLING PROBLEMS IN RELATIONSHIPS GREAT SUCCESS HABITS Written by the renowned multi-talented writer, Ambrose Nwaopara Jr., are available online for the development of all categories of people. Follow Ambrose at www.myspace.com/4ambrose. At the upper left general information section, click on the website link to down load the new e-book version of the books. For the print version, go to: www.wordclay.com , click on bookstore and search for Ambrose Nwaopara Jr. books or visit: www.amazon.com and search. The books are also available in India at: www.flipkart.com Make that choice today for a better future and try to be part of the great life changing benefits of the books. Also available, are the highly inspirational songs from the 2011 album Arise and shine, which can be found at: http://www.cdbaby.com/cd/chidiambrose1 or http://www.amazon.co.uk/Chidi-Ambrose/dp/B004I03AAK or http://itunes.apple.com/us/album/arise-and-shine/id413225675 Hurry now and get the promotional copies. Best wishes and have a great well fulfilled and lovely life. Message Powered by: Great Promos Inc. Please note that this very important life improvement message is for public good and not intended as a spam. Any one can take advantage of the benefits of the message, or may be kindly ignored for anyone that may not be interested.

1 0

[U-Boot] We Have Been Trying To Reach You!!!
by rpleal＠uach.mx 20 Jul '11

20 Jul '11

Nokia has Approved you of GBP £750,000.00. For claim contact: Mr. David Bassett

1 0

[U-Boot] [PATCH]Uboot tool Makefile patch for Mac OSX Snow leopard
by sungyeon 20 Jul '11

20 Jul '11

diff --git a/tools/Makefile b/tools/Makefile index 623f908..f794ef1 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -96,11 +96,11 @@ OBJ_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1.o #endif # Flattened device tree objects -LIBFDT_OBJ_FILES-y += fdt.o -LIBFDT_OBJ_FILES-y += fdt_ro.o -LIBFDT_OBJ_FILES-y += fdt_rw.o -LIBFDT_OBJ_FILES-y += fdt_strerror.o -LIBFDT_OBJ_FILES-y += fdt_wip.o +LIBFDT_OBJ_FILES-y += lib/libfdt/fdt.o +LIBFDT_OBJ_FILES-y += lib/libfdt/fdt_ro.o +LIBFDT_OBJ_FILES-y += lib/libfdt/fdt_rw.o +LIBFDT_OBJ_FILES-y += lib/libfdt/fdt_strerror.o +LIBFDT_OBJ_FILES-y += lib/libfdt/fdt_wip.o # Generated LCD/video logo LOGO_H = $(OBJTREE)/include/bmp_logo.h @@ -129,7 +129,7 @@ endif # now $(obj) is defined HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c)) HOSTSRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c)) -HOSTSRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) +HOSTSRCS += $(addprefix $(SRCTREE)/,$(LIBFDT_OBJ_FILES-y:.o=.c)) BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y))) LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y)) @@ -185,7 +185,11 @@ $(obj)mkimage$(SFX): $(obj)crc32.o \ $(obj)mkimage.o \ $(obj)os_support.o \ $(obj)sha1.o \ - $(LIBFDT_OBJS) + $(obj)fdt.o \ + $(obj)fdt_ro.o\ + $(obj)fdt_rw.o\ + $(obj)fdt_strerror.o\ + $(obj)fdt_wip.o $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ $(HOSTSTRIP) $@ @@ -201,13 +205,13 @@ $(obj)ubsha1$(SFX): $(obj)os_support.o $(obj)sha1.o $(obj)ubsha1.o $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ # Some of the tool objects need to be accessed from outside the tools directory -$(obj)%.o: $(SRCTREE)/common/%.c +$(subst common/,,$(filter common/%,$(EXT_OBJ_FILES-y))): $(obj)%.o: $(SRCTREE)/common/%.c $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< -$(obj)%.o: $(SRCTREE)/lib/%.c +$(subst lib/,,$(filter lib/%,$(EXT_OBJ_FILES-y))): $(obj)%.o: $(SRCTREE)/lib/%.c $(HOSTCC) -g $(HOSTCFLAGS) -c -o $@ $< -$(obj)%.o: $(SRCTREE)/lib/libfdt/%.c +$(subst lib/libfdt/,,$(filter lib/libfdt/%,$(LIBFDT_OBJ_FILES-y))): $(obj)%.o: $(SRCTREE)/lib/libfdt/%.c $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< subdirs:

4 4