May 2009 - U-Boot

[U-Boot] [PATCH] Schedule removal of non-CONFIG_NET_MULTI net driver API
by Ben Warren 15 May '09

15 May '09

This will make CONFIG_NET_MULTI the only net driver configuration and we'll be able to remove this option. Signed-off-by: Ben Warren <biggerbadderben(a)gmail.com> --- doc/feature-removal-schedule.txt | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/doc/feature-removal-schedule.txt b/doc/feature-removal-schedule.txt index d966abb..deb89ed 100644 --- a/doc/feature-removal-schedule.txt +++ b/doc/feature-removal-schedule.txt @@ -7,6 +7,25 @@ file. --------------------------- +What: CONFIG_NET_MULTI option +When: Release 2009-11 + +Why: U-boot currently implements two network driver APIs. New drivers with + the older-style implementation have not been accepted for a while, and + this parallel system makes the code confusing and hard to augment. + + All existing in-tree boards will be converted to use CONFIG_NET_MULTI + over the span of two releases (2009-07 and 2009-09). + In the 2009-11 release, all code that is compiled when CONFIG_NET_MULTI + is not set will be removed, and all references to CONFIG_NET_MULTI + will be removed, effectively making it the only API. This should + provide ample time for out-of-tree users to adjust, and for tools on + all architectures to be made to work with weak functions. + +Who: Ben Warren <biggerbadderben(a)gmail.com> + +--------------------------- + What: "autoscr" command When: Release 2009-09 -- 1.5.6.3

4 4

[U-Boot] [PATCH] powerpc/inka4x0: Remove left-over ide reset code.
by Detlev Zundel 15 May '09

15 May '09

The pin which was used in preliminary versions of the board for ide reset is really connected to the rtc clock. Signed-off-by: Detlev Zundel <dzu(a)denx.de> --- board/inka4x0/inka4x0.c | 33 --------------------------------- include/configs/inka4x0.h | 1 - 2 files changed, 0 insertions(+), 34 deletions(-) diff --git a/board/inka4x0/inka4x0.c b/board/inka4x0/inka4x0.c index 7428b92..c645b05 100644 --- a/board/inka4x0/inka4x0.c +++ b/board/inka4x0/inka4x0.c @@ -274,36 +274,3 @@ void pci_init_board(void) pci_mpc5xxx_init(&hose); } #endif - -#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET) - -void init_ide_reset (void) -{ - volatile struct mpc5xxx_wu_gpio *wu_gpio = - (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO; - - debug ("init_ide_reset\n"); - - /* Configure PSC1_4 as GPIO output for ATA reset */ - setbits_8(&wu_gpio->enable, MPC5XXX_GPIO_WKUP_PSC1_4); - setbits_8(&wu_gpio->ddr, MPC5XXX_GPIO_WKUP_PSC1_4); - /* Deassert reset */ - setbits_8(&wu_gpio->dvo, MPC5XXX_GPIO_WKUP_PSC1_4); -} - -void ide_set_reset (int idereset) -{ - volatile struct mpc5xxx_wu_gpio *wu_gpio = - (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO; - - debug ("ide_reset(%d)\n", idereset); - - if (idereset) { - clrbits_8(&wu_gpio->dvo, MPC5XXX_GPIO_WKUP_PSC1_4); - /* Make a delay. MPC5200 spec says 25 usec min */ - udelay(500000); - } else { - setbits_8(&wu_gpio->dvo, MPC5XXX_GPIO_WKUP_PSC1_4); - } -} -#endif diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 5f06b09..46606ca 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -418,7 +418,6 @@ static inline void tws_data_config_output(unsigned output) #undef CONFIG_IDE_8xx_DIRECT /* Direct IDE not supported */ #undef CONFIG_IDE_LED /* LED for ide not supported */ -#define CONFIG_IDE_RESET /* reset for ide supported */ #define CONFIG_IDE_PREINIT #define CONFIG_SYS_IDE_MAXBUS 1 /* max. 1 IDE bus */ -- 1.6.0.6

3 4

[U-Boot] [PATCH] netloop: updates for NetLoop
by Heiko Schocher 15 May '09

15 May '09

Fix some issues introduced from commit: 2f70c49e5b9813635ad73666aa30f304c7fdeda9 suggested by Mike Frysinger. - added some comment for the env_id variable in common/cmd_nvedit.c - moved some variables in fn scope instead of file scope - NetInitLoop now static void Signed-off-by: Heiko Schocher <hs(a)denx.de> --- common/cmd_nvedit.c | 6 ++++++ net/eth.c | 5 ++--- net/net.c | 9 ++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 95eebb5..3caa841 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -75,6 +75,12 @@ DECLARE_GLOBAL_DATA_PTR; static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE; #define N_BAUDRATES (sizeof(baudrate_table) / sizeof(baudrate_table[0])) +/* + * This variable is incremented on each do_setenv (), so it can + * be used as an indication, if the environment has changed or not. + * So it is possible to reread an environment variable only if the + * environment was changed ... done so for example in NetInitLoop() + */ static int env_id = 1; int get_env_id (void) diff --git a/net/eth.c b/net/eth.c index 4bbf84b..a494912 100644 --- a/net/eth.c +++ b/net/eth.c @@ -57,9 +57,6 @@ int eth_setenv_enetaddr(char *name, const uchar *enetaddr) #if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) -static char *act = NULL; -static int env_changed_id = 0; - /* * CPU and board-specific Ethernet initializations. Aliased function * signals caller to move on @@ -471,6 +468,8 @@ void eth_try_another(int first_restart) #ifdef CONFIG_NET_MULTI void eth_set_current(void) { + static char *act = NULL; + static int env_changed_id = 0; struct eth_device* old_current; int env_id; diff --git a/net/net.c b/net/net.c index a89f6a0..a80c814 100644 --- a/net/net.c +++ b/net/net.c @@ -209,8 +209,6 @@ uchar NetArpWaitPacketBuf[PKTSIZE_ALIGN + PKTALIGN]; ulong NetArpWaitTimerStart; int NetArpWaitTry; -int env_changed_id = 0; - void ArpRequest (void) { int i; @@ -278,15 +276,16 @@ void ArpTimeoutCheck(void) } } -int +static void NetInitLoop(proto_t protocol) { + static int env_changed_id = 0; bd_t *bd = gd->bd; int env_id = get_env_id (); /* update only when the environment has changed */ if (env_changed_id == env_id) - return 0; + return; switch (protocol) { #if defined(CONFIG_CMD_NFS) @@ -347,7 +346,7 @@ NetInitLoop(proto_t protocol) break; } env_changed_id = env_id; - return 0; + return; } /**********************************************************************/ -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

5 15

[U-Boot] [PATCH] 82xx, ids8247: added ids8247 board to MAKEALL script
by Heiko Schocher 15 May '09

15 May '09

Signed-off-by: Heiko Schocher <hs(a)denx.de> --- MAKEALL | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/MAKEALL b/MAKEALL index e4eb42b..e9bcf92 100755 --- a/MAKEALL +++ b/MAKEALL @@ -284,6 +284,7 @@ LIST_824x=" \ debris \ eXalion \ HIDDEN_DRAGON \ + IDS8247 \ linkstation_HGLAN \ MOUSSE \ MUSENKI \ -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] ARM pull Request
by Jean-Christophe PLAGNIOL-VILLARD 15 May '09

15 May '09

Hi Wolfgang, Please pull The following changes since commit f8ddcd58221cab63dd25c2324dd2032487f748b1: Graf Yang (1): Blackfin: bf518f-ezbrd: reset ethernet PHY during init are available in the git repository at: git://git.denx.de/u-boot-arm.git master Detlev Zundel (1): arm/imx31_phycore: Fix bi_arch_number Sascha Hauer (1): remove myself as phycore/litekit Maintainer Sergey Lapin (1): AFEB9260 network fix MAINTAINERS | 5 ----- board/afeb9260/afeb9260.c | 2 +- board/imx31_phycore/imx31_phycore.c | 4 ++-- cpu/arm926ejs/at91/at91sam9260_macb.c | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) Best Regards, J.

2 1

[U-Boot] Please pull u-boot-ppc4xx/next
by Stefan Roese 15 May '09

15 May '09

Hi Wolfgang, please pull the latest change for ppc4xx/next: The following changes since commit fbe7eff021399175ef7d9d57f44145587c4e9a51: Mike Frysinger (1): tools/envcrc: add --binary option to export embedded env are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git next Stefan Roese (1): ppc4xx: Add Sequoia RAM-booting target Makefile | 11 +++ board/amcc/sequoia/init.S | 7 ++ board/amcc/sequoia/sdram.c | 3 +- board/amcc/sequoia/sequoia.c | 10 +++- board/amcc/sequoia/u-boot-ram.lds | 126 +++++++++++++++++++++++++++++++++++++ cpu/ppc4xx/start.S | 33 ++++++++-- include/configs/amcc-common.h | 11 +++ include/configs/sequoia.h | 30 +++++++-- 8 files changed, 215 insertions(+), 16 deletions(-) create mode 100644 board/amcc/sequoia/u-boot-ram.lds

2 1

[U-Boot] Memory problems on mpc8572ds
by Sebastian Andrzej Siewior 15 May '09

15 May '09

Hello, my mpc8572ds (2x 512 MiB ram) had initially u-boot 1.3.0-rc2 and I haven't notice any problems. Today I updated u-boot to v2009.03 because I was not able to boot current vanilla linux kernel in smp mode. Since then I experience random kernel opses. I thing it has something to do with memory setup. The settings in the ddr controller changed from (v1.3.0-rc2): - ddr->sdram_mode 0x00400a62; - ddr->sdram_data_init = 0x00000000; - ddr->sdram_cfg_2 = 0x04401000; to (v2009.03): - ddr->sdram_mode 0x00440a62 - ddr->sdram_data_init 0xdeadbeef - ddr->sdram_cfg_2 0x24401000 I cherry-picked commit 6a819783 aka "fsl-ddr: Fix two bugs in the ddr infrastructure" but nothing improved. Now I've picked v1.3.0-rc2 and linux v2.6.29. With that combination everything seems to work however I experience sometimes ICE while compiling. If I continue to compile from that point there is no ICE anymore so it does not look like a gcc bug to me. Any suggestions? Someone with similar problems? Sebastian

3 4

[U-Boot] [PATCH 1/4] net: extend the netdev to have a common way to set the hw mac address
by Jean-Christophe PLAGNIOL-VILLARD 15 May '09

15 May '09

init it at the eth_initialize this will allow to add later a hook to update the enetadd hw storage when it's updated in env or when the env is saved Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> Cc: Ben Warren <biggerbadderben(a)gmail.com> --- include/net.h | 2 ++ net/eth.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/net.h b/include/net.h index 5a1d36e..2ed6263 100644 --- a/include/net.h +++ b/include/net.h @@ -93,6 +93,7 @@ enum eth_state_t { }; struct eth_device { + int num; char name[NAMESIZE]; unsigned char enetaddr[6]; int iobase; @@ -105,6 +106,7 @@ struct eth_device { #ifdef CONFIG_MCAST_TFTP int (*mcast) (struct eth_device*, u32 ip, u8 set); #endif + int (*set_hw_enetaddr) (struct eth_device*, bd_t*); struct eth_device *next; void *priv; }; diff --git a/net/eth.c b/net/eth.c index c6fa5b9..99bb6c2 100644 --- a/net/eth.c +++ b/net/eth.c @@ -217,6 +217,8 @@ int eth_initialize(bd_t *bis) if (eth_number) puts (", "); + dev->num = eth_number; + printf("%s", dev->name); if (ethprime && strcmp (dev->name, ethprime) == 0) { @@ -240,6 +242,8 @@ int eth_initialize(bd_t *bis) } memcpy(dev->enetaddr, env_enetaddr, 6); + if(dev->set_hw_enetaddr) + dev->set_hw_enetaddr(dev, bis); } eth_number++; -- 1.6.1.3

8 36

[U-Boot] DDR2 configuration in MPC85xx
by Werner Nedel 15 May '09

15 May '09

Hi, I'm working on a mpc85xx board very similar to MPC8548CDS. I have 2 DIMMs and each one with it own spd eeprom and with only one chip select (cs0 and cs2). I'm trying to use two 1Gb DDR2s. My ddr configurations: /* DDR Setup */ #define CONFIG_VERY_BIG_RAM #define CONFIG_FSL_DDR2 #undef CONFIG_FSL_DDR_INTERACTIVE #define CONFIG_SPD_EEPROM /* Use SPD EEPROM for DDR setup*/ #define CONFIG_DDR_SPD #define CONFIG_DDR_DLL /* possible DLL fix needed */ #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER /* DDR controller or DMA? */ #define CONFIG_MEM_INIT_VALUE 0xDeadBeef #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE #define CONFIG_NUM_DDR_CONTROLLERS 2 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 /* I2C addresses of SPD EEPROMs */ #define SPD_EEPROM_ADDRESS1 0x51 /* CTLR 0 DIMM 0 */ #define SPD_EEPROM_ADDRESS2 0x53 /* CTLR 0 DIMM 1 */ Also, I'd changed my ddr.c as follow: for (i = 0; i < CONFIG_DIMM_SLOTS_PER_CTLR; i++) { if (ctrl_num == 0) get_spd(&(ctrl_dimms_spd[i]), SPD_EEPROM_ADDRESS1); if (ctrl_num == 1) get_spd(&(ctrl_dimms_spd[i]), SPD_EEPROM_ADDRESS2); } and removing the ctrl_num checks that avoid ctrl_num = 1 access (in ddr.c and ddr-gen2.c). My board hangs after initialize the DDR: I2C: ready DRAM: Initializing 4294963200M left unmapped DDR: 2 GB The tlb settings looks fine (debbug in setup_ddr_tlbs()): ram_tlb_address: 0x0, ram_tlb_address: 0x0, ram_tlb_index: 0x8, tlb_size: 0xa ram_tlb_address: 0x40000000, ram_tlb_address: 0x40000000, ram_tlb_index: 0x9, tlb_size: 0xa Am I missing some configuration? Thanks in advance, Werner Nedel.

3 7

[U-Boot] [PATCH] arm/imx31_phycore: Fix bi_arch_number
by Detlev Zundel 15 May '09

15 May '09

Signed-off-by: Detlev Zundel <dzu(a)denx.de> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> --- board/imx31_phycore/imx31_phycore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/imx31_phycore/imx31_phycore.c b/board/imx31_phycore/imx31_phycore.c index 93a5c40..92aba96 100644 --- a/board/imx31_phycore/imx31_phycore.c +++ b/board/imx31_phycore/imx31_phycore.c @@ -61,8 +61,8 @@ int board_init (void) mx31_gpio_mux(MUX_CSPI2_MOSI__I2C2_SCL); mx31_gpio_mux(MUX_CSPI2_MISO__I2C2_SDA); - gd->bd->bi_arch_number = 447; /* board id for linux */ - gd->bd->bi_boot_params = (0x80000100); /* adress of boot parameters */ + gd->bd->bi_arch_number = MACH_TYPE_PCM037; /* board id for linux */ + gd->bd->bi_boot_params = (0x80000100); /* adress of boot parameters */ return 0; } -- 1.6.0.6

3 6