[U-Boot-Users] [GIT PULL] AVR32 default ethaddr removal

[U-Boot-Users] [GIT PULL] AVR32 default ethaddr removal

[Haavard Skinnemoen]

Hi Wolfgang,

The following change will remove the default ethernet addresses from
the ATSTK1000 board config. Please pull

  git://www.denx.de/git/u-boot-avr32.git master

so that v1.3.0 can be released without this misfeature.

Haavard Skinnemoen (1):
      ATSTK1002: Remove default ethernet addresses

 include/configs/atstk1002.h |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 1809fc5..b33e26f 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -114,15 +114,10 @@
 #define CONFIG_AUTOBOOT_STOP_STR	" "
 
 /*
- * These are "locally administered ethernet addresses" generated by
- * ./tools/gen_eth_addr
- *
- * After booting the board for the first time, new addresses should be
- * generated and assigned to the environment variables "ethaddr" and
- * "eth1addr".
+ * After booting the board for the first time, new ethernet addresses
+ * should be generated and assigned to the environment variables
+ * "ethaddr" and "eth1addr". This is normally done during production.
  */
-#define CONFIG_ETHADDR			6a:87:71:14:cd:cb
-#define CONFIG_ETH1ADDR			ca:f8:15:e6:3e:e6
 #define CONFIG_OVERWRITE_ETHADDR_ONCE	1
 #define CONFIG_NET_MULTI		1
 

[U-Boot-Users] [GIT PULL] AVR32 default ethaddr removal

[Wolfgang Denk]

In message <20071101130356.0e689c92@dhcp-255-175.norway.atmel.com> you wrote:
> 
> The following change will remove the default ethernet addresses from
> the ATSTK1000 board config. Please pull
> 
>   git://www.denx.de/git/u-boot-avr32.git master
> 
> so that v1.3.0 can be released without this misfeature.
> 
> Haavard Skinnemoen (1):
>       ATSTK1002: Remove default ethernet addresses
> 
>  include/configs/atstk1002.h |   11 +++--------
>  1 files changed, 3 insertions(+), 8 deletions(-)

I cherry-picked that commit; pulling causes trouble. Please rebase
ASAP.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I see that Microsoft's campaign  to  destroy  all  knowledge  of  any
operating   environment   but  its  own  environment-of-the-year  has
succeeded in creating a generation of users who don't understand  the
concept of a shell...
            -- L. Peter Deutsch in <m0x5jNX-000R2UC@lamp.aladdin.com>

[U-Boot-Users] [GIT PULL] AVR32 default ethaddr removal

[Haavard Skinnemoen]

On Thu, 01 Nov 2007 23:30:57 +0100
Wolfgang Denk <wd@denx.de> wrote:

> >  include/configs/atstk1002.h |   11 +++--------
> >  1 files changed, 3 insertions(+), 8 deletions(-)  
> 
> I cherry-picked that commit; pulling causes trouble. Please rebase
> ASAP.

Huh? What kind of trouble? There's only a single commit in my master
that isn't in yours:

hskinnemoen at siona:~/work/git/u-boot$ git log --pretty=short --stat origin/master..avr32/master
commit 7d6ebe2d8e96611f3c0e664425ff0957e3934765
Author: Haavard Skinnemoen <hskinnemoen@atmel.com>

    ATSTK1002: Remove default ethernet addresses

 include/configs/atstk1002.h |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

hskinnemoen at siona:~/work/git/u-boot$ git remote show origin avr32
* remote origin
  URL: git://www.denx.de/git/u-boot.git
  Remote branch(es) merged with 'git pull' while on branch master
    master
  Tracked remote branches
    dzu at denx.de master origin testing-4xx_enet testing-NAND testing-USB wd at denx.de
* remote avr32
  URL: git://www.denx.de/git/u-boot-avr32.git
  Tracked remote branches
    dzu at denx.de for-upstream master ngw-board origin testing-4xx_enet testing-NAND testing-USB wd at denx.de

Am I using the wrong upstream repository or something?

I'll rebase tomorrow in case something funny is going on (this will
make my master identical to yours.) But it's seriously strange that such
an utterly trivial merge can cause any kind of trouble.

H?vard