September 2010 - U-Boot

[U-Boot] [PATCH] Makefile: restore support for board shortcut targets
by Mike Frysinger 12 Sep '10

12 Sep '10

The helpful shortcut for doing a board config + make was dropped recently as it conflicted with some new build code. However, the reason for using pattern targets originally was to avoid managing a duplicate list of boards. Since we now have one centralized place for a list of boards (the new boards.cfg), we don't need a pattern target -- we can generate the exact list of boards on the fly. So do just that. When cleaning things up, the top level gitignore file ignores all things that end with ".depend", but the clean target only deletes files that are named exactly ".depend". Keep these in sync by having the clean target punt all files that match the pattern that gitignore is using. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- Makefile | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4f1cb1b..f9eb4a2 100644 --- a/Makefile +++ b/Makefile @@ -487,8 +487,9 @@ unconfig: %_config:: unconfig @$(MKCONFIG) -A $(@:_config=) -##%: %_config -## $(MAKE) +sinclude .boards.depend +.boards.depend: boards.cfg + awk '(NF && $$1 !~ /^#/) { print $$1 ": " $$1 "_config; $$(MAKE)" }' $< > $@ # # Functions to generate common board directory names @@ -2468,7 +2469,7 @@ clean: | xargs rm -f clobber: clean - @find $(OBJTREE) -type f $ -name .depend \ + @find $(OBJTREE) -type f \( -name '*.depend' \ -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img $ \ -print0 \ | xargs -0 rm -f -- 1.7.2

3 3

[U-Boot] fs/fat.c - file sizes incorrectly printed for files greater than 2G
by William C. Landolina 12 Sep '10

12 Sep '10

Fatls prints negative numbers for file sizes larger than 2GiB because the format statements where dentptr->size are referenced all use %ld rather than %lu formats. There appear to be four places in fs/fat.c where this occurs. - Bill.

2 1

[U-Boot] [PATCH] socrates: adjust TEXT_BASE to increase U-Boot image size
by Wolfgang Denk 12 Sep '10

12 Sep '10

We need more room for the U-Boot image to allow for new features like the new environment code. Shift TEXT_BASE as needed. Signed-off-by: Wolfgang Denk <wd(a)denx.de> Cc: Cajus Hahn <cajus.hahn(a)de.abb.com> --- board/socrates/config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/socrates/config.mk b/board/socrates/config.mk index 4f17294..7ea37b5 100644 --- a/board/socrates/config.mk +++ b/board/socrates/config.mk @@ -26,4 +26,4 @@ # socrates board # default CCARBAR is at 0xff700000 # -TEXT_BASE = 0xfffa0000 +TEXT_BASE = 0xfff80000 -- 1.7.2.2

1 1

[U-Boot] [PATCH] 4xx: adjust TEXT_BASE to increase U-Boot image size
by Wolfgang Denk 12 Sep '10

12 Sep '10

On some boards (canyonlands, luan, sequoia) we need more room for the U-Boot image to allow for new features like the new environment code. Shift TEXT_BASE as needed. Signed-off-by: Wolfgang Denk <wd(a)denx.de> Cc: Stefan Roese <sr(a)denx.de> --- board/amcc/canyonlands/config.mk | 2 +- board/amcc/luan/config.mk | 2 +- board/amcc/sequoia/config.mk | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk index 7a58665..3d6a608 100644 --- a/board/amcc/canyonlands/config.mk +++ b/board/amcc/canyonlands/config.mk @@ -27,7 +27,7 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 +TEXT_BASE = 0xFFF80000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/luan/config.mk b/board/amcc/luan/config.mk index cd02aab..5e4182d 100644 --- a/board/amcc/luan/config.mk +++ b/board/amcc/luan/config.mk @@ -30,7 +30,7 @@ ifeq ($(ramsym),1) TEXT_BASE = 0xFBD00000 else -TEXT_BASE = 0xFFFC0000 +TEXT_BASE = 0xFFFB0000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/amcc/sequoia/config.mk b/board/amcc/sequoia/config.mk index b57e473..c8e2dff 100644 --- a/board/amcc/sequoia/config.mk +++ b/board/amcc/sequoia/config.mk @@ -27,11 +27,7 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 -# -# When defining CONFIG_VIDEO, TEXT_BASE needs to be 0xFFF80000 -# TEXT_BASE = 0xFFF80000 -# +TEXT_BASE = 0xFFF80000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 -- 1.7.2.2

2 2

[U-Boot] [PATCH] IceCube.h: update configuration
by Wolfgang Denk 12 Sep '10

12 Sep '10

Increase malloc size, enable command line editing and history, enable hush shell. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- include/configs/IceCube.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index 5d3a744..3961100 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -280,7 +280,7 @@ #endif #define CONFIG_SYS_MONITOR_LEN (192 << 10) /* Reserve 192 kB for Monitor */ -#define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ +#define CONFIG_SYS_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ /* @@ -317,6 +317,10 @@ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ +#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ +#define CONFIG_SYS_HUSH_PARSER 1 /* use "hush" command parser */ +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " + #define CONFIG_SYS_MEMTEST_START 0x00100000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00f00000 /* 1 ... 15 MB in DRAM */ -- 1.7.2.2

1 1

[U-Boot] [PATCH] [NEXT] Cleanup use of CONFIG_SYS_SRAM_BASE and CONFIG_SYS_SRAM_SIZE
by Wolfgang Denk 12 Sep '10

12 Sep '10

Traditionally many boards used local definitions for SRAM base address and size (like SRAM_BASE, SRAM_LEN and/or SRAM_SIZE), while the (now) "official" names are CONFIG_SYS_SRAM_BASE and CONFIG_SYS_SRAM_SIZE. The corresponding code in arch/powerpc/lib/board.c was board specific, and has never actually been maintained well. Replace this by feature- specific code and adapt the boards that actually use this. NOTE: there is still a ton of boards using the old #defines, which therefor contain incorrect values in bi_sramstart and bi_sramsize. All respective board maintainers are requested to clean up their respective configurations. Thanks. Signed-off-by: Wolfgang Denk <wd(a)denx.de> Cc: Josef Wagner <Wagner(a)Microsys.de> Cc: Stefan Roese <sr(a)denx.de> Cc: Heiko Schocher <hs(a)denx.de> Cc: Wolfgang Denk <wd(a)denx.de> --- arch/powerpc/lib/board.c | 9 +++------ include/configs/CPC45.h | 5 +++-- include/configs/IP860.h | 2 ++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 0e00d86..6b1ff08 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -519,15 +519,12 @@ void board_init_f (ulong bootflag) bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; /* start of DRAM memory */ bd->bi_memsize = gd->ram_size; /* size of DRAM memory in bytes */ -#ifdef CONFIG_IP860 - bd->bi_sramstart = SRAM_BASE; /* start of SRAM memory */ - bd->bi_sramsize = SRAM_SIZE; /* size of SRAM memory */ -#elif defined CONFIG_MPC8220 +#ifdef CONFIG_SYS_SRAM_BASE bd->bi_sramstart = CONFIG_SYS_SRAM_BASE; /* start of SRAM memory */ bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE; /* size of SRAM memory */ #else - bd->bi_sramstart = 0; /* FIXME */ /* start of SRAM memory */ - bd->bi_sramsize = 0; /* FIXME */ /* size of SRAM memory */ + bd->bi_sramstart = 0; + bd->bi_sramsize = 0; #endif #if defined(CONFIG_8xx) || defined(CONFIG_8260) || defined(CONFIG_5xx) || \ diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h index 91d262a..c2e506c 100644 --- a/include/configs/CPC45.h +++ b/include/configs/CPC45.h @@ -347,13 +347,12 @@ #define BOOTFLAG_WARM 0x02 /* Software reboot */ -#define SRAM_BASE 0x80000000 /* SRAM base address */ -#define SRAM_END 0x801FFFFF /*----------------------------------------------------------------------*/ /* CPC45 Memory Map */ /*----------------------------------------------------------------------*/ #define SRAM_BASE 0x80000000 /* SRAM base address */ +#define SRAM_END 0x801FFFFF #define ST16552_A_BASE 0x80200000 /* ST16552 channel A */ #define ST16552_B_BASE 0x80400000 /* ST16552 channel A */ #define BCSR_BASE 0x80600000 /* board control / status registers */ @@ -361,6 +360,8 @@ #define PCMCIA_MEM_BASE 0x83000000 /* PCMCIA memory window base */ #define PCMCIA_IO_BASE 0xFE000000 /* PCMCIA IO window base */ +#define CONFIG_SYS_SRAM_BASE SRAM_BASE +#define CONFIG_SYS_SRAM_SIZE (SRAM_SIZE + SRAM_END + 1) /*---------------------------------------------------------------------*/ /* CPC45 Control/Status Registers */ diff --git a/include/configs/IP860.h b/include/configs/IP860.h index be63ea5..ed6b7fd 100644 --- a/include/configs/IP860.h +++ b/include/configs/IP860.h @@ -375,6 +375,8 @@ extern unsigned long ip860_get_clk_freq (void); #define SRAM_SIZE (1 + (~(CONFIG_SYS_OR3 & BR_BA_MSK))) #define CONFIG_SYS_OR3_PRELIM CONFIG_SYS_OR3 /* Make sure to map early */ #define CONFIG_SYS_BR3_PRELIM CONFIG_SYS_BR3 /* in case it's used for ENV */ +#define CONFIG_SYS_SRAM_BASE SRAM_BASE +#define CONFIG_SYS_SRAM_SIZE SRAM_SIZE /* * BR4/OR4 - Board Control & Status (8 bit) -- 1.7.2.1

3 6

[U-Boot] 2010.09-rc1 SD/MMC tested on Atmel AT91SAM9G45EKES - works
by William C. Landolina 12 Sep '10

12 Sep '10

Reinhard - FYI, your 2010.09-rc1 SD/MMC patches work on an Atmel 9G45 evaluation kit. I customized the board and configuration files following the directions in README.atmel_mci and everything works as expected. I included the console output from a test boot below in case there is some information in the debugging messages that is of interest. Thanks, Bill Landolina. --------------------------------------------- U-Boot 2010.09-rc1 (Sep 11 2010 - 22:43:16) DRAM: 128 MiB ## Unknown FLASH on Bank 1 - Size = 0x00000000 = 0 MB Flash: 0 Bytes NAND: 256 MiB In: serial Out: serial Err: serial MMC: WCL MCI Init at91sam9m10g45_devices.c:192 mci: 0 Net: macb0 Hit any key to stop autoboot: 0 UB-X1> mmcinfo mci: setting clock 260416 Hz, block size 512 mci: setting clock 260416 Hz, block size 512 mci: setting clock 260416 Hz, block size 512 gen_atmel_mci: CMDR 00001048 ( 8) ARGR 000001aa (SR: 0c100025) Command Failed mci: setting clock 260416 Hz, block size 512 mci: setting clock 22222222 Hz, block size 512 Device: mci Manufacturer ID: 1b OEM: 534d Name: SMI Tran Speed: 25000000 Rd Block Len: 512 SD version 1.10 High Capacity: No Capacity: 1017643008 Bus Width: 4-bit UB-X1> fatls mmc 0 5805 test.c 2160828 uimage.bin 2 file(s), 0 dir(s) UB-X1> fatload mmc 0 22000000 uimage.bin reading uimage.bin 2160828 bytes read UB-X1> bootm ## Booting kernel from Legacy Image at 22000000 ... Image Name: Linux-2.6.30-ts-armv5l Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 2160764 Bytes = 2.1 MiB Load Address: 70008000 Entry Point: 70008000 Verifying Checksum ... OK Loading Kernel Image ... OK OK Starting kernel ... Uncompressing Linux......................................................................................................................................... done, booting the kernel. Linux version 2.6.30-ts-armv5l (root(a)localhost.localdomain) (gcc version 4.4.4 (GCC) ) #1 PREEMPT Sat Aug 28 14:24:26 EDT 2010

2 2

[U-Boot] [PATCH] ehci-pci: print hccr, hcor and hc_lenght
by Florian Fainelli 12 Sep '10

12 Sep '10

It is useful to know the EHCI-PCI hccr, hcor and hc_lenght to make sure it was successfully registered, and at the correct location. Signed-off-by: Florian Fainelli <f.fainelli(a)gmail.com> --- diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 047902a..4402abb 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -53,6 +53,10 @@ int ehci_hcd_init(void) hcor = (struct ehci_hcor *)((uint32_t) hccr + HC_LENGTH(ehci_readl(&hccr->cr_capbase))); + printf("EHCI-PCI init hccr 0x%x and hcor 0x%x hc_length %d\n", + (uint32_t)hccr, (uint32_t)hcor, + (uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase))); + return 0; }

2 2

Re: [U-Boot] date time
by Jens Scharsig 12 Sep '10

12 Sep '10

Am 2010-09-10 23:08, schrieb Charles Seedle: > There is a messege in the u-boot boot log showing where it set the system > time. I tried to setting the date and time using the linux command, "date". > It set them but once the I rebooted the board the values for date and time > were wrong again. Could this be related to the backup battery ? Is there a > better way to do this ? Hello Randy, linux command, "date" does only set the linux system datetime. You should use hwclock to sync or set the rtc. You can also use the U-boot date command this will set the rtc direct regards Jens

1 0

[U-Boot] Congratulations
by BBC ONLINE 12 Sep '10

12 Sep '10

£800,000 has been awarded to you in the BBC Online,send Name/Tel/Country urgently to our office for claim.

1 0