May 2010 - U-Boot

[U-Boot] [PATCH-V5] OMAP3EVM: Added NAND support
by hvaibhav＠ti.com 11 May '10

11 May '10

From: Vaibhav Hiremath <hvaibhav(a)ti.com> The EVMS have been shipping with NAND (instead of OneNAND) as default. So, this patch sets NAND as default. To choose OneNAND, define CMD_ONENAND instead of CMD_NAND in the config file omap3_evm.h, Changes From V4 :- - Removed #undef ONENAND line (comment from Denk) Changes from V3 :- - Refreshed against latest u-boot/master Changes from V2 :- - Added undef statement for CMD_ONENAND. Signed-off-by: Vaibhav Hiremath <hvaibhav(a)ti.com> --- include/configs/omap3_evm.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 0d99f7d..88af492 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -151,7 +151,7 @@ #define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_ONENAND /* ONENAND support */ +#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING @@ -306,7 +306,13 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP +#if defined(CONFIG_CMD_NAND) +#define CONFIG_NAND_OMAP_GPMC +#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 +#define CONFIG_ENV_IS_IN_NAND +#elif defined(CONFIG_CMD_ONENAND) #define CONFIG_ENV_IS_IN_ONENAND 1 +#endif #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ -- 1.6.2.4

4 4

[U-Boot] LPC2468 again
by Remco Poelstra 11 May '10

11 May '10

Hi all, It's been a while since I was last on this list. Due to a lot of uncertainties in the codebase and a time shortage on my side, I decided that it was better to wait a while to try to get LPC2468 support in u-boot. I do at least have a lot more time now. I would like to have the code added (and accepted in git) in smaller blocks: 1. general startup code 2. a minimal board example 3. external flash support 4. I2C support 5. Ethernet support I hope you agree with this split up in manageable chunks. Currently I've ported the code to the latest git version. It compiles more or less, except for the following error: /usr/local/ELDK/usr/bin/../lib/gcc/arm-linux-gnueabi/4.2.2/soft-float/libgcc.a(_divdi3.o):(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0' /usr/local/ELDK/usr/bin/../lib/gcc/arm-linux-gnueabi/4.2.2/soft-float/libgcc.a(_udivdi3.o):(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0' How can I fix that? It seems it's the last small problem before I can send a patch set for the startup code. Kind regards, Remco Poelsta

3 5

Re: [U-Boot] [GIT PULL] Pull request: u-boot-imx
by Tom Rix 11 May '10

11 May '10

Stefano Babic wrote: > > Hi Tom, > > please pull from u-boot-imx. Applied, Thanks Tom > > The following changes since commit b88c5988db176a0f9de5598d5167ee2498637d40: > Kim Phillips (1): > configs: remove unused CONFIG_COMMAND_HISTORY > > are available in the git repository at: > > git://git.denx.de/u-boot-imx master > > Anatolij Gustschin (1): > tx25: fix crash while booting Linux > > Fabio Estevam (1): > MX51: Fix MX51 CPU detect message > > Magnus Lilja (1): > i.MX31: Activate NAND support for i.MX31 Litekit board. > > Stefano Babic (7): > MX51evk: Removed warnings > MX: Added Freescale Power Management Driver > MX: RTC13783 uses general function to access PMIC > MX31: Add support for PMIC to the QONG module > SPI: added support for MX51 to mxc_spi > MX: Added definition file for MC13892 > Add SPI support to mx51evk board > > arch/arm/cpu/arm_cortexa8/mx51/soc.c | 2 +- > board/davedenx/qong/qong.c | 20 +++ > board/freescale/mx51evk/mx51evk.c | 143 +++++++++++++++++++++- > board/karo/tx25/tx25.c | 3 + > drivers/misc/Makefile | 1 + > drivers/misc/fsl_pmic.c | 200 +++++++++++++++++++++++++++++ > drivers/rtc/mc13783-rtc.c | 72 +++--------- > drivers/spi/mxc_spi.c | 231 > +++++++++++++++++++++++++++++++--- > include/configs/imx31_litekit.h | 19 +++- > include/configs/mx31ads.h | 8 +- > include/configs/mx31pdk.h | 9 +- > include/configs/mx51evk.h | 15 +++ > include/configs/qong.h | 14 ++ > include/fsl_pmic.h | 128 +++++++++++++++++++ > include/mc13892.h | 160 +++++++++++++++++++++++ > 15 files changed, 935 insertions(+), 90 deletions(-) > create mode 100644 drivers/misc/fsl_pmic.c > create mode 100644 include/fsl_pmic.h > create mode 100644 include/mc13892.h > >

1 0

[U-Boot] [PATCH v3] Avoid use of divides in print_size
by Nick Thompson 11 May '10

11 May '10

Modification of print_size to avoid use of divides and especially long long divides. Keep the binary scale factor in terms of bit shifts instead. This should be faster, since the previous code gave the compiler no clues that the divides where always powers of two, preventing optimisation. Signed-off-by: Nick Thompson <nick.thompson(a)ge.com> --- Since v1: Removed misplaced brackets that resulted in round-up value of 5 rather than the intended 0.5. Now passes Timur Tabi's test. Since v2: Fix overflow in calculation of 0.5 rounding value for numbers with engineered factional parts representing values >4GiB lib/display_options.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/display_options.c b/lib/display_options.c index 86df05d..a711425 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -46,13 +46,14 @@ int display_options (void) void print_size(unsigned long long size, const char *s) { unsigned long m = 0, n; + unsigned long long f; static const char names[] = {'E', 'P', 'T', 'G', 'M', 'K'}; - unsigned long long d = 1ULL << (10 * ARRAY_SIZE(names)); + unsigned long d = 10 * ARRAY_SIZE(names); char c = 0; unsigned int i; - for (i = 0; i < ARRAY_SIZE(names); i++, d >>= 10) { - if (size >= d) { + for (i = 0; i < ARRAY_SIZE(names); i++, d -= 10) { + if (size >> d) { c = names[i]; break; } @@ -63,11 +64,12 @@ void print_size(unsigned long long size, const char *s) return; } - n = size / d; + n = size >> d; + f = size & ((1ULL << d) - 1); /* If there's a remainder, deal with it */ - if(size % d) { - m = (10 * (size - (n * d)) + (d / 2) ) / d; + if (f) { + m = (10ULL * f + (1ULL << (d - 1))) >> d; if (m >= 10) { m -= 10; -- 1.7.0.4

2 1

[U-Boot] [PATCH v3] Support for devices with FAT32 PBR
by Igor Luri 11 May '10

11 May '10

Signed-off-by: Igor Luri <iluri(a)aotek.es> --- disk/part_dos.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/disk/part_dos.c b/disk/part_dos.c index 887b75e..d91f773 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -77,7 +77,8 @@ static int test_block_type(unsigned char *buffer) (buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) ) { return (-1); } /* no DOS Signature at all */ - if(strncmp((char *)&buffer[DOS_PBR_FSTYPE_OFFSET],"FAT",3)==0) + if((strncmp((char *)&buffer[DOS_PBR_FSTYPE_OFFSET],"FAT",3)==0) || + (strncmp((char *)&buffer[DOS_PBR_FAT32_FSTYPE_OFFSET],"FAT32",5)==0) ) return DOS_PBR; /* is PBR */ return DOS_MBR; /* Is MBR */ } -- 1.5.4.3 --- disk/part_dos.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/disk/part_dos.h b/disk/part_dos.h index ac93f20..6383c58 100644 --- a/disk/part_dos.h +++ b/disk/part_dos.h @@ -35,6 +35,7 @@ #define DOS_PART_TBL_OFFSET 0x1be #define DOS_PART_MAGIC_OFFSET 0x1fe #define DOS_PBR_FSTYPE_OFFSET 0x36 +#define DOS_PBR_FAT32_FSTYPE_OFFSET 0x52 #define DOS_PBR_MEDIA_TYPE_OFFSET 0x15 #define DOS_MBR 0 #define DOS_PBR 1 -- 1.5.4.3 --- fs/fat/fat.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 2445f1e..4da4351 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -50,6 +50,7 @@ static int cur_part = 1; #define DOS_PART_TBL_OFFSET 0x1be #define DOS_PART_MAGIC_OFFSET 0x1fe #define DOS_FS_TYPE_OFFSET 0x36 +#define DOS_FS_FAT32_TYPE_OFFSET 0x52 int disk_read (__u32 startblock, __u32 getsize, __u8 * bufptr) { @@ -94,7 +95,8 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no) if (!get_partition_info (dev_desc, part_no, &info)) { part_offset = info.start; cur_part = part_no; - } else if (!strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET], "FAT", 3)) { + } else if (!strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET], "FAT", 3) || + !strncmp((char *)&buffer[DOS_FS_FAT32_TYPE_OFFSET], "FAT32", 5)) { /* ok, we assume we are on a PBR only */ cur_part = 1; part_offset = 0; @@ -105,7 +107,8 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no) } #else - if (!strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET],"FAT",3)) { + if (!strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET],"FAT",3) || + !strncmp((char *)&buffer[DOS_FS_FAT32_TYPE_OFFSET], "FAT32", 5) ) { /* ok, we assume we are on a PBR only */ cur_part = 1; part_offset = 0; -- 1.5.4.3

2 3

Re: [U-Boot] Building for da830 fails
by Nick Thompson 11 May '10

11 May '10

On 07/05/10 12:57, Sudhakar Rajashekhara wrote: > Hi, > > I am using U-Boot from http://git.denx.de/?p=u-boot.git;a=summary and trying to build for da830. But my build fails with following > error: > > [...] > /../lib/gcc/arm-none-linux-gnueabi/4.4.1 -lgcc -Map u-boot.map -o u-boot > ../lib/gcc/arm-none-linux-gnueabi/4.4.1/libgcc.a(bpabi.o):(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0' > ../lib/gcc/arm-none-linux-gnueabi/4.4.1/libgcc.a(_divdi3.o):(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0' > ../lib/gcc/arm-none-linux-gnueabi/4.4.1/libgcc.a(_udivdi3.o):(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0' > > I am using gcc version 4.4.1 (Sourcery G++ Lite 2010q1-202). I also tried with gcc version 4.3.3 (Sourcery G++ Lite 2009q1-203), but > there also I am seeing the same error. I am using "da830evm_config" as the configuration for building. > > Has anyone seen this kind of error while building U-Boot for ARM based architecture? I just pulled the latest main line source and ran: % CROSS_COMPILE=arm-none-linux-gnueabi- ./MAKEALL da830evm Configuring for da830evm board... /opt/CodeSourcery/Sourcery_G++_Lite/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/libgcc.a(bpabi.o):(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0' /opt/CodeSourcery/Sourcery_G++_Lite/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/libgcc.a(_divdi3.o):(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0' /opt/CodeSourcery/Sourcery_G++_Lite/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/libgcc.a(_udivdi3.o):(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr0' make: *** [u-boot] Error 1 /opt/CodeSourcery/Sourcery_G++_Lite/bin/arm-none-linux-gnueabi-size: './u-boot': No such file This did not happen when I last updated on March 22nd and I have not updated my tools at all. Nick.

4 13

[U-Boot] [PATCH] Devkit8000: Fix compilation after changes in dm9000
by Thomas Weber 11 May '10

11 May '10

In commit a45dde2293c816138e53c26eca6fd0322583f9a6 the I/O accessor for the DM9000 is changed. The definition of __io is required to use the standard I/O accessors from asm/io.h. Signed-off-by: Thomas Weber <weber(a)corscience.de> --- include/configs/devkit8000.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 7d1332f..6e53c0d 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -31,6 +31,7 @@ #ifndef __CONFIG_H #define __CONFIG_H + /* High Level Configuration Options */ #define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ @@ -79,6 +80,7 @@ #define CONFIG_DM9000_USE_16BIT 1 #define CONFIG_DM9000_NO_SROM 1 #undef CONFIG_DM9000_DEBUG +#define __io /* NS16550 Configuration */ #define CONFIG_SYS_NS16550 -- 1.6.4.4

5 8

[U-Boot] [PATCH] Avoid use of divides in print_size.
by Nick Thompson 11 May '10

11 May '10

Modification of print_size to avoid use of divides and especially long long divides. Keep the binary scale factor in terms of bit shifts instead. This should be faster, since the previous code gave the compiler no clues that the divides where always powers of two, preventing optimisation. Signed-off-by: Nick Thompson <nick.thompson(a)ge.com> --- This patch should make print_size a little faster, but perhaps nobody cares about that too much. What it also does though is reenable U-Boot linking for ARM with standard toolchains. (e.g. CodeSourcery and MontaVista). lib/display_options.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/display_options.c b/lib/display_options.c index 86df05d..636916d 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -46,13 +46,14 @@ int display_options (void) void print_size(unsigned long long size, const char *s) { unsigned long m = 0, n; + unsigned long long f; static const char names[] = {'E', 'P', 'T', 'G', 'M', 'K'}; - unsigned long long d = 1ULL << (10 * ARRAY_SIZE(names)); + unsigned long d = 10 * ARRAY_SIZE(names); char c = 0; unsigned int i; - for (i = 0; i < ARRAY_SIZE(names); i++, d >>= 10) { - if (size >= d) { + for (i = 0; i < ARRAY_SIZE(names); i++, d -= 10) { + if (size >> d) { c = names[i]; break; } @@ -63,11 +64,12 @@ void print_size(unsigned long long size, const char *s) return; } - n = size / d; + n = size >> d; + f = size & ((1ULL << d) - 1); /* If there's a remainder, deal with it */ - if(size % d) { - m = (10 * (size - (n * d)) + (d / 2) ) / d; + if (f) { + m = (10ULL * (f + (1 << (d - 1)))) >> d; if (m >= 10) { m -= 10; -- 1.7.0.4

2 3

[U-Boot] [PATCH v2] Avoid use of divides in print_size
by Nick Thompson 11 May '10

11 May '10

Modification of print_size to avoid use of divides and especially long long divides. Keep the binary scale factor in terms of bit shifts instead. This should be faster, since the previous code gave the compiler no clues that the divides where always powers of two, preventing optimisation. Signed-off-by: Nick Thompson <nick.thompson(a)ge.com> --- Since v1: Removed misplaced brackets that resulted in round-up value of 5 rather than the intended 0.5. Now passes Timur Tabi's test. lib/display_options.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/display_options.c b/lib/display_options.c index 86df05d..14a2da5 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -46,13 +46,14 @@ int display_options (void) void print_size(unsigned long long size, const char *s) { unsigned long m = 0, n; + unsigned long long f; static const char names[] = {'E', 'P', 'T', 'G', 'M', 'K'}; - unsigned long long d = 1ULL << (10 * ARRAY_SIZE(names)); + unsigned long d = 10 * ARRAY_SIZE(names); char c = 0; unsigned int i; - for (i = 0; i < ARRAY_SIZE(names); i++, d >>= 10) { - if (size >= d) { + for (i = 0; i < ARRAY_SIZE(names); i++, d -= 10) { + if (size >> d) { c = names[i]; break; } @@ -63,11 +64,12 @@ void print_size(unsigned long long size, const char *s) return; } - n = size / d; + n = size >> d; + f = size & ((1ULL << d) - 1); /* If there's a remainder, deal with it */ - if(size % d) { - m = (10 * (size - (n * d)) + (d / 2) ) / d; + if (f) { + m = (10ULL * f + (1 << (d - 1))) >> d; if (m >= 10) { m -= 10; -- 1.7.0.4

1 0

[U-Boot] [PATCH] AX88180: make OUTW handle 32bit/16bit defines too
by Mike Frysinger 11 May '10

11 May '10

From: Hoan Hoang <hnhoan(a)i-syst.com> The current OUTW function is always defined as a 16bit function, but this doesn't work correctly when using the 32bit access mode. So define it as a 32bit function when in 32bit mode so things work correctly on Blackfin 32bit LE systems. Signed-off-by: Hoan Hoang <hnhoan(a)i-syst.com> Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- drivers/net/ax88180.h | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ax88180.h b/drivers/net/ax88180.h index f26a91b..9a324bd 100644 --- a/drivers/net/ax88180.h +++ b/drivers/net/ax88180.h @@ -357,15 +357,15 @@ static inline unsigned short INW (struct eth_device *dev, unsigned long addr) return le16_to_cpu (*(volatile unsigned short *) (addr + dev->iobase)); } +/* + Access RXBUFFER_START/TXBUFFER_START to read RX buffer/write TX buffer +*/ +#if defined (CONFIG_DRIVER_AX88180_16BIT) static inline void OUTW (struct eth_device *dev, unsigned short command, unsigned long addr) { *(volatile unsigned short *) ((addr + dev->iobase)) = cpu_to_le16 (command); } -/* - Access RXBUFFER_START/TXBUFFER_START to read RX buffer/write TX buffer -*/ -#if defined (CONFIG_DRIVER_AX88180_16BIT) static inline unsigned short READ_RXBUF (struct eth_device *dev) { return le16_to_cpu (*(volatile unsigned short *) (RXBUFFER_START + dev->iobase)); @@ -376,6 +376,11 @@ static inline void WRITE_TXBUF (struct eth_device *dev, unsigned short data) *(volatile unsigned short *) ((TXBUFFER_START + dev->iobase)) = cpu_to_le16 (data); } #else +static inline void OUTW (struct eth_device *dev, unsigned short command, unsigned long addr) +{ + *(volatile unsigned long *) ((addr + dev->iobase)) = cpu_to_le32 (command); +} + static inline unsigned long READ_RXBUF (struct eth_device *dev) { return le32_to_cpu (*(volatile unsigned long *) (RXBUFFER_START + dev->iobase)); -- 1.7.1

1 0