August 2008 - U-Boot

[U-Boot-Users] [PATCH] API: Provide syscall entry point implementation for the ARM architecture.
by Rafal Jaworowski 19 Aug '08

19 Aug '08

(Tested on ARM920-based EP93xx system) Signed-off-by: Rafal Czubak <rcz(a)semihalf.com> Acked-by: Rafal Jaworowski <raj(a)semihalf.com> --- api_examples/Makefile | 6 +++--- api_examples/crt0.S | 17 +++++++++++++++-- lib_arm/board.c | 5 +++++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/api_examples/Makefile b/api_examples/Makefile index 5666f48..d09f8f8 100644 --- a/api_examples/Makefile +++ b/api_examples/Makefile @@ -24,9 +24,9 @@ ifeq ($(ARCH),ppc) LOAD_ADDR = 0x40000 endif -#ifeq ($(ARCH),arm) -#LOAD_ADDR = 0xc100000 -#endif +ifeq ($(ARCH),arm) +LOAD_ADDR = 0x1000000 +endif include $(TOPDIR)/config.mk diff --git a/api_examples/crt0.S b/api_examples/crt0.S index 80b7297..a9e2dea 100644 --- a/api_examples/crt0.S +++ b/api_examples/crt0.S @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007 Semihalf + * (C) Copyright 2007-2008 Semihalf * * Written by: Rafal Jaworowski <raj(a)semihalf.com> * @@ -25,7 +25,6 @@ #if defined(CONFIG_PPC) .text - .globl _start _start: /* Store global data ptr as a hint for U-Boot address range */ @@ -41,6 +40,20 @@ syscall: lwz %r11, 0(%r11) mtctr %r11 bctr + +#elif defined(CONFIG_ARM) + .text + .globl _start +_start: + ldr ip, =gd_ptr + str r8, [ip] + b main + + .globl syscall +syscall: + ldr ip, =syscall_ptr + ldr pc, [ip] + #else #error No support for this arch! #endif diff --git a/lib_arm/board.c b/lib_arm/board.c index a093860..c47b52c 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -431,6 +431,11 @@ void start_armboot (void) jumptable_init (); +#if defined(CONFIG_API) + /* Initialize API */ + api_init (); +#endif + console_init_r (); /* fully init console as a device */ #if defined(CONFIG_MISC_INIT_R) -- 1.5.2.2

2 1

[U-Boot] MV Linux uImage not working with u-boot, but zImage does
by john h 19 Aug '08

19 Aug '08

I wasn't sure if this is a Linux issue or a u-boot issue. We are using an older version of arch/ppc MontaVista Linux and having a problem with u-boot. We can build a zImage and convert it to a uImage and it runs from u-boot fine. If we build a uImage from MV, the kernel crashes as shown below. We are using u-boot version U-Boot 1.3.0-rc3. Yet we can boot an arch/ppc Linux kernel (uImage) that's based on 2.6.26. Is there something we're not realizing that is different in the u-boot interface? Thanks, John version 2.6.10_mvl401-ml40x () (gcc version 3.4.3 (MontaVista 3.4.3 25.0.70.0501961 <4>mem_pieces_remove: [0,0) not in any region <2>kernel BUG in free_bootmem_core at mm/bootmem.c:115! <4>NIP: C02B4D04 LR: C02B2350 SP: C02A3F90 REGS: c02a3ee0 TRAP: 0700 Not tainted <6>GPR00: 00000000 C02A3F90 C026C720 C02D6EAC 00000000 00000001 C0270000 C026DC48 <6>GPR08: C0270000 00000000 00000000 00000000 48002028 0000A5A5 10000C00 00000000 <6>GPR16: 007FFF00 00000000 007FFE80 00800000 00000000 00000000 0FFFA304 00000000 <6>GPR24: 00000000 0FEDA958 00000DC0 007FFF3A 007FFF00 C02D0000 00000001 C02CEC04 <4>NIP [c02b4d04] free_bootmem_core+0x1c/0xac <4>LR [c02b2350] do_init_bootmem+0xfc/0x140<4> Call trace: <4> [c02b1cec] setup_arch+0xd8/0x1dc <4> [c02a44d8] start_kernel+0x28/0x1bc <4> [c0000240] skpinv+0x1e8/0x224 <0>Kernel panic - not syncing: Attempted to kill the idle task! <4> <0> Rebooting in 180 seconds..

1 0

[U-Boot] [PATCH] NAND: Remove delay from nand_boot_fsl_elbc.c.
by Scott Wood 19 Aug '08

19 Aug '08

It was for debugging purposes, and shouldn't have been left in. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- Applied to u-boot-nand-flash. nand_spl/nand_boot_fsl_elbc.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/nand_spl/nand_boot_fsl_elbc.c b/nand_spl/nand_boot_fsl_elbc.c index 0d2378e..5339224 100644 --- a/nand_spl/nand_boot_fsl_elbc.c +++ b/nand_spl/nand_boot_fsl_elbc.c @@ -133,8 +133,6 @@ void nand_boot(void) { __attribute__((noreturn)) void (*uboot)(void); - udelay(1000000); - /* * Load U-Boot image from NAND into RAM */ -- 1.5.6.rc1.6.gc53ad

1 0

[U-Boot-Users] PATCH: Update U-Boot EXT2 Filesystem to support dynamic inode size and optimize ext2 read function to fasten read speed!
by Ryan CHEN 18 Aug '08

18 Aug '08

Description: The patch updates /fs/ext2/ext2fs.c file. There are two aims: 1. Make U-Boot could support the EXT2 dynamic version that ext2_inode_size beyond 128bytes. One new feature be involved: CFG_EXT2_SUPPORT_DYNAMIC_REV Refer to: linux-2.6.24.3 source code. 2. Make EXT2 read more fast. One new feature be involved: CFG_OPTIMIZE_EXT2_READ commit f4120b0f4f06cd1a382bb562d7fe33ea554a1982 Parent: 699f05125509249072a0b865c8d35520d97cd501 Author: Ryan Chen <ryan.chen(a)st.com> Date: Tue Jul 29 11:57:11 2008 -0400 Signed-off-by: Ryan Chen <ryan.chen(a)st.com> modified: fs/ext2/ext2fs.c diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c old mode 100644 new mode 100755 index 7833551..3946978 --- a/fs/ext2/ext2fs.c +++ b/fs/ext2/ext2fs.c @@ -29,6 +29,7 @@ #include <ext2fs.h> #include <malloc.h> #include <asm/byteorder.h> +#define CFG_EXT2_SUPPORT_DYNAMIC_REV extern int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf); @@ -66,6 +67,17 @@ extern int ext2fs_devread (int sector, int byte_offset, int byte_len, /* The size of an ext2 block in bytes. */ #define EXT2_BLOCK_SIZE(data) (1 << LOG2_BLOCK_SIZE(data)) +#ifdef CFG_EXT2_SUPPORT_DYNAMIC_REV +/* + * Revision levels + */ +#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */ +#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */ + +#define EXT2_GOOD_OLD_INODE_SIZE 128 +uint32_t ext2_inode_size = EXT2_GOOD_OLD_INODE_SIZE; +#endif + /* The ext2 superblock. */ struct ext2_sblock { uint32_t total_inodes; @@ -217,7 +229,11 @@ static int ext2fs_read_inode if (status == 0) { return (0); } +#ifdef CFG_EXT2_SUPPORT_DYNAMIC_REV + inodes_per_block = EXT2_BLOCK_SIZE (data) / ext2_inode_size; +#else inodes_per_block = EXT2_BLOCK_SIZE (data) / 128; +#endif blkno = (ino % __le32_to_cpu (sblock->inodes_per_group)) / inodes_per_block; blkoff = (ino % __le32_to_cpu (sblock->inodes_per_group)) % @@ -226,10 +242,17 @@ static int ext2fs_read_inode printf ("ext2fs read inode blkno %d blkoff %d\n", blkno, blkoff); #endif /* Read the inode. */ +#ifdef CFG_EXT2_SUPPORT_DYNAMIC_REV + status = ext2fs_devread (((__le32_to_cpu (blkgrp.inode_table_id) + + blkno) << LOG2_EXT2_BLOCK_SIZE (data)), + ext2_inode_size * blkoff, + sizeof (struct ext2_inode), (char *) inode); +#else status = ext2fs_devread (((__le32_to_cpu (blkgrp.inode_table_id) + blkno) << LOG2_EXT2_BLOCK_SIZE (data)), sizeof (struct ext2_inode) * blkoff, sizeof (struct ext2_inode), (char *) inode); +#endif if (status == 0) { return (0); } @@ -243,8 +266,13 @@ void ext2fs_free_node (ext2fs_node_t node, ext2fs_node_t currroot) { } } +#define CFG_OPTIMIZE_EXT2_READ +#ifdef CFG_OPTIMIZE_EXT2_READ +static int ext2fs_read_block (ext2fs_node_t node, int fileblock, int *stream) { +#else static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { +#endif struct ext2_data *data = node->data; struct ext2_inode *inode = &node->inode; int blknr; @@ -252,9 +280,20 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { int log2_blksz = LOG2_EXT2_BLOCK_SIZE (data); int status; +#ifdef CFG_OPTIMIZE_EXT2_READ + *stream = 1;/* itself */ +#endif + /* Direct blocks. */ if (fileblock < INDIRECT_BLOCKS) { blknr = __le32_to_cpu (inode->b.blocks.dir_blocks[fileblock]); +#ifdef CFG_OPTIMIZE_EXT2_READ + while(((inode->b.blocks.dir_blocks[fileblock + 1] - + inode->b.blocks.dir_blocks[fileblock]) == 1) && (fileblock < INDIRECT_BLOCKS - 1)) { + fileblock++; + *stream += 1; + } +#endif } /* Indirect. */ else if (fileblock < (INDIRECT_BLOCKS + (blksz / 4))) { @@ -294,6 +333,13 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { } blknr = __le32_to_cpu (indir1_block [fileblock - INDIRECT_BLOCKS]); +#ifdef CFG_OPTIMIZE_EXT2_READ + while(((__le32_to_cpu (indir1_block[fileblock - INDIRECT_BLOCKS + 1]) - \ + __le32_to_cpu (indir1_block[fileblock - INDIRECT_BLOCKS])) == 1) && (fileblock < (blksz - 1))) { + fileblock++; + *stream += 1; + } +#endif } /* Double indirect. */ else if (fileblock < @@ -301,6 +347,9 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { unsigned int perblock = blksz / 4; unsigned int rblock = fileblock - (INDIRECT_BLOCKS + blksz / 4); +#ifdef CFG_OPTIMIZE_EXT2_READ + int rbcnt = 0; +#endif if (indir1_block == NULL) { indir1_block = (uint32_t *) malloc (blksz); @@ -370,6 +419,14 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { __le32_to_cpu (indir1_block[rblock / perblock]) << log2_blksz; } blknr = __le32_to_cpu (indir2_block[rblock % perblock]); +#ifdef CFG_OPTIMIZE_EXT2_READ + rbcnt = rblock % perblock; + while(((__le32_to_cpu (indir2_block[rbcnt + 1]) - \ + __le32_to_cpu (indir2_block[rbcnt])) == 1) && (rbcnt < (blksz - 1))) { + rbcnt++; + *stream += 1; + } +#endif } /* Tripple indirect. */ else { @@ -382,7 +439,57 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { return (blknr); } +#ifdef CFG_OPTIMIZE_EXT2_READ +int ext2fs_read_file + (ext2fs_node_t node, int pos, unsigned int len, char *buf) { + int log2blocksize = LOG2_EXT2_BLOCK_SIZE (node->data); + int blocksize = 1 << (log2blocksize + DISK_SECTOR_BITS); + unsigned int filesize = __le32_to_cpu(node->inode.size); + int blknr; + int blockend; + int status; + int remain = len; + char *buffer = buf; + int stream = 0; + int cur = pos / blocksize; + int blockoff = pos % blocksize; + + /* Adjust len so it we can't read past the end of the file. */ + if (len > filesize) { + len = filesize; + } + while (remain > 0) { + blknr = ext2fs_read_block (node, cur, &stream); + if (blknr < 0) { + return (-1); + } + blknr = blknr << log2blocksize; + + if(remain < blocksize * stream) { + blockend = remain; + } else { + blockend = blocksize * stream; + } + + status = ext2fs_devread (blknr, blockoff, blockend, buffer); + if (status == 0) { + return (-1); + } + + remain -= blockend; + buffer += blockend; + cur += stream; + blockoff = 0; + + if(remain == 0) + return (len); + else if(remain < 0) + return (-1); + } + return (len); +} +#else int ext2fs_read_file (ext2fs_node_t node, int pos, unsigned int len, char *buf) { int i; @@ -390,7 +497,7 @@ int ext2fs_read_file int log2blocksize = LOG2_EXT2_BLOCK_SIZE (node->data); int blocksize = 1 << (log2blocksize + DISK_SECTOR_BITS); unsigned int filesize = __le32_to_cpu(node->inode.size); - + /* Adjust len so it we can't read past the end of the file. */ if (len > filesize) { len = filesize; @@ -409,7 +516,7 @@ int ext2fs_read_file return (-1); } blknr = blknr << log2blocksize; - + /* Last block. */ if (i == blockcnt - 1) { blockend = (len + pos) % blocksize; @@ -442,6 +549,7 @@ int ext2fs_read_file } return (len); } +#endif static int ext2fs_iterate_dir (ext2fs_node_t dir, char *name, ext2fs_node_t * fnode, int *ftype) @@ -854,6 +962,17 @@ int ext2fs_mount (unsigned part_length) { if (__le16_to_cpu (data->sblock.magic) != EXT2_MAGIC) { goto fail; } +#ifdef CFG_EXT2_SUPPORT_DYNAMIC_REV +#ifdef DEBUG + printf("revision_level = 0x%x, inode_size = 0x%x\n", data->sblock.revision_level, data->sblock.inode_size); +#endif + if (__le32_to_cpu (data->sblock.revision_level) == EXT2_GOOD_OLD_REV) { + ext2_inode_size = EXT2_GOOD_OLD_INODE_SIZE; + } else { + ext2_inode_size = __le16_to_cpu (data->sblock.inode_size); + } +#endif + data->diropen.data = data; data->diropen.ino = 2; data->diropen.inode_read = 1; Best Regards, Ryan Chen

4 6

[U-Boot-Users] [PATCH] Allow negative offset in command loads
by Ricardo Ribalda Delgado 18 Aug '08

18 Aug '08

Comand loads only allows positive offset for relocating the .srec files, this patch allows negative offsets Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda(a)uam.es> --- common/cmd_load.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/cmd_load.c b/common/cmd_load.c index 89f6403..ae56543 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -53,7 +53,7 @@ static int do_echo = 1; #if defined(CONFIG_CMD_LOADS) int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - ulong offset = 0; + long offset = 0; ulong addr; int i; char *env_echo; @@ -72,7 +72,7 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #ifdef CFG_LOADS_BAUD_CHANGE if (argc >= 2) { - offset = simple_strtoul(argv[1], NULL, 16); + offset = simple_strtol(argv[1], NULL, 16); } if (argc == 3) { load_baudrate = (int)simple_strtoul(argv[2], NULL, 10); @@ -95,7 +95,7 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } #else /* ! CFG_LOADS_BAUD_CHANGE */ if (argc == 2) { - offset = simple_strtoul(argv[1], NULL, 16); + offset = simple_strtol(argv[1], NULL, 16); } #endif /* CFG_LOADS_BAUD_CHANGE */ @@ -141,7 +141,7 @@ int do_load_serial (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } static ulong -load_serial (ulong offset) +load_serial (long offset) { char record[SREC_MAXRECLEN + 1]; /* buffer for one S-Record */ char binbuf[SREC_MAXBINLEN]; /* buffer for binary data */ -- 1.5.6.3

3 6

[U-Boot-Users] [PATCH] add 'unzip' command to u-boot commandline
by Harald Welte 18 Aug '08

18 Aug '08

[PATCH] add new 'unzip' command to u-boot commandline common/cmd_mem.c: new command "unzip srcaddr dstaddr [dstsize]" to unzip from memory to memory, and option CONFIG_CMD_UNZIP to enable it Signed-off-by: Werner Almesberger <werner(a)openmoko.org> Signed-off-by: Harald Welte <laforge(a)openmoko.org> diff --git a/common/cmd_mem.c b/common/cmd_mem.c index d6d7a5b..656f519 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -1191,6 +1191,34 @@ int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } #endif /* CONFIG_CRC32_VERIFY */ + +#ifdef CONFIG_CMD_UNZIP +int gunzip (void *, int, unsigned char *, unsigned long *); + +int do_unzip ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + unsigned long src, dst; + unsigned long src_len = ~0UL, dst_len = ~0UL; + int err; + + switch (argc) { + case 4: + dst_len = simple_strtoul(argv[3], NULL, 16); + /* fall through */ + case 3: + src = simple_strtoul(argv[1], NULL, 16); + dst = simple_strtoul(argv[2], NULL, 16); + break; + default: + printf ("Usage:\n%s\n", cmdtp->usage); + return 1; + } + + return !!gunzip((void *) dst, dst_len, (void *) src, &src_len); +} +#endif /* CONFIG_CMD_UNZIP */ + + /**************************************************/ #if defined(CONFIG_CMD_MEMORY) U_BOOT_CMD( @@ -1294,5 +1322,13 @@ U_BOOT_CMD( ); #endif /* CONFIG_MX_CYCLIC */ +#ifdef CONFIG_CMD_UNZIP +U_BOOT_CMD( + unzip, 4, 1, do_unzip, + "unzip - unzip a memory region\n", + "srcaddr dstaddr [dstsize]\n" +); +#endif /* CONFIG_CMD_UNZIP */ + #endif #endif diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index c2bb094..2cb2f67 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -77,6 +77,7 @@ #define CONFIG_CMD_SPI /* SPI utility */ #define CONFIG_CMD_TERMINAL /* built-in Serial Terminal */ #define CONFIG_CMD_UNIVERSE /* Tundra Universe Support */ +#define CONFIG_CMD_UNZIP /* unzip from memory to memory */ #define CONFIG_CMD_USB /* USB Support */ #define CONFIG_CMD_VFD /* VFD support (TRAB) */ #define CONFIG_CMD_XIMG /* Load part of Multi Image */ -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

2 2

[U-Boot] [PATCH] fdt: rework fdt_fixup_ethernet() to use env instead of bd_t
by Kumar Gala 18 Aug '08

18 Aug '08

Move to using the environment variables 'ethaddr', 'eth1addr', etc.. instead of bd->bi_enetaddr, bi_enet1addr, etc. This makes the code a bit more flexible to the number of ethernet interfaces. Right now we assume a max of 10 interfaces. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- common/fdt_support.c | 65 +++++++++++++++++++++++------------------------- cpu/74xx_7xx/cpu.c | 2 +- cpu/mpc512x/cpu.c | 2 +- cpu/mpc8260/cpu.c | 2 +- cpu/mpc83xx/fdt.c | 2 +- cpu/mpc85xx/fdt.c | 2 +- cpu/mpc86xx/fdt.c | 2 +- cpu/mpc8xx/fdt.c | 2 +- cpu/ppc4xx/fdt.c | 2 +- include/fdt_support.h | 2 +- 10 files changed, 40 insertions(+), 43 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 93b144e..0b67ee0 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -371,49 +371,46 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size) #if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\ defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) -void fdt_fixup_ethernet(void *fdt, bd_t *bd) +#define CFG_MAX_NUM_ETH (10) +void fdt_fixup_ethernet(void *fdt) { + int i, j; int node; const char *path; node = fdt_path_offset(fdt, "/aliases"); if (node >= 0) { -#if defined(CONFIG_HAS_ETH0) - path = fdt_getprop(fdt, node, "ethernet0", NULL); - if (path) { - do_fixup_by_path(fdt, path, "mac-address", - bd->bi_enetaddr, 6, 0); - do_fixup_by_path(fdt, path, "local-mac-address", - bd->bi_enetaddr, 6, 1); - } -#endif -#if defined(CONFIG_HAS_ETH1) - path = fdt_getprop(fdt, node, "ethernet1", NULL); - if (path) { - do_fixup_by_path(fdt, path, "mac-address", - bd->bi_enet1addr, 6, 0); - do_fixup_by_path(fdt, path, "local-mac-address", - bd->bi_enet1addr, 6, 1); - } -#endif -#if defined(CONFIG_HAS_ETH2) - path = fdt_getprop(fdt, node, "ethernet2", NULL); - if (path) { - do_fixup_by_path(fdt, path, "mac-address", - bd->bi_enet2addr, 6, 0); - do_fixup_by_path(fdt, path, "local-mac-address", - bd->bi_enet2addr, 6, 1); - } -#endif -#if defined(CONFIG_HAS_ETH3) - path = fdt_getprop(fdt, node, "ethernet3", NULL); - if (path) { + char enet[12], mac[10], *tmp, *end; + unsigned char mac_addr[6]; + + for (i = 0; i < CFG_MAX_NUM_ETH; i++) { + sprintf(enet, "ethernet%d", i); + sprintf(mac, "eth%daddr",i); + + sprintf(mac, i ? "eth%daddr" : "ethaddr", i); + tmp = getenv(mac); + path = fdt_getprop(fdt, node, enet, NULL); + + if (!path) { + debug("No alias for %s\n", enet); + continue; + } + if (!tmp) { + debug("No environment variable for %s\n", mac); + continue; + } + + for (j = 0; j < 6; j++) { + mac_addr[j] = tmp ? simple_strtoul(tmp, &end, 16) : 0; + if (tmp) + tmp = (*end) ? end+1 : end; + } + do_fixup_by_path(fdt, path, "mac-address", - bd->bi_enet3addr, 6, 0); + &mac_addr, 6, 0); do_fixup_by_path(fdt, path, "local-mac-address", - bd->bi_enet3addr, 6, 1); + &mac_addr, 6, 1); } -#endif } } #endif diff --git a/cpu/74xx_7xx/cpu.c b/cpu/74xx_7xx/cpu.c index ea43c9a..c007abc 100644 --- a/cpu/74xx_7xx/cpu.c +++ b/cpu/74xx_7xx/cpu.c @@ -314,7 +314,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); - fdt_fixup_ethernet(blob, bd); + fdt_fixup_ethernet(blob); } #endif /* ------------------------------------------------------------------------- */ diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c index 703e188..1f39ac4 100644 --- a/cpu/mpc512x/cpu.c +++ b/cpu/mpc512x/cpu.c @@ -191,7 +191,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) #endif ft_clock_setup(blob, bd); #ifdef CONFIG_HAS_ETH0 - fdt_fixup_ethernet(blob, bd); + fdt_fixup_ethernet(blob); #endif } #endif diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c index 4d5d141..efb8ed6 100644 --- a/cpu/mpc8260/cpu.c +++ b/cpu/mpc8260/cpu.c @@ -307,7 +307,7 @@ void ft_cpu_setup (void *blob, bd_t *bd) #if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\ defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) - fdt_fixup_ethernet(blob, bd); + fdt_fixup_ethernet(blob); #endif do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1); diff --git a/cpu/mpc83xx/fdt.c b/cpu/mpc83xx/fdt.c index fda85c1..39bd9dc 100644 --- a/cpu/mpc83xx/fdt.c +++ b/cpu/mpc83xx/fdt.c @@ -53,7 +53,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) #if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\ defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) - fdt_fixup_ethernet(blob, bd); + fdt_fixup_ethernet(blob); #endif do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, diff --git a/cpu/mpc85xx/fdt.c b/cpu/mpc85xx/fdt.c index c159934..bc1550d 100644 --- a/cpu/mpc85xx/fdt.c +++ b/cpu/mpc85xx/fdt.c @@ -212,7 +212,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) #if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\ defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) - fdt_fixup_ethernet(blob, bd); + fdt_fixup_ethernet(blob); #endif do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, diff --git a/cpu/mpc86xx/fdt.c b/cpu/mpc86xx/fdt.c index 80a5c78..12d9052 100644 --- a/cpu/mpc86xx/fdt.c +++ b/cpu/mpc86xx/fdt.c @@ -25,7 +25,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) #if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) \ || defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) - fdt_fixup_ethernet(blob, bd); + fdt_fixup_ethernet(blob); #endif #ifdef CFG_NS16550 diff --git a/cpu/mpc8xx/fdt.c b/cpu/mpc8xx/fdt.c index 567094a..7130983 100644 --- a/cpu/mpc8xx/fdt.c +++ b/cpu/mpc8xx/fdt.c @@ -40,7 +40,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) gd->brg_clk, 1); /* Fixup ethernet MAC addresses */ - fdt_fixup_ethernet(blob, bd); + fdt_fixup_ethernet(blob); fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); } diff --git a/cpu/ppc4xx/fdt.c b/cpu/ppc4xx/fdt.c index 0323dc5..a97484f 100644 --- a/cpu/ppc4xx/fdt.c +++ b/cpu/ppc4xx/fdt.c @@ -130,7 +130,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) * Fixup all ethernet nodes * Note: aliases in the dts are required for this */ - fdt_fixup_ethernet(blob, bd); + fdt_fixup_ethernet(blob); /* * Fixup all available PCIe nodes by setting the device_type property diff --git a/include/fdt_support.h b/include/fdt_support.h index a7c6326..f2f2cd5 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -45,7 +45,7 @@ void do_fixup_by_compat(void *fdt, const char *compat, void do_fixup_by_compat_u32(void *fdt, const char *compat, const char *prop, u32 val, int create); int fdt_fixup_memory(void *blob, u64 start, u64 size); -void fdt_fixup_ethernet(void *fdt, bd_t *bd); +void fdt_fixup_ethernet(void *fdt); int fdt_find_and_setprop(void *fdt, const char *node, const char *prop, const void *val, int len, int create); void fdt_fixup_qe_firmware(void *fdt); -- 1.5.5.1

2 4

[U-Boot] change fdt_fixup_ethernet to use env instead of bd_t
by Kumar Gala 18 Aug '08

18 Aug '08

Does anyone see any issue with moving to using the environment instead of the bd_t to get the mac address for a given ethernet controller. This has the benefit of having this bit of code scales easier w/the # of controllers. Right now I've set the max to 10, but we can easily make it configurable. - k void fdt_fixup_ethernet(void *fdt) { int i, j; int node; const char *path; node = fdt_path_offset(fdt, "/aliases"); if (node >= 0) { char enet[12], mac[10], *tmp, *end; unsigned char mac_addr[6]; for (i = 0; i < 10; i++) { sprintf(enet, "ethernet%d", i); sprintf(mac, "eth%daddr",i); sprintf(mac, i ? "eth%daddr" : "ethaddr", i); tmp = getenv(mac); path = fdt_getprop(fdt, node, enet, NULL); if (!path) { continue; } if (!tmp) { continue; } for (j = 0; j < 6; j++) { mac_addr[j] = tmp ? simple_strtoul(tmp, &end, 16) : 0; if (tmp) tmp = (*end) ? end+1 : end; } do_fixup_by_path(fdt, path, "mac-address", &mac_addr, 6, 0); do_fixup_by_path(fdt, path, "local-mac-address", &mac_addr, 6, 1); } } }

1 0

[U-Boot] need clarification regarding mmc csd structure declaration
by Gururaja Hebbar K R 18 Aug '08

18 Aug '08

Hi, I need few clarification regarding mmc csd structure declaration. I was taking Atmel mci as reference. In ProductManualSDCardv2.2.pdf @ page 34 & ProdManualSDCardv1.9[1].pdf @ page 39, says ... ... ... C_SIZE_MULT 3 bit width ERASE_BLK_EN 1 bit width SECTOR_SIZE 7 bit width WP_GRP_SIZE 7 bit width WP_GRP_ENABLE 1 bit width ... ... .. But in mmc.h file inside u-boot-1.3.4\include\asm-avr32\arch-at32ap700x. Here, inside structure mmc_csd @ line ... ... ... c_size_mult:3 sector_size:5 erase_grp_size:5 wp_grp_size:5 wp_grp_enable:1 ... ... ... So my doubt is, Shouldn't erase_grp_size come before sector size. please correct me if i am wrong. TIA Regards Gururaja

2 2

Re: [U-Boot] [PATCH] - Correct Invalid Timer Register Field Declaration
by Gururaja Hebbar K R 18 Aug '08

18 Aug '08

Hi, Could some please let me know whether this patch is correct. TIA Regards Gururaja

1 0