diff options
| author | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2009-10-08 13:24:39 -0400 |
|---|---|---|
| committer | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2009-10-08 13:24:39 -0400 |
| commit | f117c1244207ee257342803fb98b52d9b891a285 (patch) | |
| tree | 2b9b800c8c311bad905c849985e603b9499f5ea3 /board/sixnet | |
| parent | e60beb13cf0135dc71c541021487b5ccc4d269cb (diff) | |
This patch originally from LogicPD OMAP35x Release 1.6.1 Original Patch Name: u-boot-2009.03-beagleboard.patch
Diffstat (limited to 'board/sixnet')
| -rw-r--r-- | board/sixnet/sixnet.c | 11 | ||||
| -rw-r--r-- | board/sixnet/u-boot.lds | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c index 3ed581ec09e..4fcd84b6f03 100644 --- a/board/sixnet/sixnet.c +++ b/board/sixnet/sixnet.c @@ -264,6 +264,7 @@ int misc_init_r (void) char* e; int reg; bd_t *bd = gd->bd; + uchar enetaddr[6]; memctl->memc_or2 = NVRAM_OR_PRELIM; memctl->memc_br2 = NVRAM_BR_VALUE; @@ -315,13 +316,9 @@ int misc_init_r (void) * is present it gets a unique address, otherwise it * shares the FEC address. */ - s = getenv("eth1addr"); - if (s == NULL) - s = getenv("ethaddr"); - for (reg=0; reg<6; ++reg) { - bd->bi_enet1addr[reg] = s ? simple_strtoul(s, &e, 16) : 0; - if (s) - s = (*e) ? e+1 : e; + if (!eth_getenv_enetaddr("eth1addr", enetaddr)) { + eth_getenv_enetaddr("ethaddr", enetaddr); + eth_setenv_enetaddr("eth1addr", enetaddr); } return (0); diff --git a/board/sixnet/u-boot.lds b/board/sixnet/u-boot.lds index efa42445e82..bde981b3899 100644 --- a/board/sixnet/u-boot.lds +++ b/board/sixnet/u-boot.lds @@ -62,10 +62,8 @@ SECTIONS PROVIDE (etext = .); .rodata : { - *(.rodata) - *(.rodata1) - *(.rodata.str1.4) *(.eh_frame) + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } .fini : { *(.fini) } =0 .ctors : { *(.ctors) } |