km82xx mainlining
v2 cover km82xx mainlining
This series is the second effort of merging the Keymile boards support back into mainline.
This serie is a smaller serie based on the first patch serie:
http://lists.denx.de/pipermail/u-boot/2011-April/090013.html
The first large serie was split up to three independent series, which is easier to review and apply for the custodians.
This serie adds the km82xx specific parts of the serie. All changes here are only km relevant and should not affect other boards.
Holger Brunck (6):
km/common: remove hdlc_enet implementation powerpc/km82xx: cleanup coding style for mgcoge.c powerpc/km82xx: rename mgcoge files to km82xx powerpc/km82xx: add mgcoge3ne and remove mgcoge2ne support powerpc/km82xx: adapt CONFIG_SYSSYPCR to manual poweprc/km82xx: add board specific environment variable
Huber, Andreas (1):
powerpc/km82xx: rework DIP switch detection
MAINTAINERS | 2 +-
board/keymile/common/common.c | 9 +-
board/keymile/common/common.h | 84 ++++-
board/keymile/common/keymile_hdlc_enet.c | 620 --------------------------
board/keymile/{mgcoge => km82xx}/Makefile | 3 +-
board/keymile/km82xx/km82xx.c | 371 +++++++++++++++
board/keymile/mgcoge/mgcoge.c | 346 --------------
board/keymile/mgcoge/mgcoge_hdlc_enet.c | 276 ------------
boards.cfg | 4 +-
include/configs/km82xx-common.h | 29 +--
include/configs/mgcoge.h | 32 ++-
include/configs/{mgcoge2ne.h => mgcoge3ne.h} | 49 ++-
12 files changed, 528 insertions(+), 1297 deletions(-)
delete mode 100644 board/keymile/common/keymile_hdlc_enet.c
rename board/keymile/{mgcoge => km82xx}/Makefile (94%)
create mode 100644 board/keymile/km82xx/km82xx.c
delete mode 100644 board/keymile/mgcoge/mgcoge.c
delete mode 100644 board/keymile/mgcoge/mgcoge_hdlc_enet.c
rename include/configs/{mgcoge2ne.h => mgcoge3ne.h} (60%)PATCH v2 1/7 km/common: remove hdlc_enet implementation
The hdlc implementation for mgcoge was initially developed, but later on not used. Remove the C files, the references in mgcoge.c and the Makefile to decrease maintenance effort.
Signed-off-by Holger Brunck <[email protected]>
Signed-off-by Valentin Longchamp <[email protected]>
Acked-by Heiko Schocher <[email protected]>
cc Wolfgang Denk <[email protected]>
cc Detlev Zundel <[email protected]>
---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- no change in the content of this patch
board/keymile/common/common.c | 3 - board/keymile/common/common.h | 4 - board/keymile/common/keymile_hdlc_enet.c | 620 ------------------------------ board/keymile/mgcoge/Makefile | 3 +- board/keymile/mgcoge/mgcoge_hdlc_enet.c | 276 ------------- 5 files changed, 1 insertions(+), 905 deletions(-) delete mode 100644 board/keymile/common/keymile_hdlc_enet.c delete mode 100644 board/keymile/mgcoge/mgcoge_hdlc_enet.c
board/keymile/common/common.c +0 -3
@@ -677,9 +677,6 @@ int ethernet_present(void)int board_eth_init (bd_t *bis) { -#ifdef CONFIG_KEYMILE_HDLC_ENET - (void )keymile_hdlc_enet_initialize (bis); -#endif if (ethernet_present ())return cpu_eth_init (bis);
board/keymile/common/common.h +0 -4
@@ -46,10 +46,6 @@ struct km_bec_fpga {int ethernet_present (void );int ivm_read_eeprom (void ); -#ifdef CONFIG_KEYMILE_HDLC_ENET -int keymile_hdlc_enet_initialize (bd_t *bis); -#endif -int set_km_env (void ); int fdt_set_node_and_value(void *blob, char *nodename,
board/keymile/common/keymile_hdlc_enet.c deleted +0 -620
620 lines not on this page · raw message
board/keymile/mgcoge/Makefile +1 -2
@@ -28,8 +28,7 @@ endif LIB = $(obj)lib$(BOARD).o -COBJS := $(BOARD).o ../common/common.o ../common/keymile_hdlc_enet.o \ - mgcoge_hdlc_enet.o +COBJS := $(BOARD).o ../common/common.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
board/keymile/mgcoge/mgcoge_hdlc_enet.c deleted +0 -276
276 lines not on this page · raw message
Signature · 1 line
1.7.1
Wolfgang Denk
AppliedPATCH v2 1/7 km/common: remove hdlc_enet implementation
Dear Holger Brunck,
Quoted 15 lines · In message <5090fb7af6834a57b5e25f780057df30e3dd7b8e.1304409387.git.holger.brun…
The hdlc implementation for mgcoge was initially developed, but later on not used. Remove the C files, the references in
mgcoge.cand theMakefileto decrease maintenance effort.Signed-off-by Holger Brunck <[email protected]>Signed-off-by Valentin Longchamp <[email protected]>Acked-by Heiko Schocher <[email protected]>cc Wolfgang Denk <[email protected]>cc Detlev Zundel <[email protected]>---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- no change in the content of this patch
Quoted 8 lines
board/keymile/common/common.c | 3 - board/keymile/common/common.h | 4 - board/keymile/common/keymile_hdlc_enet.c | 620 ------------------------------ board/keymile/mgcoge/Makefile | 3 +- board/keymile/mgcoge/mgcoge_hdlc_enet.c | 276 ------------- 5 files changed, 1 insertions(+), 905 deletions(-) delete mode 100644 board/keymile/common/keymile_hdlc_enet.c delete mode 100644 board/keymile/mgcoge/mgcoge_hdlc_enet.c
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
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 ...though his invention worked superbly -- his theory was a crock of sewage from beginning to end. - Vernor Vinge, "The Peace War"
PATCH v2 2/7 powerpc/km82xx: cleanup coding style for mgcoge.c
In reply to Holger BrunckSigned-off-by Holger Brunck <[email protected]>
Signed-off-by Valentin Longchamp <[email protected]>
Acked-by Heiko Schocher <[email protected]>
cc Wolfgang Denk <[email protected]>
cc Detlev Zundel <[email protected]>
---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- no change in the content of this patch
board/keymile/mgcoge/mgcoge.c | 291 +++++++++++++++++++++-------------------- 1 files changed, 146 insertions(+), 145 deletions(-)
board/keymile/mgcoge/mgcoge.c +149 -148
@@ -45,154 +45,154 @@*/ const iop_conf_t iop_conf_tab[4 ][32 ] = { -/* Port A */ - {/* conf ppar psor pdir podr pdat */ -/* PA31 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA31 */ -/* PA30 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA30 */ -/* PA29 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA29 */ -/* PA28 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA28 */ -/* PA27 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA27 */ -/* PA26 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA26 */ -/* PA25 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA25 */ -/* PA24 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA24 */ -/* PA23 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA23 */ -/* PA22 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA22 */ -/* PA21 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA21 */ -/* PA20 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA20 */ -/* PA19 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA19 */ -/* PA18 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA18 */ -/* PA17 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA17 */ -/* PA16 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA16 */ -/* PA15 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA15 */ -/* PA14 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA14 */ -/* PA13 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA13 */ -/* PA12 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA12 */ -/* PA11 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA11 */ -/* PA10 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA10 */ -/* PA9 */ {1 ,1 ,0 ,1 ,0 ,0 },/* SMC2 TxD */ -/* PA8 */ {1 ,1 ,0 ,0 ,0 ,0 },/* SMC2 RxD */ -/* PA7 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA7 */ -/* PA6 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA6 */ -/* PA5 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA5 */ -/* PA4 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA4 */ -/* PA3 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA3 */ -/* PA2 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA2 */ -/* PA1 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PA1 */ -/* PA0 */ {0 ,0 ,0 ,0 ,0 ,0 }/* PA0 */ - }, - -/* Port B */ - {/* conf ppar psor pdir podr pdat */ -/* PB31 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB31 */ -/* PB30 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB30 */ -/* PB29 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB29 */ -/* PB28 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB28 */ -/* PB27 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB27 */ -/* PB26 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB26 */ -/* PB25 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB25 */ -/* PB24 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB24 */ -/* PB23 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB23 */ -/* PB22 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB22 */ -/* PB21 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB21 */ -/* PB20 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB20 */ -/* PB19 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB19 */ -/* PB18 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PB18 */ -/* PB17 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB16 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB15 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB14 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB13 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB12 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB11 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB10 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB9 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB8 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB7 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB6 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB5 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB4 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB3 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB2 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB1 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PB0 */ {0 ,0 ,0 ,0 ,0 ,0 }/* non-existent */ - }, - -/* Port C */ - {/* conf ppar psor pdir podr pdat */ -/* PC31 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC31 */ -/* PC30 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC30 */ -/* PC29 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC29 */ -/* PC28 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC28 */ -/* PC27 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC27 */ -/* PC26 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC26 */ -/* PC25 */ {1 ,1 ,0 ,0 ,0 ,0 },/* SCC4 RxClk */ -/* PC24 */ {1 ,1 ,0 ,0 ,0 ,0 },/* SCC4 TxClk */ -/* PC23 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC23 */ -/* PC22 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC22 */ -/* PC21 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC21 */ -/* PC20 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC20 */ -/* PC19 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC19 */ -/* PC18 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC18 */ -/* PC17 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC17 */ -/* PC16 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC16 */ -/* PC15 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC15 */ -/* PC14 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC14 */ -/* PC13 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC13 */ -/* PC12 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC12 */ -/* PC11 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC11 */ -/* PC10 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC10 */ -/* PC9 */ {1 ,1 ,0 ,0 ,0 ,0 },/* SCC4: CTS */ -/* PC8 */ {1 ,1 ,0 ,0 ,0 ,0 },/* SCC4: CD */ -/* PC7 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC7 */ -/* PC6 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC6 */ -/* PC5 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC5 */ -/* PC4 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC4 */ -/* PC3 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC3 */ -/* PC2 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC2 */ -/* PC1 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC1 */ -/* PC0 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PC0 */ - }, - -/* Port D */ - {/* conf ppar psor pdir podr pdat */ -/* PD31 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD31 */ -/* PD30 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD30 */ -/* PD29 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD29 */ -/* PD28 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD28 */ -/* PD27 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD27 */ -/* PD26 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD26 */ -/* PD25 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD25 */ -/* PD24 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD24 */ -/* PD23 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD23 */ -/* PD22 */ {1 ,1 ,0 ,0 ,0 ,0 },/* SCC4: RXD */ -/* PD21 */ {1 ,1 ,0 ,1 ,0 ,0 },/* SCC4: TXD */ -/* PD20 */ {1 ,1 ,0 ,1 ,0 ,0 },/* SCC4: RTS */ -/* PD19 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD19 */ -/* PD18 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD18 */ -/* PD17 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD17 */ -/* PD16 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD16 */ +/* Port A */ + {/* conf ppar psor pdir podr pdat */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA31 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA30 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA29 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA28 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA27 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA26 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA25 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA24 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA23 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA22 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA21 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA20 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA19 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA18 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA17 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA16 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA15 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA14 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA13 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA12 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA11 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA10 */ + {1 ,1 ,0 ,1 ,0 ,0 },/* PA9 SMC2 TxD */ + {1 ,1 ,0 ,0 ,0 ,0 },/* PA8 SMC2 RxD */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA7 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA6 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA5 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA4 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA3 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA2 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PA1 */ + {0 ,0 ,0 ,0 ,0 ,0 }/* PA0 */ + }, + +/* Port B */ + {/* conf ppar psor pdir podr pdat */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB31 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB30 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB29 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB28 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB27 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB26 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB25 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB24 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB23 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB22 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB21 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB20 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB19 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PB18 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 }/* non-existent */ + }, + +/* Port C */ + {/* conf ppar psor pdir podr pdat */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC31 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC30 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC29 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC28 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC27 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC26 */ + {1 ,1 ,0 ,0 ,0 ,0 },/* PC25 RxClk */ + {1 ,1 ,0 ,0 ,0 ,0 },/* PC24 TxClk */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC23 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC22 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC21 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC20 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC19 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC18 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC17 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC16 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC15 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC14 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC13 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC12 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC11 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC10 */ + {1 ,1 ,0 ,0 ,0 ,0 },/* PC9 SCC4: CTS */ + {1 ,1 ,0 ,0 ,0 ,0 },/* PC8 SCC4: CD */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC7 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC6 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC5 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC4 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC3 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC2 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC1 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PC0 */ + }, + +/* Port D */ + {/* conf ppar psor pdir podr pdat */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD31 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD30 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD29 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD28 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD27 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD26 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD25 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD24 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD23 */ + {1 ,1 ,0 ,0 ,0 ,0 },/* PD22 SCC4: RXD */ + {1 ,1 ,0 ,1 ,0 ,0 },/* PD21 SCC4: TXD */ + {1 ,1 ,0 ,1 ,0 ,0 },/* PD20 SCC4: RTS */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD19 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD18 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD17 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD16 */ #if defined(CONFIG_HARD_I2C) -/* PD15 */ {1 ,1 ,1 ,0 ,1 ,0 },/* I2C SDA */ -/* PD14 */ {1 ,1 ,1 ,0 ,1 ,0 },/* I2C SCL */ + {1 ,1 ,1 ,0 ,1 ,0 },/* PD15 I2C SDA */ + {1 ,1 ,1 ,0 ,1 ,0 },/* PD14 I2C SCL */ #else -/* PD15 */ {1 ,0 ,0 ,0 ,1 ,1 },/* PD15 */ -/* PD14 */ {1 ,0 ,0 ,1 ,1 ,1 },/* PD14 */ + {1 ,0 ,0 ,0 ,1 ,1 },/* PD15 */ + {1 ,0 ,0 ,1 ,1 ,1 },/* PD14 */ #endif -/* PD13 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD13 */ -/* PD12 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD12 */ -/* PD11 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD11 */ -/* PD10 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD10 */ -/* PD9 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD9 */ -/* PD8 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD8 */ -/* PD7 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD7 */ -/* PD6 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD6 */ -/* PD5 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD5 */ -/* PD4 */ {0 ,0 ,0 ,0 ,0 ,0 },/* PD4 */ -/* PD3 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PD2 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PD1 */ {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ -/* PD0 */ {0 ,0 ,0 ,0 ,0 ,0 }/* non-existent */ - } + {0 ,0 ,0 ,0 ,0 ,0 },/* PD13 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD12 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD11 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD10 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD9 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD8 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD7 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD6 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD5 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* PD4 */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 },/* non-existent */ + {0 ,0 ,0 ,0 ,0 ,0 }/* non-existent */ + } };/*
@@ -237,7 +237,8 @@ static long int try_init(memctl8260_t *memctl, ulong sdmr,* accessing the SDRAM with a single-byte transaction." * * The appropriate BRx/ORx registers have already been set when we -* get here. The SDRAM can be accessed at the address CONFIG_SYS_SDRAM_BASE. +* get here. The SDRAM can be accessed at the address +* CONFIG_SYS_SDRAM_BASE. */ out_be32 (&memctl->memc_psdmr, sdmr |PSDMR_OP_PREA );
@@ -257,7 +258,7 @@ static long int try_init(memctl8260_t *memctl, ulong sdmr, size =get_ram_size ((long *)base, maxsize);out_be32 (&memctl->memc_or1, orx | ~(size -1 )); -return (size); +return size; }phys_size_t initdram (int board_type)
@@ -279,7 +280,7 @@ phys_size_t initdram(int board_type)icache_enable (); -return (psize); +return psize; }int checkboard (void )
Signature · 1 line
1.7.1
Wolfgang Denk
AppliedPATCH v2 2/7 powerpc/km82xx: cleanup coding style for mgcoge.c
Dear Holger Brunck,
Quoted 5 lines · In message <6a4379237c3c32f0e6fb145d64d33c959fa785d5.1304409387.git.holger.brun…
Signed-off-by Holger Brunck <[email protected]>Signed-off-by Valentin Longchamp <[email protected]>Acked-by Heiko Schocher <[email protected]>cc Wolfgang Denk <[email protected]>cc Detlev Zundel <[email protected]>
Quoted 8 lines
---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- no change in the content of this patchboard/keymile/mgcoge/mgcoge.c | 291 +++++++++++++++++++++-------------------- 1 files changed, 146 insertions(+), 145 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
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 When choosing between two evils, I always like to take the one I've never tried before. -- Mae West, "Klondike Annie"
PATCH v2 3/7 powerpc/km82xx: rename mgcoge files to km82xx
In reply to Holger BrunckThe directory and file mgcoge was renamed to km82xx. Because other keymile 82xx will follow and will use the same platform code.
Signed-off-by Holger Brunck <[email protected]>
Signed-off-by Valentin Longchamp <[email protected]>
Acked-by Heiko Schocher <[email protected]>
cc Wolfgang Denk <[email protected]>
cc Detlev Zundel <[email protected]>
---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- no change in the content of this patch
board/keymile/{mgcoge => km82xx}/Makefile | 0
board/keymile/{mgcoge/mgcoge.c => km82xx/km82xx.c} | 0
boards.cfg | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename board/keymile/{mgcoge => km82xx}/Makefile (100%)
rename board/keymile/{mgcoge/mgcoge.c => km82xx/km82xx.c} (100%)board/keymile/km82xx/Makefile renamed from board/keymile/mgcoge/Makefile +0 -0
board/keymile/km82xx/km82xx.c renamed from board/keymile/mgcoge/mgcoge.c +0 -0
boards.cfg +2 -2
@@ -439,8 +439,8 @@ PQ2FADS-ZU_66MHz powerpc mpc8260 mpc8260ads freesca PQ2FADS-ZU_66MHz_lowboot powerpc mpc8260 mpc8260ads freescale - MPC8260ADS:ADSTYPE=CONFIG_SYS_PQ2FADS,8260_CLKIN=66000000,SYS_TEXT_BASE=0xFF800000 PQ2FADS-ZU_lowboot powerpc mpc8260 mpc8260ads freescale - MPC8260ADS:ADSTYPE=CONFIG_SYS_PQ2FADS,SYS_TEXT_BASE=0xFF800000 VoVPN-GW_66MHz powerpc mpc8260 vovpn-gw funkwerk - VoVPN-GW:CLKIN_66MHz -mgcoge powerpc mpc8260 - keymile -mgcoge2ne powerpc mpc8260 mgcoge keymile +mgcoge powerpc mpc8260 km82xx keymile +mgcoge2ne powerpc mpc8260 km82xx keymile SCM powerpc mpc8260 - siemens TQM8255_AA powerpc mpc8260 tqm8260 tqc - TQM8260:MPC8255,300MHz TQM8260_AA powerpc mpc8260 tqm8260 tqc - TQM8260:MPC8260,200MHz
Signature · 1 line
1.7.1
Wolfgang Denk
AppliedPATCH v2 3/7 powerpc/km82xx: rename mgcoge files to km82xx
Dear Holger Brunck,
Quoted 15 lines · In message <9855ad495d01555cc1115973f5c57472382177ad.1304409387.git.holger.brun…
The directory and file mgcoge was renamed to km82xx. Because other keymile 82xx will follow and will use the same platform code.
Signed-off-by Holger Brunck <[email protected]>Signed-off-by Valentin Longchamp <[email protected]>Acked-by Heiko Schocher <[email protected]>cc Wolfgang Denk <[email protected]>cc Detlev Zundel <[email protected]>---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- no change in the content of this patch
Quoted 6 lines
board/keymile/{mgcoge => km82xx}/Makefile | 0
board/keymile/{mgcoge/mgcoge.c => km82xx/km82xx.c} | 0
boards.cfg | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename board/keymile/{mgcoge => km82xx}/Makefile (100%)
rename board/keymile/{mgcoge/mgcoge.c => km82xx/km82xx.c} (100%)Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
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 Time is fluid ... like a river with currents, eddies, backwash. -- Spock, "The City on the Edge of Forever", stardate 3134.0
PATCH v2 4/7 powerpc/km82xx: rework DIP switch detection
In reply to Holger BrunckFrom: Huber, Andreas <[email protected]>
Introduce a struct for the BFTICU FPGA to increase the readability of the code. And the define CONFIG_SYS_BFTICU_BASE was removed because the CONFIG_SYS_FPGA_BASE is already the base value for BFTICU registers.
Signed-off-by Andreas Huber <[email protected]>
Signed-off-by Holger Brunck <[email protected]>
Signed-off-by Valentin Longchamp <[email protected]>
Acked-by Heiko Schocher <[email protected]>
cc Wolfgang Denk <[email protected]>
cc Detlev Zundel <[email protected]>
---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- no change in the content of this patch
board/keymile/common/common.h | 79 +++++++++++++++++++++++++++++++++++++++++ board/keymile/km82xx/km82xx.c | 11 +++--- include/configs/mgcoge.h | 3 -- 3 files changed, 84 insertions(+), 9 deletions(-)
board/keymile/common/common.h +79 -0
@@ -39,6 +39,85 @@ struct km_bec_fpga {unsigned char pgy_eth; }; +#define BFTICU_DIPSWITCH_MASK 0x0f + +/* +* BFTICU FPGA iomap +* BFTICU is used on mgcoge and mgocge3ne +*/ +struct bfticu_iomap { +u8 xi_ena;/* General defect enable */ +u8 pack1[3 ]; +u8 en_csn; +u8 pack2; +u8 safe_mem; +u8 pack3; +u8 id; +u8 pack4; +u8 rev; +u8 build; +u8 p_frc; +u8 p_msk; +u8 pack5[2 ]; +u8 xg_int; +u8 pack6[15 ]; +u8 s_conf; +u8 pack7; +u8 dmx_conf12; +u8 pack8; +u8 s_clkslv; +u8 pack9[11 ]; +u8 d_conf; +u8 d_mask_ca; +u8 d_pll_del; +u8 pack10[16 ]; +u8 t_conf_ca; +u8 t_mask_ca; +u8 pack11[13 ]; +u8 m_def0; +u8 m_def1; +u8 m_def2; +u8 m_def3; +u8 m_def4; +u8 m_def5; +u8 m_def_trap0; +u8 m_def_trap1; +u8 m_def_trap2; +u8 m_def_trap3; +u8 m_def_trap4; +u8 m_def_trap5; +u8 m_mask_def0; +u8 m_mask_def1; +u8 m_mask_def2; +u8 m_mask_def3; +u8 m_mask_def4; +u8 m_mask_def5; +u8 m_def_mask0; +u8 m_def_mask1; +u8 m_def_mask2; +u8 m_def_mask3; +u8 m_def_mask4; +u8 m_def_mask5; +u8 m_def_pri; +u8 pack12[11 ]; +u8 hw_status; +u8 pack13; +u8 hw_control1; +u8 hw_control2; +u8 hw_control3; +u8 pack14[7 ]; +u8 led_on;/* Leds */ +u8 pack15; +u8 sfp_control;/* SFP modules */ +u8 pack16; +u8 alarm_control;/* Alarm output */ +u8 pack17; +u8 icps;/* ICN clock pulse shaping */ +u8 mswitch;/* Read mode switch */ +u8 pack18[6 ]; +u8 pb_dbug; +}; +#if !defined(CONFIG_PIGGY_MAC_ADRESS_OFFSET )#define CONFIG_PIGGY_MAC_ADRESS_OFFSET 0#endif
board/keymile/km82xx/km82xx.c +5 -6
@@ -296,15 +296,14 @@ int checkboard(void)return 0 ; } -#define DIPSWITCH_OFFSET 0x89 -#define DIPSWITCH_MASK 0x0f -int last_stage_init (void ) { +struct bfticu_iomap *base = + (struct bfticu_iomap *)CONFIG_SYS_FPGA_BASE ;u8 dip_switch; -/* Dip switch */ - dip_switch =readb (CONFIG_SYS_BFTICU_BASE +DIPSWITCH_OFFSET ); - dip_switch &=DIPSWITCH_MASK ; + + dip_switch =in_8 (&base->mswitch); + dip_switch &=BFTICU_DIPSWITCH_MASK ;/* dip switch 'full reset' or 'db erase' */ if (dip_switch &0x1 || dip_switch &0x2 ) {/* start bootloader */
include/configs/mgcoge.h +0 -3
@@ -61,7 +61,4 @@/* include further common stuff for all keymile 82xx boards */ #include "km82xx-common.h" -/* bfticu address */ -#define CONFIG_SYS_BFTICU_BASE 0x40000000 -#endif /* __CONFIG_H */
Signature · 1 line
1.7.1
Wolfgang Denk
AppliedPATCH v2 4/7 powerpc/km82xx: rework DIP switch detection
Dear Holger Brunck,
Quoted 18 lines · In message <b95125b489522378c8f14fd9a5d0151e50d9cf59.1304409387.git.holger.brun…
From: Huber, Andreas <[email protected]>
Introduce a struct for the BFTICU FPGA to increase the readability of the code. And the define
CONFIG_SYS_BFTICU_BASEwas removed because theCONFIG_SYS_FPGA_BASEis already the base value for BFTICU registers.Signed-off-by Andreas Huber <[email protected]>Signed-off-by Holger Brunck <[email protected]>Signed-off-by Valentin Longchamp <[email protected]>Acked-by Heiko Schocher <[email protected]>cc Wolfgang Denk <[email protected]>cc Detlev Zundel <[email protected]>---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- no change in the content of this patch
Quoted 4 lines
board/keymile/common/common.h | 79 +++++++++++++++++++++++++++++++++++++++++ board/keymile/km82xx/km82xx.c | 11 +++--- include/configs/mgcoge.h | 3 -- 3 files changed, 84 insertions(+), 9 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 6 lines
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 Women professionals do tend to over-compensate. -- Dr. Elizabeth Dehaver, "Where No Man Has Gone Before", stardate 1312.9.
PATCH v2 5/7 powerpc/km82xx: add mgcoge3ne and remove mgcoge2ne support
In reply to Holger BrunckThis patch adds support for the MPC8247 based board mgcoge3ne. Additionaly mgcoge2ne board supprot was removed, because due to the mgcoge3ne, this board is obsolete and not longer maintained.
The board is similar to mgcoge. The difference is that a NUMONYX flash is used and a different SDRAM (256MB). Also introduce CONFIG_KM_82XX to collect ppc82xx common settings and remove staticness from the common set_pin function.
Signed-off-by Holger Brunck <[email protected]>
Signed-off-by Valentin Longchamp <[email protected]>
Acked-by Heiko Schocher <[email protected]>
cc Wolfgang Denk <[email protected]>
cc Detlev Zundel <[email protected]>
---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- squashed with powerpc/km82xx: move SDRAM config to board config from first serie and update commit message
MAINTAINERS | 2 +-
board/keymile/common/common.c | 6 ++--
board/keymile/common/common.h | 1 +
board/keymile/km82xx/km82xx.c | 27 ++++++++++++++-
boards.cfg | 2 +-
include/configs/km82xx-common.h | 26 --------------
include/configs/mgcoge.h | 27 +++++++++++++++
include/configs/{mgcoge2ne.h => mgcoge3ne.h} | 47 ++++++++++++++++++++-----
8 files changed, 96 insertions(+), 42 deletions(-)
rename include/configs/{mgcoge2ne.h => mgcoge3ne.h} (62%)MAINTAINERS +1 -1
@@ -429,7 +429,7 @@ Heiko Schocher <[email protected]> kmeter1 MPC8360 kmsupx5 MPC8321 mgcoge MPC8247 - mgcoge2ne MPC8247 + mgcoge3ne MPC8247 mgcoge2un ARM926EJS (Kirkwood SoC) mucmc52 MPC5200 muas3001 MPC8270
board/keymile/common/common.c +3 -3
@@ -22,7 +22,7 @@*/ #include <common.h> -#if defined(CONFIG_MGCOGE ) || defined(CONFIG_MGCOGE2NE ) +#if defined(CONFIG_KM82XX )#include <mpc8260.h> #endif #include <ioports.h>
@@ -398,10 +398,10 @@ int ivm_read_eeprom(void)#define DELAY_ABORT_SEQ 62/* @200kHz 9 clocks = 44us, 62us is ok */ #define DELAY_HALF_PERIOD (500 / (CONFIG_SYS_I2C_SPEED / 1000)) -#if defined(CONFIG_MGCOGE ) || defined(CONFIG_MGCOGE2NE ) +#if defined(CONFIG_KM_82XX )#define SDA_MASK 0x00010000#define SCL_MASK 0x00020000 -static void set_pin (int state,unsigned long mask) +void set_pin (int state,unsigned long mask) {ioport_t *iop =ioport_addr ((immap_t *)CONFIG_SYS_IMMR ,3 );
board/keymile/common/common.h +1 -0
@@ -124,6 +124,7 @@ struct bfticu_iomap {int ethernet_present (void );int ivm_read_eeprom (void ); +void set_pin (int state,unsigned long mask);int set_km_env (void ); int fdt_set_node_and_value(void *blob,
board/keymile/km82xx/km82xx.c +26 -1
@@ -288,7 +288,7 @@ int checkboard(void)#if defined(CONFIG_MGCOGE )puts ("Board: Keymile mgcoge" );#else -puts ("Board: Keymile mgcoge2ne" ); +puts ("Board: Keymile mgcoge3ne" );#endif if (ethernet_present ())puts (" with PIGGY." );
@@ -314,6 +314,28 @@ int last_stage_init(void)return 0 ; } +#ifdef CONFIG_MGCOGE3NE +/* +* For mgcoge3ne boards, the mgcoge3un control is controlled from +* a GPIO line on the PPC CPU. If bobcatreset is set the line +* will toggle once what forces the mgocge3un part to restart +* immediately. +*/ +void handle_mgcoge3un_reset (void ) +{ +char *bobcatreset =getenv ("bobcatreset" ); +if (bobcatreset) { +if (strcmp (bobcatreset,"true" ) ==0 ) { +puts ("Forcing bobcat reset\n" ); +set_pin (0 ,0x00000004 );/* clear PD29 to reset arm */ +udelay (1000 ); +set_pin (1 ,0x00000004 ); + }else +set_pin (1 ,0x00000004 );/* set PD29 to not reset arm */ + } +} +#endif +/* * Early board initalization. */
@@ -329,6 +351,9 @@ int board_early_init_r(void)out_8 (&base->oprtl, (H_OPORTS_SCC4_ENA |H_OPORTS_SCC4_FD_ENA |H_OPORTS_FCC1_PW_DWN )); +#ifdef CONFIG_MGCOGE3NE +handle_mgcoge3un_reset (); +#endif return 0 ; }
boards.cfg +1 -1
@@ -440,7 +440,7 @@ PQ2FADS-ZU_66MHz_lowboot powerpc mpc8260 mpc8260ads freesca PQ2FADS-ZU_lowboot powerpc mpc8260 mpc8260ads freescale - MPC8260ADS:ADSTYPE=CONFIG_SYS_PQ2FADS,SYS_TEXT_BASE=0xFF800000 VoVPN-GW_66MHz powerpc mpc8260 vovpn-gw funkwerk - VoVPN-GW:CLKIN_66MHz mgcoge powerpc mpc8260 km82xx keymile -mgcoge2ne powerpc mpc8260 km82xx keymile +mgcoge3ne powerpc mpc8260 km82xx keymile SCM powerpc mpc8260 - siemens TQM8255_AA powerpc mpc8260 tqm8260 tqc - TQM8260:MPC8255,300MHz TQM8260_AA powerpc mpc8260 tqm8260 tqc - TQM8260:MPC8260,200MHz
include/configs/km82xx-common.h +0 -26
@@ -243,13 +243,6 @@ ORxG_SCY_5_CLK |\ ORxG_TRLX) - -/* -* Bank 1 - 60x bus SDRAM -*/ -#define SDRAM_MAX_SIZE 0x08000000/* max. 128 MB */ -#define CONFIG_SYS_GLOBAL_SDRAM_LIMIT (256 << 20)/* less than 256 MB */ -#define CONFIG_SYS_MPTPR 0x1800/*
@@ -268,25 +261,6 @@#define CONFIG_SYS_OR1_PRELIM CONFIG_SYS_OR1/* -* SDRAM initialization values -*/ - -#define CONFIG_SYS_OR1 ((~(CONFIG_SYS_GLOBAL_SDRAM_LIMIT-1) & ORxS_SDAM_MSK) |\ - ORxS_BPD_8 |\ - ORxS_ROWST_PBI0_A7 |\ - ORxS_NUMR_13) - -#define CONFIG_SYS_PSDMR (PSDMR_SDAM_A14_IS_A5 |\ - PSDMR_BSMA_A14_A16 |\ - PSDMR_SDA10_PBI0_A9 |\ - PSDMR_RFRC_5_CLK |\ - PSDMR_PRETOACT_2W |\ - PSDMR_ACTTORW_2W |\ - PSDMR_LDOTOPRE_1C |\ - PSDMR_WRC_1C |\ - PSDMR_CL_2) - -/* * UPIO FPGA (GPIO/PIGGY) on CS3 initialization values */ #define CONFIG_SYS_KMBEC_FPGA_BASE 0x30000000
include/configs/mgcoge.h +27 -0
@@ -32,6 +32,7 @@#define CONFIG_MPC8247 #define CONFIG_MGCOGE #define CONFIG_HOSTNAME mgcoge +#define CONFIG_KM_82XX #define CONFIG_SYS_TEXT_BASE 0xFE000000
@@ -58,6 +59,32 @@ CONFIG_SYS_FLASH_BASE_2 }#define MTDIDS_DEFAULT "nor3=app" +/* +* Bank 1 - 60x bus SDRAM +*/ +#define SDRAM_MAX_SIZE 0x08000000/* max. 128 MB */ +#define CONFIG_SYS_GLOBAL_SDRAM_LIMIT (256 << 20)/* less than 256 MB */ + +/* SDRAM initialization values +*/ + +#define CONFIG_SYS_OR1 ((~(CONFIG_SYS_GLOBAL_SDRAM_LIMIT-1) & \ + ORxS_SDAM_MSK) |\ + ORxS_BPD_8 |\ + ORxS_ROWST_PBI0_A7 |\ + ORxS_NUMR_13) + +#define CONFIG_SYS_PSDMR (PSDMR_SDAM_A14_IS_A5 |\ + PSDMR_BSMA_A14_A16 |\ + PSDMR_SDA10_PBI0_A9 |\ + PSDMR_RFRC_5_CLK |\ + PSDMR_PRETOACT_2W |\ + PSDMR_ACTTORW_2W |\ + PSDMR_LDOTOPRE_1C |\ + PSDMR_WRC_1C |\ + PSDMR_CL_2) + +/* include further common stuff for all keymile 82xx boards */ #include "km82xx-common.h"
include/configs/mgcoge3ne.h renamed from include/configs/mgcoge2ne.h +37 -10
80 lines not on this page · raw message
Signature · 1 line
1.7.1
Wolfgang Denk
AppliedPATCH v2 5/7 powerpc/km82xx: add mgcoge3ne and remove mgcoge2ne support
Dear Holger Brunck,
Quoted 21 lines · In message <a31b7a01a892aab53fb05efb093fb8abcbeaa8b5.1304409387.git.holger.brun…
This patch adds support for the MPC8247 based board mgcoge3ne. Additionaly mgcoge2ne board supprot was removed, because due to the mgcoge3ne, this board is obsolete and not longer maintained.
The board is similar to mgcoge. The difference is that a NUMONYX flash is used and a different SDRAM (256MB). Also introduceCONFIG_KM_82XXto collect ppc82xx common settings and remove staticness from the commonset_pinfunction.Signed-off-by Holger Brunck <[email protected]>Signed-off-by Valentin Longchamp <[email protected]>Acked-by Heiko Schocher <[email protected]>cc Wolfgang Denk <[email protected]>cc Detlev Zundel <[email protected]>---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- squashed with powerpc/km82xx: move SDRAM config to board config from first serie and update commit message
Quoted 10 lines
MAINTAINERS | 2 +-
board/keymile/common/common.c | 6 ++--
board/keymile/common/common.h | 1 +
board/keymile/km82xx/km82xx.c | 27 ++++++++++++++-
boards.cfg | 2 +-
include/configs/km82xx-common.h | 26 --------------
include/configs/mgcoge.h | 27 +++++++++++++++
include/configs/{mgcoge2ne.h => mgcoge3ne.h} | 47 ++++++++++++++++++++-----
8 files changed, 96 insertions(+), 42 deletions(-)
rename include/configs/{mgcoge2ne.h => mgcoge3ne.h} (62%)Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
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 Accident: A condition in which presence of mind is good, but absence of body is better.
PATCH v2 6/7 powerpc/km82xx: adapt CONFIG_SYSSYPCR to manual
In reply to Holger BrunckReserved bit was changed according to the processors manual.
Signed-off-by Holger Brunck <[email protected]>
Signed-off-by Valentin Longchamp <[email protected]>
Acked-by Heiko Schocher <[email protected]>
cc Wolfgang Denk <[email protected]>
cc Detlev Zundel <[email protected]>
---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- no change in the content of this patch
include/configs/km82xx-common.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/configs/km82xx-common.h +1 -1
@@ -182,7 +182,7 @@#define CONFIG_SYS_HID2 0#define CONFIG_SYS_SIUMCR 0x4020c200 -#define CONFIG_SYS_SYPCR 0xFFFFFFC3 +#define CONFIG_SYS_SYPCR 0xFFFFFF83#define CONFIG_SYS_BCR 0x10000000#define CONFIG_SYS_SCCR (SCCR_PCI_MODE | SCCR_PCI_MODCK)
Signature · 1 line
1.7.1
Wolfgang Denk
AppliedPATCH v2 6/7 powerpc/km82xx: adapt CONFIG_SYSSYPCR to manual
Dear Holger Brunck,
Quoted 7 lines · In message <fd70e2bc606038fa3e8dab4fb1086cdbe2739548.1304409387.git.holger.brun…
Reserved bit was changed according to the processors manual.
Signed-off-by Holger Brunck <[email protected]>Signed-off-by Valentin Longchamp <[email protected]>Acked-by Heiko Schocher <[email protected]>cc Wolfgang Denk <[email protected]>cc Detlev Zundel <[email protected]>
Quoted 8 lines
---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- no change in the content of this patchinclude/configs/km82xx-common.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
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 "Love is an ideal thing, marriage a real thing; a confusion of the real with the ideal never goes unpunished." - Goethe
PATCH v2 7/7 powerpc/km82xx: add board specific environment variable
In reply to Holger BrunckOn mgcoge3ne a new environment variable bobcatreset is used. So this patch adds a possibility to add board specific environment variables in general and this specific variable for mgcoge3ne.
Signed-off-by Holger Brunck <[email protected]>
Signed-off-by Valentin Longchamp <[email protected]>
Acked-by Heiko Schocher <[email protected]>
cc Wolfgang Denk <[email protected]>
cc Detlev Zundel <[email protected]>
---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- fix typo in commit message
include/configs/km82xx-common.h | 1 + include/configs/mgcoge.h | 2 ++ include/configs/mgcoge3ne.h | 2 ++ 3 files changed, 5 insertions(+), 0 deletions(-)
include/configs/km82xx-common.h +1 -0
@@ -80,6 +80,7 @@* Default environment settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_KM_BOARD_EXTRA_ENV \ CONFIG_KM_DEF_ENV \ "EEprom_ivm=pca9544a:70:4 \0" \ "unlock=yes\0" \
include/configs/mgcoge.h +2 -0
@@ -85,6 +85,8 @@ PSDMR_CL_2) +#define CONFIG_KM_BOARD_EXTRA_ENV "" +/* include further common stuff for all keymile 82xx boards */ #include "km82xx-common.h"
include/configs/mgcoge3ne.h +2 -0
@@ -85,6 +85,8 @@ PSDMR_WRC_2C |\ PSDMR_CL_2) +#define CONFIG_KM_BOARD_EXTRA_ENV "bobcatreset=true\0" +/* include further common stuff for all keymile 82xx boards */ #include "km82xx-common.h"
Signature · 1 line
1.7.1
Wolfgang Denk
AppliedPATCH v2 7/7 powerpc/km82xx: add board specific environment variable
Dear Holger Brunck,
Quoted 16 lines · In message <9b8d955aa96d09f2d5a20c57e878622b85481a7d.1304409387.git.holger.brun…
On mgcoge3ne a new environment variable bobcatreset is used. So this patch adds a possibility to add board specific environment variables in general and this specific variable for mgcoge3ne.
Signed-off-by Holger Brunck <[email protected]>Signed-off-by Valentin Longchamp <[email protected]>Acked-by Heiko Schocher <[email protected]>cc Wolfgang Denk <[email protected]>cc Detlev Zundel <[email protected]>---
Changes for v2:
- split up first large patch serie to three independent smaller patch series
- fix typo in commit message
Quoted 4 lines
include/configs/km82xx-common.h | 1 + include/configs/mgcoge.h | 2 ++ include/configs/mgcoge3ne.h | 2 ++ 3 files changed, 5 insertions(+), 0 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
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 "We Americans, we're a simple people... but piss us off, and we'll bomb your cities." - Robin Williams, _Good Morning Vietnam_