July 2009 - U-Boot

[U-Boot] [RFC] arm/board.c: avoid ifdef using weak default functions
by Alessandro Rubini 23 Jul '09

23 Jul '09

From: Alessandro Rubini <rubini(a)gnudd.com> While it's a matter of personal taste, I prefer to avoid ifdef when possible. For example, I don't like to add BOARD_LATE_INIT in the config file just to have my board_late_init() function called. This patch (not meant to be applied mainstram, jsut for discussion) tries to simplify and make more readable the code in lib_arm/board.c. If this is considered useful it can be done more seriously to all platforms, and allow over time to remove defines in the class of BOARD_LATE_INIT. A serious reordering will definitely need more time, and this is just a quick hack to show the idea; some things are suboptimal like the arm_pci_init() thing which has to remain an ifdef and should be fixed in a different way (I think all init function should return int and print their own messages, to simplify this factoring out, but again it's a matter of personal taste). About the use of weak, I first converted .a to .o, but then found it works nonetheless, and led functions are already weak ones in this file. Is the idea worth pursuing? Or does it conflich with other work in progress? --- lib_arm/board.c | 62 ++++++++++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 32 deletions(-) diff --git a/lib_arm/board.c b/lib_arm/board.c index a44d308..50fe74b 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -61,10 +61,26 @@ DECLARE_GLOBAL_DATA_PTR; ulong monitor_flash_len; -#ifdef CONFIG_HAS_DATAFLASH -extern int AT91F_DataflashInit(void); -extern void dataflash_print_info(void); -#endif +/* Some functions may be there or not. Use a weak placeholder to avoid ifdef */ +int __normal_nop(void) { return 0; } +void __void_nop(void) {} + +/* parts of init_sequence that may not be present */ +int arch_cpu_init(void) __attribute__((weak, alias("__normal_nop"))); +int interrupt_init(void) __attribute__((weak, alias("__normal_nop"))); +int print_cpuinfo(void) __attribute__((weak, alias("__normal_nop"))); +int checkboard(void) __attribute__((weak, alias("__normal_nop"))); + +/* other functions that appear later and depend on config items */ +int AT91F_DataflashInit(void) __attribute__((weak, alias("__normal_nop"))); +void dataflash_print_info(void) __attribute__((weak, alias("__void_nop"))); +void serial_initialize(void) __attribute__((weak, alias("__void_nop"))); +void onenand_init(void) __attribute__((weak, alias("__void_nop"))); +int drv_vfd_init(void) __attribute__((weak, alias("__normal_nop"))); +void api_init(void) __attribute__((weak, alias("__void_nop"))); +int arch_misc_init(void) __attribute__((weak, alias("__normal_nop"))); +int misc_init_r(void) __attribute__((weak, alias("__normal_nop"))); +int board_late_init(void) __attribute__((weak, alias("__normal_nop"))); #ifndef CONFIG_IDENT_STRING #define CONFIG_IDENT_STRING "" @@ -227,6 +243,11 @@ static int init_func_i2c (void) puts ("ready\n"); return (0); } +#else +static int init_func_i2c (void) +{ + return 0; +} #endif #if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI) @@ -236,6 +257,11 @@ static int arm_pci_init(void) pci_init(); return 0; } +#else +static int arm_pci_init(void) +{ + return 0; +} #endif /* CONFIG_CMD_PCI || CONFIG_PCI */ /* @@ -266,32 +292,20 @@ typedef int (init_fnc_t) (void); int print_cpuinfo (void); init_fnc_t *init_sequence[] = { -#if defined(CONFIG_ARCH_CPU_INIT) arch_cpu_init, /* basic arch cpu dependent setup */ -#endif board_init, /* basic board dependent setup */ -#if defined(CONFIG_USE_IRQ) interrupt_init, /* set up exceptions */ -#endif timer_init, /* initialize timer */ env_init, /* initialize environment */ init_baudrate, /* initialze baudrate settings */ serial_init, /* serial communications setup */ console_init_f, /* stage 1 init of console */ display_banner, /* say that we are here */ -#if defined(CONFIG_DISPLAY_CPUINFO) print_cpuinfo, /* display cpu info (and speed) */ -#endif -#if defined(CONFIG_DISPLAY_BOARDINFO) checkboard, /* display board info */ -#endif -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) init_func_i2c, -#endif dram_init, /* configure available RAM banks */ -#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI) arm_pci_init, -#endif display_dram_config, NULL, }; @@ -365,26 +379,18 @@ void start_armboot (void) nand_init(); /* go init the NAND */ #endif -#if defined(CONFIG_CMD_ONENAND) onenand_init(); -#endif -#ifdef CONFIG_HAS_DATAFLASH AT91F_DataflashInit(); dataflash_print_info(); -#endif /* initialize environment */ env_relocate (); -#ifdef CONFIG_VFD /* must do this after the framebuffer is allocated */ drv_vfd_init(); -#endif /* CONFIG_VFD */ -#ifdef CONFIG_SERIAL_MULTI serial_initialize(); -#endif /* IP Address */ gd->bd->bi_ip_addr = getenv_IPaddr ("ipaddr"); @@ -393,21 +399,15 @@ 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_ARCH_MISC_INIT) /* miscellaneous arch dependent initialisations */ arch_misc_init (); -#endif -#if defined(CONFIG_MISC_INIT_R) /* miscellaneous platform dependent initialisations */ misc_init_r (); -#endif /* enable exceptions */ enable_interrupts (); @@ -447,9 +447,7 @@ extern void davinci_eth_set_mac_addr (const u_int8_t *addr); } #endif -#ifdef BOARD_LATE_INIT board_late_init (); -#endif #ifdef CONFIG_GENERIC_MMC puts ("MMC: "); -- 1.6.0.2

2 1

[U-Boot] [PATCH] Using I/O accessor instead of volatile pointers in SMC911x driver
by Matthias Weisser 23 Jul '09

23 Jul '09

Volatile pointer usage caused lockup with arm-gcc 4.3.2 Using I/O accessor fixed that. Signed-off-by: Matthias Weisser <matthias.weisser(a)graf-syteco.de> --- drivers/net/smc911x.h | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index 80d2ce0..877b905 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h @@ -26,6 +26,7 @@ #define _SMC911X_H_ #include <linux/types.h> +#include <asm/io.h> #if defined (CONFIG_DRIVER_SMC911X_32_BIT) && \ defined (CONFIG_DRIVER_SMC911X_16_BIT) @@ -36,25 +37,29 @@ #if defined (CONFIG_DRIVER_SMC911X_32_BIT) static inline u32 __smc911x_reg_read(u32 addr) { - return *(volatile u32*)addr; + return readl(addr); } u32 smc911x_reg_read(u32 addr) __attribute__((weak, alias("__smc911x_reg_read"))); static inline void __smc911x_reg_write(u32 addr, u32 val) { - *(volatile u32*)addr = val; + writel(val, addr); } void smc911x_reg_write(u32 addr, u32 val) __attribute__((weak, alias("__smc911x_reg_write"))); #elif defined (CONFIG_DRIVER_SMC911X_16_BIT) static inline u32 smc911x_reg_read(u32 addr) { - volatile u16 *addr_16 = (u16 *)addr; - return ((*addr_16 & 0x0000ffff) | (*(addr_16 + 1) << 16)); + u32 res; + + res = readw(addr) & 0xFFFF; + res |= ((u32)(readw(addr + 2) & 0xFFFF) << 16); + + return res; } static inline void smc911x_reg_write(u32 addr, u32 val) { - *(volatile u16*)addr = (u16)val; - *(volatile u16*)(addr + 2) = (u16)(val >> 16); + writew(val & 0xFFFF, addr); + writew(val >> 16, addr + 2); } #else #error "SMC911X: undefined bus width" -- 1.5.6.3

4 3

[U-Boot] [PATCH] Blackfin: restore EVT1 handling in linker script
by Mike Frysinger 23 Jul '09

23 Jul '09

Sadly, the Blackfin linker script unification lost a small #ifdef logic needed on older parts. Restore that CONFIG_BFIN_BOOTROM_USES_EVT1 logic. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- lib_blackfin/u-boot.lds.S | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/lib_blackfin/u-boot.lds.S b/lib_blackfin/u-boot.lds.S index 4755153..3604b78 100644 --- a/lib_blackfin/u-boot.lds.S +++ b/lib_blackfin/u-boot.lds.S @@ -46,12 +46,19 @@ # define L1_DATA_B_SRAM_SIZE 0 #endif +/* The 0xC offset is so we don't clobber the tiny LDR jump block. */ +#ifdef CONFIG_BFIN_BOOTROM_USES_EVT1 +# define L1_CODE_ORIGIN L1_INST_SRAM +#else +# define L1_CODE_ORIGIN L1_INST_SRAM + 0xC +#endif + OUTPUT_ARCH(bfin) MEMORY { ram : ORIGIN = CONFIG_SYS_MONITOR_BASE, LENGTH = CONFIG_SYS_MONITOR_LEN - l1_code : ORIGIN = L1_INST_SRAM, LENGTH = L1_INST_SRAM_SIZE + l1_code : ORIGIN = L1_CODE_ORIGIN, LENGTH = L1_INST_SRAM_SIZE l1_data : ORIGIN = L1_DATA_B_SRAM, LENGTH = L1_DATA_B_SRAM_SIZE } -- 1.6.3.3

1 0

[U-Boot] [PATCH] Less verbose output when loading vxworks 6.x images
by Niklaus Giger 23 Jul '09

23 Jul '09

Loading vxWorks 5.x images resulted just into 3 or 4 lines of output. With vxWorks 6.x and the new GCC it emits about 30 lines, which is far too noisy in my opinion. Signed-off-by: Niklaus Giger <niklaus.giger(a)member.fsf.org> --- common/cmd_elf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/common/cmd_elf.c b/common/cmd_elf.c index abec7dd..0842ce9 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -286,6 +286,7 @@ unsigned long load_elf_image (unsigned long addr) continue; } +#ifdef DEBUG if (strtab) { printf ("%sing %s @ 0x%08lx (%ld bytes)\n", (shdr->sh_type == SHT_NOBITS) ? @@ -294,6 +295,7 @@ unsigned long load_elf_image (unsigned long addr) (unsigned long) shdr->sh_addr, (long) shdr->sh_size); } +#endif if (shdr->sh_type == SHT_NOBITS) { memset ((void *)shdr->sh_addr, 0, shdr->sh_size); -- 1.6.3.3

3 2

[U-Boot] [PATCH] autoconf.mk: include before config.mk for top level files
by Mike Frysinger 23 Jul '09

23 Jul '09

By including autoconf.mk before config.mk, all top level files can use any config options it sets up (like <arch>_config.mk) or the Makefile itself without being forced to use lazy evaluation. --- Makefile | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 25a6254..69037b4 100644 --- a/Makefile +++ b/Makefile @@ -147,6 +147,13 @@ SUBDIRS = tools \ ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk)) +# Include autoconf.mk before config.mk so that the config options are available +# to all top level build files. We need the dummy all: target to prevent the +# dependency target in autoconf.mk.dep from being the default. +all: +sinclude $(obj)include/autoconf.mk.dep +sinclude $(obj)include/autoconf.mk + # load ARCH, BOARD, and CPU configuration include $(obj)include/config.mk export ARCH CPU BOARD VENDOR SOC @@ -440,9 +447,6 @@ $(obj)include/autoconf.mk: $(obj)include/config.h sed -n -f tools/scripts/define2mk.sed > $@.tmp && \ mv $@.tmp $@ -sinclude $(obj)include/autoconf.mk.dep -sinclude $(obj)include/autoconf.mk - ######################################################################### else # !config.mk all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ -- 1.6.3.3

2 3

[U-Boot] [PATCH] export SPI functions to standalone apps
by Mike Frysinger 23 Jul '09

23 Jul '09

Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- common/exports.c | 8 ++++++++ include/_exports.h | 8 ++++++++ include/exports.h | 3 ++- 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/common/exports.c b/common/exports.c index ec4656b..b3b6e1f 100644 --- a/common/exports.c +++ b/common/exports.c @@ -38,4 +38,12 @@ void jumptable_init (void) gd->jt[XF_i2c_write] = (void *) i2c_write; gd->jt[XF_i2c_read] = (void *) i2c_read; #endif +#ifdef CONFIG_CMD_SPI + gd->jt[XF_spi_init] = (void *) spi_init; + gd->jt[XF_spi_setup_slave] = (void *) spi_setup_slave; + gd->jt[XF_spi_free_slave] = (void *) spi_free_slave; + gd->jt[XF_spi_claim_bus] = (void *) spi_claim_bus; + gd->jt[XF_spi_release_bus] = (void *) spi_release_bus; + gd->jt[XF_spi_xfer] = (void *) spi_xfer; +#endif } diff --git a/include/_exports.h b/include/_exports.h index af43885..2ff95cf 100644 --- a/include/_exports.h +++ b/include/_exports.h @@ -24,3 +24,11 @@ EXPORT_FUNC(strcmp) EXPORT_FUNC(i2c_write) EXPORT_FUNC(i2c_read) #endif +#ifdef CONFIG_CMD_SPI +EXPORT_FUNC(spi_init) +EXPORT_FUNC(spi_setup_slave) +EXPORT_FUNC(spi_free_slave) +EXPORT_FUNC(spi_claim_bus) +EXPORT_FUNC(spi_release_bus) +EXPORT_FUNC(spi_xfer) +#endif diff --git a/include/exports.h b/include/exports.h index 0620e9e..16ea03a 100644 --- a/include/exports.h +++ b/include/exports.h @@ -33,6 +33,7 @@ void forceenv (char *varname, char *varvalue); int i2c_write (uchar, uint, int , uchar* , int); int i2c_read (uchar, uint, int , uchar* , int); #endif +#include <spi.h> void app_startup(char **); @@ -46,7 +47,7 @@ enum { XF_MAX }; -#define XF_VERSION 4 +#define XF_VERSION 5 #if defined(CONFIG_I386) extern gd_t *global_data; -- 1.6.3.3

3 3

[U-Boot] [PATCH] Remove static declaration from gunzip_bmp()
by Mark Jackson 23 Jul '09

23 Jul '09

This patch removes the static declaration from gunzip_bmp() Without it, the gunzip_bmp() function is not visible to common/lcd.c and fails to compile with an error. Signed-off-by: Mark Jackson <mpfj(a)mimc.co.uk> --- common/cmd_bmp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index fc8462e..27d5896 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -46,7 +46,7 @@ int gunzip(void *, int, unsigned char *, unsigned long *); * didn't contain a valid BMP signature. */ #ifdef CONFIG_VIDEO_BMP_GZIP -static bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp) +bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp) { void *dst; unsigned long len; @@ -85,7 +85,7 @@ static bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp) return bmp; } #else -static bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp) +bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp) { return NULL; }

2 1

[U-Boot] [PATCH] cmd_tsi148: General cleanup
by ptyser＠xes-inc.com 23 Jul '09

23 Jul '09

From: Peter Tyser <ptyser(a)gmail.com> - Fix command help message - Disable DEBUG by default - Fix whitespace issues - Fix lines > 80 characters Signed-off-by: Peter Tyser <ptyser(a)gmail.com> --- common/cmd_tsi148.c | 85 ++++++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 41 deletions(-) diff --git a/common/cmd_tsi148.c b/common/cmd_tsi148.c index 222938c..f2097fd 100644 --- a/common/cmd_tsi148.c +++ b/common/cmd_tsi148.c @@ -24,8 +24,6 @@ * MA 02111-1307 USA */ -#define DEBUG - #include <common.h> #include <command.h> #include <malloc.h> @@ -40,10 +38,10 @@ typedef struct _TSI148_DEV TSI148_DEV; struct _TSI148_DEV { - int bus; - pci_dev_t busdevfn; - TSI148 *uregs; - unsigned int pci_bs; + int bus; + pci_dev_t busdevfn; + TSI148 *uregs; + unsigned int pci_bs; }; static TSI148_DEV *dev; @@ -84,11 +82,12 @@ int tsi148_init(void) debug("Tsi148: Base : %p\n", dev->uregs); - /* check mapping */ - debug("Tsi148: Read via mapping, PCI_ID = %08X\n", readl(&dev->uregs->pci_id)); - if (((PCI_DEVICE << 16) | PCI_VENDOR) != readl(&dev->uregs->pci_id)) { + /* check mapping */ + debug("Tsi148: Read via mapping, PCI_ID = %08X\n", + readl(&dev->uregs->pci_id)); + if (((PCI_DEVICE << 16) | PCI_VENDOR) != readl(&dev->uregs->pci_id)) { printf("Tsi148: Cannot read PCI-ID via Mapping: %08x\n", - readl(&dev->uregs->pci_id)); + readl(&dev->uregs->pci_id)); result = -1; goto break_30; } @@ -106,10 +105,12 @@ int tsi148_init(void) /* Tsi148 VME timeout etc */ __raw_writel(htonl(0x00000084), &dev->uregs->vctrl); +#ifdef DEBUG if ((__raw_readl(&dev->uregs->vstat) & 0x00000100) != 0) - debug("Tsi148: System Controller!\n"); + printf("Tsi148: System Controller!\n"); else - debug("Tsi148: Not System Controller!\n"); + printf("Tsi148: Not System Controller!\n"); +#endif /* * Lets turn off interrupts @@ -126,7 +127,7 @@ int tsi148_init(void) __raw_writel(htonl(0x00000000), &dev->uregs->intm2); eieio(); - val = __raw_readl(&dev->uregs->vstat); + val = __raw_readl(&dev->uregs->vstat); val &= ~(0x00004000); __raw_writel(val, &dev->uregs->vstat); eieio(); @@ -147,7 +148,8 @@ int tsi148_init(void) /* * Create pci slave window (access: pci -> vme) */ -int tsi148_pci_slave_window(unsigned int pciAddr, unsigned int vmeAddr, int size, int vam, int vdw) +int tsi148_pci_slave_window(unsigned int pciAddr, unsigned int vmeAddr, + int size, int vam, int vdw) { int result, i; unsigned int ctl = 0; @@ -172,13 +174,12 @@ int tsi148_pci_slave_window(unsigned int pciAddr, unsigned int vmeAddr, int size printf("Tsi148: Pci addr %08x\n", pciAddr); - - __raw_writel(htonl(pciAddr) , &dev->uregs->outbound[i].otsal); - __raw_writel(0x00000000 , &dev->uregs->outbound[i].otsau); + __raw_writel(htonl(pciAddr), &dev->uregs->outbound[i].otsal); + __raw_writel(0x00000000, &dev->uregs->outbound[i].otsau); __raw_writel(htonl(pciAddr + size), &dev->uregs->outbound[i].oteal); - __raw_writel(0x00000000 , &dev->uregs->outbound[i].oteau); + __raw_writel(0x00000000, &dev->uregs->outbound[i].oteau); __raw_writel(htonl(vmeAddr - pciAddr), &dev->uregs->outbound[i].otofl); - __raw_writel(0x00000000 , &dev->uregs->outbound[i].otofu); + __raw_writel(0x00000000, &dev->uregs->outbound[i].otofu); switch (vam & VME_AM_Axx) { case VME_AM_A16: @@ -213,7 +214,7 @@ int tsi148_pci_slave_window(unsigned int pciAddr, unsigned int vmeAddr, int size break; } - ctl |= 0x80040000; /* enable, no prefetch */ + ctl |= 0x80040000; /* enable, no prefetch */ __raw_writel(htonl(ctl), &dev->uregs->outbound[i].otat); @@ -272,7 +273,8 @@ unsigned int tsi148_eval_vam(int vam) /* * Create vme slave window (access: vme -> pci) */ -int tsi148_vme_slave_window(unsigned int vmeAddr, unsigned int pciAddr, int size, int vam) +int tsi148_vme_slave_window(unsigned int vmeAddr, unsigned int pciAddr, + int size, int vam) { int result, i; unsigned int ctl = 0; @@ -306,13 +308,13 @@ int tsi148_vme_slave_window(unsigned int vmeAddr, unsigned int pciAddr, int size __raw_writel(0x00000000, &dev->uregs->inbound[i].itofu); ctl = tsi148_eval_vam(vam); - ctl |= 0x80000000; /* enable */ + ctl |= 0x80000000; /* enable */ __raw_writel(htonl(ctl), &dev->uregs->inbound[i].itat); debug("Tsi148: window-addr =%p\n", &dev->uregs->inbound[i].itsau); debug("Tsi148: vme slave window[%d] attr =%08x\n", - i, ntohl(__raw_readl(&dev->uregs->inbound[i].itat))) ; + i, ntohl(__raw_readl(&dev->uregs->inbound[i].itat))); debug("Tsi148: vme slave window[%d] start =%08x\n", i, ntohl(__raw_readl(&dev->uregs->inbound[i].itsal))); debug("Tsi148: vme slave window[%d] end =%08x\n", @@ -339,12 +341,12 @@ int tsi148_vme_gcsr_window(unsigned int vmeAddr, int vam) if (NULL == dev) { result = 1; } else { - __raw_writel(htonl(vmeAddr), &dev->uregs->gbal); - __raw_writel(0x00000000, &dev->uregs->gbau); + __raw_writel(htonl(vmeAddr), &dev->uregs->gbal); + __raw_writel(0x00000000, &dev->uregs->gbau); - ctl = tsi148_eval_vam(vam); - ctl |= 0x00000080; /* enable */ - __raw_writel(htonl(ctl), &dev->uregs->gcsrat); + ctl = tsi148_eval_vam(vam); + ctl |= 0x00000080; /* enable */ + __raw_writel(htonl(ctl), &dev->uregs->gcsrat); } return result; @@ -363,17 +365,16 @@ int tsi148_vme_crcsr_window(unsigned int vmeAddr) if (NULL == dev) { result = 1; } else { - __raw_writel(htonl(vmeAddr), &dev->uregs->crol); - __raw_writel(0x00000000, &dev->uregs->crou); + __raw_writel(htonl(vmeAddr), &dev->uregs->crol); + __raw_writel(0x00000000, &dev->uregs->crou); - ctl = 0x00000080; /* enable */ - __raw_writel(htonl(ctl), &dev->uregs->crat); + ctl = 0x00000080; /* enable */ + __raw_writel(htonl(ctl), &dev->uregs->crat); } return result; } - /* * Create vme slave window (access: vme -> crg) */ @@ -387,12 +388,12 @@ int tsi148_vme_crg_window(unsigned int vmeAddr, int vam) if (NULL == dev) { result = 1; } else { - __raw_writel(htonl(vmeAddr), &dev->uregs->cbal); - __raw_writel(0x00000000, &dev->uregs->cbau); + __raw_writel(htonl(vmeAddr), &dev->uregs->cbal); + __raw_writel(0x00000000, &dev->uregs->cbau); - ctl = tsi148_eval_vam(vam); - ctl |= 0x00000080; /* enable */ - __raw_writel(htonl(ctl), &dev->uregs->crgat); + ctl = tsi148_eval_vam(vam); + ctl |= 0x00000080; /* enable */ + __raw_writel(htonl(ctl), &dev->uregs->crgat); } return result; @@ -424,11 +425,13 @@ int do_tsi148(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) case 'c': if (strcmp(argv[1], "crg") == 0) { vam = addr2; - printf("Tsi148: Configuring VME CRG Window (VME->CRG):\n"); + printf("Tsi148: Configuring VME CRG Window " + "(VME->CRG):\n"); printf(" vme=%08lx vam=%02lx\n", addr1, vam); tsi148_vme_crg_window(addr1, vam); } else { - printf("Tsi148: Configuring VME CR/CSR Window (VME->CR/CSR):\n"); + printf("Tsi148: Configuring VME CR/CSR Window " + "(VME->CR/CSR):\n"); printf(" pci=%08lx\n", addr1); tsi148_vme_crcsr_window(addr1); } @@ -463,7 +466,7 @@ int do_tsi148(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD( tsi148, 8, 1, do_tsi148, - "tsi148 - initialize and configure Turndra Tsi148\n", + "initialize and configure Turndra Tsi148\n", "init\n" " - initialize tsi148\n" "tsi148 vme [vme_addr] [pci_addr] [size] [vam]\n" -- 1.6.2-rc2.GIT

3 2

[U-Boot] [PATCH] Bugfix: mpc512x_fec MII accesses fail after ethernet transfers
by Thomas Dörfler 23 Jul '09

23 Jul '09

The mpc512x FEC network driver resets the FEC before transferring packets. With this reset, the FEC clears the previous setting of MII transfer speed. This patch ensures, that it is set again to a reasonable value after a FEC reset. Signed-off-by: Thomas Doerfler <Thomas.Doerfler(a)embedded-brains.de> -- diff --git a/drivers/net/mpc512x_fec.c b/drivers/net/mpc512x_fec.c index fb2c19a..f3d76ba 100644 --- a/drivers/net/mpc512x_fec.c +++ b/drivers/net/mpc512x_fec.c @@ -446,6 +446,19 @@ static void mpc512x_fec_halt (struct eth_device *dev) * wait at least 16 clock cycles */ udelay (10); + /* + * NOTE: reset will also clear the MII speed register + * we should reinitialize it ASAP + */ + if (fec->xcv_type != SEVENWIRE) { + /* + * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock + * and do not drop the Preamble. + */ + fec->eth->mii_speed = ((((gd->ips_clk / 1000000) / 5) + + 1) + << 1); + } #if (DEBUG & 0x3) printf ("Ethernet task stopped\n"); #endif -- -------------------------------------------- Embedded Brains GmbH Thomas Doerfler Obere Lagerstrasse 30 D-82178 Puchheim Germany email: Thomas.Doerfler(a)embedded-brains.de Phone: +49-89-18908079-2 Fax: +49-89-18908079-9

3 10

[U-Boot] [PATCH] unify HOST_CFLAGS and HOSTCFLAGS
by Mike Frysinger 23 Jul '09

23 Jul '09

The top build system sets up HOSTCFLAGS a bit and exports it, but other places use HOST_CFLAGS instead. Unify the two as HOSTCFLAGS so that the values stay in sync. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- Makefile | 2 +- board/fads/config.mk | 2 +- board/netstar/Makefile | 8 ++++---- board/spc1920/config.mk | 2 +- board/xilinx/ml300/Makefile | 2 +- board/xilinx/ppc405-generic/Makefile | 2 +- board/xilinx/ppc440-generic/Makefile | 2 +- cpu/ixp/npe/Makefile | 2 +- drivers/bios_emulator/Makefile | 2 +- drivers/net/sk98lin/Makefile | 2 +- rules.mk | 2 +- tools/Makefile | 12 ++++++------ tools/gdb/Makefile | 2 +- tools/imls/Makefile | 4 ++-- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index e427bc0..37a4564 100644 --- a/Makefile +++ b/Makefile @@ -469,7 +469,7 @@ $(obj)include/autoconf.mk.dep: $(obj)include/config.h include/common.h @$(XECHO) Generating $@ ; \ set -e ; \ : Generate the dependancies ; \ - $(CC) -x c -DDO_DEPS_ONLY -M $(HOST_CFLAGS) $(CPPFLAGS) \ + $(CC) -x c -DDO_DEPS_ONLY -M $(HOSTCFLAGS) $(CPPFLAGS) \ -MQ $(obj)include/autoconf.mk include/common.h > $@ $(obj)include/autoconf.mk: $(obj)include/config.h diff --git a/board/fads/config.mk b/board/fads/config.mk index 621b9a2..6106090 100644 --- a/board/fads/config.mk +++ b/board/fads/config.mk @@ -30,5 +30,5 @@ TEXT_BASE = 0xFE000000 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/fads -HOST_CFLAGS += -I$(TOPDIR)/board/fads +HOSTCFLAGS += -I$(TOPDIR)/board/fads HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/fads diff --git a/board/netstar/Makefile b/board/netstar/Makefile index 91bac38..d5fe819 100644 --- a/board/netstar/Makefile +++ b/board/netstar/Makefile @@ -42,7 +42,7 @@ LOAD_ADDR = 0x10400000 LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds lnk = $(if $(obj),$(obj),.) -HOST_CFLAGS = -Wall -pedantic -I$(TOPDIR)/include +HOSTCFLAGS = -Wall -pedantic -I$(TOPDIR)/include all: $(obj).depend $(LIB) $(obj)eeprom.srec $(obj)eeprom.bin \ $(obj)crcek.srec $(obj)crcek.bin $(obj)crcit @@ -70,13 +70,13 @@ $(obj)crcek.bin: $(obj)crcek.srec $(OBJCOPY) -I srec -O binary $< $@ 2>/dev/null $(obj)crcit: $(obj)crcit.o $(obj)crc32.o - $(HOSTCC) $(HOST_CFLAGS) -o $@ $^ + $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ $(obj)crcit.o: crcit.c - $(HOSTCC) $(HOST_CFLAGS) -o $@ -c $< + $(HOSTCC) $(HOSTCFLAGS) -o $@ -c $< $(obj)crc32.o: $(SRCTREE)/lib_generic/crc32.c - $(HOSTCC) $(HOST_CFLAGS) -DUSE_HOSTCC -o $@ -c $< + $(HOSTCC) $(HOSTCFLAGS) -DUSE_HOSTCC -o $@ -c $< clean: rm -f $(SOBJS) $(OBJS) $(obj)eeprom $(obj)eeprom.srec \ diff --git a/board/spc1920/config.mk b/board/spc1920/config.mk index e361694..8dacc17 100644 --- a/board/spc1920/config.mk +++ b/board/spc1920/config.mk @@ -31,5 +31,5 @@ #TEXT_BASE = 0xFE000000 TEXT_BASE = 0xFFF00000 PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/spc1920 -HOST_CFLAGS += -I$(TOPDIR)/board/spc1920 +HOSTCFLAGS += -I$(TOPDIR)/board/spc1920 HOST_ENVIRO_CFLAGS += -I$(TOPDIR)/board/spc1920 diff --git a/board/xilinx/ml300/Makefile b/board/xilinx/ml300/Makefile index 9215d77..b8a2d64 100644 --- a/board/xilinx/ml300/Makefile +++ b/board/xilinx/ml300/Makefile @@ -30,7 +30,7 @@ endif INCS := -I../common -I../xilinx_enet -I../xilinx_iic CFLAGS += $(INCS) -HOST_CFLAGS += $(INCS) +HOSTCFLAGS += $(INCS) LIB = $(obj)lib$(BOARD).a diff --git a/board/xilinx/ppc405-generic/Makefile b/board/xilinx/ppc405-generic/Makefile index b56bb49..4e87e4b 100644 --- a/board/xilinx/ppc405-generic/Makefile +++ b/board/xilinx/ppc405-generic/Makefile @@ -31,7 +31,7 @@ endif INCS := CFLAGS += $(INCS) -HOST_CFLAGS += $(INCS) +HOSTCFLAGS += $(INCS) LIB = $(obj)lib$(BOARD).a diff --git a/board/xilinx/ppc440-generic/Makefile b/board/xilinx/ppc440-generic/Makefile index bf0a6ba..11a8f69 100644 --- a/board/xilinx/ppc440-generic/Makefile +++ b/board/xilinx/ppc440-generic/Makefile @@ -31,7 +31,7 @@ endif INCS := CFLAGS += $(INCS) -HOST_CFLAGS += $(INCS) +HOSTCFLAGS += $(INCS) LIB = $(obj)lib$(BOARD).a diff --git a/cpu/ixp/npe/Makefile b/cpu/ixp/npe/Makefile index f4f97bd..8fefd29 100644 --- a/cpu/ixp/npe/Makefile +++ b/cpu/ixp/npe/Makefile @@ -27,7 +27,7 @@ LIB := $(obj)libnpe.a LOCAL_CFLAGS += -I$(TOPDIR)/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux CFLAGS += $(LOCAL_CFLAGS) -HOST_CFLAGS += $(LOCAL_CFLAGS) +HOSTCFLAGS += $(LOCAL_CFLAGS) COBJS-$(CONFIG_IXP4XX_NPE) := npe.o \ miiphy.o \ diff --git a/drivers/bios_emulator/Makefile b/drivers/bios_emulator/Makefile index c73da97..dd9c102 100644 --- a/drivers/bios_emulator/Makefile +++ b/drivers/bios_emulator/Makefile @@ -22,7 +22,7 @@ EXTRA_CFLAGS += -I. -I./include -I$(TOPDIR)/include \ -D__PPC__ -D__BIG_ENDIAN__ CFLAGS += $(EXTRA_CFLAGS) -HOST_CFLAGS += $(EXTRA_CFLAGS) +HOSTCFLAGS += $(EXTRA_CFLAGS) all: $(LIB) diff --git a/drivers/net/sk98lin/Makefile b/drivers/net/sk98lin/Makefile index f1bc4a7..4a3ead3 100644 --- a/drivers/net/sk98lin/Makefile +++ b/drivers/net/sk98lin/Makefile @@ -90,7 +90,7 @@ endif EXTRA_CFLAGS += -I. -DSK_USE_CSUM $(DBGDEF) CFLAGS += $(EXTRA_CFLAGS) -HOST_CFLAGS += $(EXTRA_CFLAGS) +HOSTCFLAGS += $(EXTRA_CFLAGS) all: $(LIB) diff --git a/rules.mk b/rules.mk index a77451b..6f999dd 100644 --- a/rules.mk +++ b/rules.mk @@ -29,7 +29,7 @@ $(obj).depend: $(src)Makefile $(TOPDIR)/config.mk $(SRCS) @rm -f $@ @for f in $(SRCS); do \ g=`basename $$f | sed -e 's/$.*$\.\w/\1.o/'`; \ - $(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $(obj)$$g $$f >> $@ ; \ + $(CC) -M $(HOSTCFLAGS) $(CPPFLAGS) -MQ $(obj)$$g $$f >> $@ ; \ done ######################################################################### diff --git a/tools/Makefile b/tools/Makefile index 5c764bb..b5a1e39 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -36,18 +36,18 @@ TOOLSUBDIRS = # -multiply_defined suppress option to turn off this error. # -HOST_CFLAGS = -Wall +HOSTCFLAGS = -Wall HOST_LDFLAGS = ifeq ($(HOSTOS)-$(HOSTARCH),darwin-ppc) -HOST_CFLAGS += -traditional-cpp +HOSTCFLAGS += -traditional-cpp HOST_LDFLAGS += -multiply_defined suppress else -HOST_CFLAGS += -pedantic +HOSTCFLAGS += -pedantic endif ifeq ($(HOSTOS),cygwin) -HOST_CFLAGS += -ansi +HOSTCFLAGS += -ansi endif # @@ -148,7 +148,7 @@ CPPFLAGS = -idirafter $(SRCTREE)/include \ -I $(SRCTREE)/tools \ -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \ -D__KERNEL_STRICT_NAMES -CFLAGS = $(HOST_CFLAGS) $(CPPFLAGS) -O +CFLAGS = $(HOSTCFLAGS) $(CPPFLAGS) -O # No -pedantic switch to avoid libfdt compilation warnings FIT_CFLAGS = -Wall $(CPPFLAGS) -O @@ -227,7 +227,7 @@ else $(MAKE) \ HOSTOS=$(HOSTOS) \ HOSTARCH=$(HOSTARCH) \ - HOST_CFLAGS="$(HOST_CFLAGS)" \ + HOSTCFLAGS="$(HOSTCFLAGS)" \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \ -C $$dir || exit 1 ; \ done diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile index c44cc8a..0a5687d 100644 --- a/tools/gdb/Makefile +++ b/tools/gdb/Makefile @@ -38,7 +38,7 @@ BINS := $(addprefix $(obj),$(BINS)) # Use native tools and options # CPPFLAGS = -I$(BFD_ROOT_DIR)/include -CFLAGS = $(HOST_CFLAGS) -O $(CPPFLAGS) +CFLAGS = $(HOSTCFLAGS) -O $(CPPFLAGS) CC = $(HOSTCC) MAKEDEPEND = makedepend diff --git a/tools/imls/Makefile b/tools/imls/Makefile index 04ab31a..59b928c 100644 --- a/tools/imls/Makefile +++ b/tools/imls/Makefile @@ -19,7 +19,7 @@ include $(TOPDIR)/config.mk -HOST_CFLAGS = -Wall -pedantic +HOSTCFLAGS = -Wall -pedantic # Generated executable files BIN_FILES-y += imls @@ -57,7 +57,7 @@ CPPFLAGS = -idirafter $(SRCTREE)/include \ -I $(SRCTREE)/libfdt \ -I $(SRCTREE)/tools \ -DUSE_HOSTCC -D__KERNEL_STRICT_NAMES -CFLAGS = $(HOST_CFLAGS) $(CPPFLAGS) -O +CFLAGS = $(HOSTCFLAGS) $(CPPFLAGS) -O # No -pedantic switch to avoid libfdt compilation warnings FIT_CFLAGS = -Wall $(CPPFLAGS) -O -- 1.6.3.3

2 1