July 2011 - U-Boot

Re: [U-Boot] i.MX51: FEC: Cache coherency problem?
by J. William Campbell 23 Jul '11

23 Jul '11

On 7/20/2011 7:35 AM, Albert ARIBAUD wrote: > Le 20/07/2011 16:01, J. William Campbell a écrit : >> On 7/20/2011 6:02 AM, Albert ARIBAUD wrote: >>> Le 19/07/2011 22:11, J. William Campbell a écrit : >>> >>>> If this is true, then it means that the cache is of type write-back >>>> (as >>>> opposed to write-thru). From a (very brief) look at the arm7 >>>> manuals, it >>>> appears that both types of cache may be present in the cpu. Do you >>>> know >>>> how this operates? >>> Usually, copyback (rather than writeback) and writethough are modes of >>> operation, not cache types. >> Hi Albert, >> One some CPUs both cache modes are available. On many other CPUs (I >> would guess most), you have one fixed mode available, but not both. I >> have always seen the two modes described as write-back and >> write-through, but I am sure we are talking about the same things. > > We are. Copy-back is another name for write-back, not used by ARM but > by some others. > >> The >> examples that have both modes that I am familiar with have the mode as a >> "global" setting. It is not controlled by bits in the TLB or anything >> like that. How does it work on ARM? Is it fixed, globally, globally >> controlled, or controlled by memory management? > > Well, it's a bit complicated, because it depends on the architecture > version *and* implementation -- ARM themselves do not mandate things, > and it is up to the SoC designer to specify what cache they want and > what mode it supports, both at L1 and L2, in their specific instance > of ARM cores. And yes, you can have memory areas that are write-back > and others that are write-through in the same system. > >> If it is controlled by memory management, it looks to me like lots of >> problems could be avoided by operating with input type buffers set as >> write-through. One probably isn't going to be writing to input buffers >> much under program control anyway, so the performance loss should be >> minimal. This gets rid of the alignment restrictions on these buffers >> but not the invalidate/flush requirements. > > There's not much you can do about alignment issues except align to > cache line boundaries. > >> However, if memory management >> is required to set the cache mode, it might be best to operate with the >> buffers and descriptors un-cached. That gets rid of the flush/invalidate >> requirement at the expense of slowing down copying from read buffers. > > That makes 'best' a subjective choice, doesn't it? :) Hi All, Yes,it probably depends on the usage. > >> Probably a reasonable price to pay for the associated simplicity. > > Others would say that spending some time setting up alignments and > flushes and invalidates is a reasonable price to pay for increased > performance... That's an open debate where no solution is The Right > One(tm). > > For instance, consider the TFTP image reading. People would like the > image to end up in cached memory because we'll do some checksumming on > it before we give it control, and having it cached makes this step > quite faster; but we'll lose that if we put it in non-cached memory > because it comes through the Ethernet controller's DMA; and it would > be worse to receive packets in non-cached memory only to move their > contents into cached memory later on. > > I think properly aligning descriptors and buffers is enough to avoid > the mixed flush/invalidate line issue, and wisely putting instruction > barriers should be enough to get the added performance of cache > without too much of the hassle of memory management. I am pretty sure that all the drivers read the input data into intermediate buffers in all cases. There is no practical way to be sure the next packet received is the "right one" for the tftp. Plus there are headers involved, and furthermore there is no way to ensure that a tftp destination is located on a sector boundary. In short, you are going to copy from an input buffer to a destination. However, it is still correct that copying from an non-cached area is slower than from cached areas, because of burst reads vs. individual reads. However, I doubt that the u-boot user can tell the difference, as the network latency will far exceed the difference in copy time. The question is, which is easier to do, and that is probably a matter of opinion. However, it is safe to say that so far a cached solution has eluded us. That may be changing, but it would still be nice to know how to allocate a section of un-cached RAM in the ARM processor, in so far as the question has a single answer! That would allow easy portability of drivers that do not know about caches, of which there seems to be many. Best Regards, Bill Campbell > >> Best Regards, >> Bill Campbell > > Amicalement,

3 3

[U-Boot] The Fund USD $ 30.500.000,00
by Honore 23 Jul '11

23 Jul '11

-- -- Dear, I am Miss Honore Desire Tagro 15 year old girl, As you might have read or know from the world news about the political crisis of my country cote d'Ivoire which takes the life of some many people. During this time of political crisis i lost my father Desire Tagro, who was an ex-interior minister in president Gbagbo's government. In the below site you will found more news about my father death: http://english.peopledaily.com.cn/90001/90777/90855/7349372.html http://www.afriqueavenir.org/en/2011/04/13/gbagbo-minister-dies-from-shrapn… Though my father was very rich, he was never generous, he was always hostile to people and only focused on political affair as that was the only thing he cared for. though he was also having his on personal business which he was dealing in GOLD BUSINESS in ghana country. But now I regret all this as I now know that there is more to life than just wanting to have or make all the money in the world. Since his death I decided to relocate from this country because my life is no longer safe and the reigning goverment member are killing the out going government member and their family, as i am talking with you now i am hiding. My Later father has a fund amount of $ 30.500.000.00 (Thirty Millions Five hundred thousand United state Dollars) which he deposited in my own name as the owner of the fund in a bank here in country but with a clause that the fund will be transfer out of the country for a business purpose. While my later father has a gold dust of about 225KG in a firm company. My problem now is i do not know anyone who is willing to grant me his or her help in other for me to relocate to his or her country with the fund of $ 30.500.000.00 (Thirty Millions Five hundred thousand United state Dollars). Presently,the fund is still with the Bank and the Gold is still in the firm here, But Recently I heard a long dicussion with the bank director about my later father fund that is still under their custody and the bank director told me that fund is ready to be transfer out of the country whenever i present someone from oversea to the bank. I heard a long dicussion with the bank director today about my later father fund that is still under their custody and the bank director told me that there are two possible way in which the funds can be transfer;the fund is for the bank to put the fund of the sum of USD $ 30.500.000.00 (Thirty Millions Five hundred thousand United state Dollars) to a ATM visa and send the ATM visa card to you in your country in other for you to withdrew sum of $25000 each day from the visa. while the other possible way is a bank to bank transfer. Be it that my late father has deposited the fund in the bank as an foreign investment fund and now i am seeking for a good person that know more about an investment be it that i am just 15 years old girl and i do not know anything about investment and now that there is war and crisis in my country i will need an urgent transfer of the fund out of this country and the gold out of this country immediately. But there still arise question in my heart which is if the fund of $ 30.500.000.00 (Thirty Millions Five hundred thousand United state Dollars) and the gold of about 225KG get to you, can i trust you and have confident on you, if yes then you will have to provide me all your data information ok. Frankily speakily, i am not after the money and the gold but after my safety but still money is needed for a good safety and for my future which is the reason i am contacting you for your help me. The fund $ 30.500.000.00 (Thirty Millions Five hundred thousand United state Dollars) is intended to be invested by you in any kind of business that you know it will benefit both of us. Please let me know what your response will be to the retrieve of the $ 30.500.000.00 (Thirty Millions Five hundred thousand United state Dollars). I will want you to know that i am not an english speaking person but i do speak french and i hope this will not be a problem to you. I wait to hear from you if only you are with me. Miss Honore Desire Tagro

1 0

[U-Boot] [GIT PULL] integratorap patches
by Linus Walleij 23 Jul '11

23 Jul '11

With the risk of the board being removed I have no choice but to request that these patches be pulled in, do I... they are all reviewed on the list, patch entitled "integratorap: fixup SDRAM memory size detection" had a comment about TAB intentation and this is fixed in this set, the only other change is that they are have consistently Subject: "integratorap: foo" except the MAINTAINERS patch. The two patches NACK:ed by Wolfgang are not part of this pull request, the first one was misguided and is dropped and the second regarding cache is being worked out. So the following makes the integratorap compile and run, there is still a cache problem when issuing "bootm" but I'm working on it, by simply configuring off the D-Cache the resulting U-boot will work fine for booting a recent kernel. So please pull this. The following changes since commit 68d4230c3ccce96a72c5b99e48399bf1796fe3c6: powerpc/85xx: Add default usb mode and phy type to hwconfig (2011-07-11 13:24:21 -0500) are available in the git repository at: git://git.linaro.org/people/triad/u-boot for-albert Linus Walleij (7): MAINTAINERS: integrator+versatile boards integratorap: make the compile work again integratorap: support relocation integratorap: support the hush shell integratorap: support some rudimentary commands integratorap: fixup SDRAM memory size detection integratorap: remove hardcoded 32MB memory cmdline MAINTAINERS | 11 ++++++----- board/armltd/integrator/integrator.c | 15 +++++++-------- board/armltd/integrator/lowlevel_init.S | 2 +- include/configs/integratorap.h | 18 ++++++++++++++++-- 4 files changed, 30 insertions(+), 16 deletions(-) Thanks, Linus Walleij

2 4

[U-Boot] [PATCH 9/9 v3] integrator: convert to new build system
by Linus Walleij 23 Jul '11

23 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> --- 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 5cfaa78..cc13b17 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 @@ -139,6 +145,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 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 8/9 v3] integratorcp: make the board compile
by Linus Walleij 23 Jul '11

23 Jul '11

This defines the requires CONFIG_SYS_* variables to make the Integrator CP board compile. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- include/configs/integratorcp.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 2c8ca2d..b0486df 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -140,6 +140,12 @@ SIB at Block62 End Block62 address 0x24f80000 #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ #define PHYS_SDRAM_1 0x00000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */ +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_RAM_SIZE PHYS_SDRAM_1_SIZE +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \ + CONFIG_SYS_INIT_RAM_SIZE - \ + GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET /*----------------------------------------------------------------------- * FLASH and environment organization -- 1.7.6

1 0

[U-Boot] [PATCH 7/9 v3] integratorap: remove hardcoded 32MB memory cmdline
by Linus Walleij 23 Jul '11

23 Jul '11

The default configuration for the Integrator AP forces memory to be 32 MB on the command line to the kernel, while we have perfect information and detection of the actual memory size in the ATAGs. Delete the confusion. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- include/configs/integratorap.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 90f21e8..2318ad3 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -93,7 +93,7 @@ #define CONFIG_BOOTDELAY 2 -#define CONFIG_BOOTARGS "root=/dev/mtdblock0 mem=32M console=ttyAM0 console=tty" +#define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyAM0 console=tty" #define CONFIG_BOOTCOMMAND "" /* -- 1.7.6

1 0

[U-Boot] [PATCH 6/9 v3] integratorap: fixup SDRAM memory size detection
by Linus Walleij 23 Jul '11

23 Jul '11

This fixes up the SDRAM memory detection code to work with the latest relocation code, moves it all into dram_init() and activates memory size detection for the Integrator AP. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- board/armltd/integrator/integrator.c | 17 +++++++---------- include/configs/integratorap.h | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index a0d8de7..c8d2bc7 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -86,17 +86,9 @@ int misc_init_r (void) return (0); } -void dram_init_banksize(void) -{ - gd->bd->bi_dram[0].start = PHYS_SDRAM_1; - gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; -} - int dram_init (void) { - gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, - PHYS_SDRAM_1_SIZE); - + gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; #ifdef CONFIG_CM_SPD_DETECT { extern void dram_query(void); @@ -120,8 +112,13 @@ extern void dram_query(void); */ sdram_shift = ((cm_reg_sdram & 0x0000001C)/4)%4; gd->bd->bi_dram[0].size = 0x01000000 << sdram_shift; - + gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, + 0x01000000 << sdram_shift); } +#else + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; + gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, + PHYS_SDRAM_1_SIZE); #endif /* CM_SPD_DETECT */ return 0; diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 26eac8b..90f21e8 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -47,7 +47,7 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_CM_INIT 1 #define CONFIG_CM_REMAP 1 -#undef CONFIG_CM_SPD_DETECT +#define CONFIG_CM_SPD_DETECT /* * Size of malloc() pool -- 1.7.6

1 0

[U-Boot] [PATCH 5/9 v3] integratorap: support some rudimentary commands
by Linus Walleij 23 Jul '11

23 Jul '11

This adds support for a subset of the default commands for the Integrator, however since the card does not have Ethernet (unless you plug in a PCI card) we can not use the default command set. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- include/configs/integratorap.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index ea6af78..26eac8b 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -81,9 +81,15 @@ * Command line configuration. */ + #define CONFIG_CMD_IMI #define CONFIG_CMD_BDI +#define CONFIG_CMD_BOOTD #define CONFIG_CMD_MEMORY +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_IMLS +#define CONFIG_CMD_LOADB +#define CONFIG_CMD_LOADS #define CONFIG_BOOTDELAY 2 -- 1.7.6

1 0

[U-Boot] [PATCH 4/9 v3] integratorap: support the hush shell
by Linus Walleij 23 Jul '11

23 Jul '11

Give us some kind of sane shell environment so the bootloader can be used. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- include/configs/integratorap.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 8b41885..ea6af78 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -94,7 +94,9 @@ * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT "Integrator-AP # " /* Monitor Command Prompt */ +#define CONFIG_SYS_PROMPT_HUSH_PS2 "# " #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) -- 1.7.6

1 0

[U-Boot] [PATCH 2/9 v3] integratorap: make the compile work again
by Linus Walleij 23 Jul '11

23 Jul '11

The integratorap/cp config for u-boot was outdated and would not even compile, so fix the obvious missing bits for it to start building. After this "make ap920t_config/make all" starts working again. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- board/armltd/integrator/lowlevel_init.S | 2 +- include/configs/integratorap.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/board/armltd/integrator/lowlevel_init.S b/board/armltd/integrator/lowlevel_init.S index ab9589c..6f55bb5 100644 --- a/board/armltd/integrator/lowlevel_init.S +++ b/board/armltd/integrator/lowlevel_init.S @@ -199,7 +199,7 @@ cm_remap: /* Now 0x00000000 is writeable, replace the vectors */ ldr r0, =_start /* r0 <- start of vectors */ - ldr r2, =_armboot_start /* r2 <- past vectors */ + ldr r2, =_TEXT_BASE /* r2 <- past vectors */ sub r1,r1,r1 /* destination 0x00000000 */ copy_vec: diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 32ff193..8b41885 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -120,6 +120,12 @@ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ #define PHYS_SDRAM_1 0x00000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */ +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_RAM_SIZE PHYS_SDRAM_1_SIZE +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \ + CONFIG_SYS_INIT_RAM_SIZE - \ + GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_FLASH_BASE 0x24000000 -- 1.7.6

1 0