Message ID | 20140211025424.GA31651@vega.jjdev.com |
---|---|
State | Changes Requested, archived |
Delegated to: | Andreas Bießmann |
Headers | show |
Dear johnd, SoB line missing! On 11.02.14 03:54, johnd wrote: > --- > arch/arm/include/asm/arch-at91/at91_rstc.h | 2 +- > include/configs/at91sam9260ek.h | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/include/asm/arch-at91/at91_rstc.h b/arch/arm/include/asm/arch-at91/at91_rstc.h > index a942342..59be96b 100644 > --- a/arch/arm/include/asm/arch-at91/at91_rstc.h > +++ b/arch/arm/include/asm/arch-at91/at91_rstc.h > @@ -25,7 +25,7 @@ typedef struct at91_rstc { > > #endif /* __ASSEMBLY__ */ > > -#define AT91_RSTC_KEY 0xA5000000 > +#define AT91_RSTC_KEY 0xA5 This change is wrong, the RSTC key is located in RSTC_CR[31:24], your change will move the constant to RSTC_CR[8:0]! > > #define AT91_RSTC_CR_PROCRST 0x00000001 > #define AT91_RSTC_CR_PERRST 0x00000004 > diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h > index 73917b0..53bef35 100644 > --- a/include/configs/at91sam9260ek.h > +++ b/include/configs/at91sam9260ek.h > @@ -177,6 +177,7 @@ > #define CONFIG_SYS_NO_FLASH 1 > > /* Ethernet */ > +#define CONFIG_MACB_SEARCH_PHY That change would be accepted, if the SoB line is available. > #define CONFIG_MACB 1 > #define CONFIG_RMII 1 > #define CONFIG_NET_RETRY_COUNT 20 > Best regards Andreas Bießmann
diff --git a/arch/arm/include/asm/arch-at91/at91_rstc.h b/arch/arm/include/asm/arch-at91/at91_rstc.h index a942342..59be96b 100644 --- a/arch/arm/include/asm/arch-at91/at91_rstc.h +++ b/arch/arm/include/asm/arch-at91/at91_rstc.h @@ -25,7 +25,7 @@ typedef struct at91_rstc { #endif /* __ASSEMBLY__ */ -#define AT91_RSTC_KEY 0xA5000000 +#define AT91_RSTC_KEY 0xA5 #define AT91_RSTC_CR_PROCRST 0x00000001 #define AT91_RSTC_CR_PERRST 0x00000004 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 73917b0..53bef35 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -177,6 +177,7 @@ #define CONFIG_SYS_NO_FLASH 1 /* Ethernet */ +#define CONFIG_MACB_SEARCH_PHY #define CONFIG_MACB 1 #define CONFIG_RMII 1 #define CONFIG_NET_RETRY_COUNT 20