mpc5xxx/cpu_init.c: fix warning: unused variable 'gpt0'
Subsystems (3)
PATCH 2/3 mpc5xxx/cpu_init.c: fix warning: unused variable 'gpt0'
--- cpu/mpc5xxx/cpu_init.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
cpu/mpc5xxx/cpu_init.c +3 -0
@@ -46,9 +46,12 @@ void cpu_init_f (void) (struct mpc5xxx_gpio *)MPC5XXX_GPIO ;volatile struct mpc5xxx_xlb *xlb = (struct mpc5xxx_xlb *)MPC5XXX_XLBARB ; +#if defined(CONFIG_WATCHDOG )volatile struct mpc5xxx_gpt *gpt0 = (struct mpc5xxx_gpt *)MPC5XXX_GPT ; +#endif /* CONFIG_WATCHDOG */ unsigned long addecr = (1 <<25 );/* Boot_CS */ +#if defined(CONFIG_SYS_RAMBOOT ) && defined(CONFIG_MGT5100 ) addecr |= (1 <<22 );/* SDRAM enable */ #endif
Signature · 1 line
1.6.2.5
Wolfgang Denk
AppliedPATCH 2/3 mpc5xxx/cpu_init.c: fix warning: unused variable 'gpt0'
Quoted 4 lines · In message <[email protected]> you wrote:
Signed-off-by Wolfgang Denk <[email protected]>--- cpu/mpc5xxx/cpu_init.c | 3 +++ 1 files changed, 3 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 First study the enemy. Seek weakness. -- Romulan Commander, "Balance of Terror", stardate 1709.2
PATCH 2/3 mpc5xxx/cpu_init.c: fix warning: unused variable 'gpt0'
In reply to Wolfgang DenkHi Wolfgang,
Quoted 1 line
Signed-off-by Wolfgang Denk <[email protected]>
Quoted 21 lines
--- cpu/mpc5xxx/cpu_init.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)cpu/mpc5xxx/cpu_init.c +3
-0@@ -46,9 +46,12 @@ void cpu_init_f (void) (struct mpc5xxx_gpio *)MPC5XXX_GPIO ;volatile struct mpc5xxx_xlb *xlb = (struct mpc5xxx_xlb *)MPC5XXX_XLBARB ; +#if defined(CONFIG_WATCHDOG )volatile struct mpc5xxx_gpt *gpt0 = (struct mpc5xxx_gpt *)MPC5XXX_GPT ; +#endif /* CONFIG_WATCHDOG */ unsigned long addecr = (1 <<25 );/* Boot_CS */ +#if defined(CONFIG_SYS_RAMBOOT ) && defined(CONFIG_MGT5100 ) addecr |= (1 <<22 );/* SDRAM enable */ #endif
Signature · 7 lines
I have always observed that the pretensions of all people are in exact inverse ratio to their merits; this is one of the axioms of morals. -- Joseph Lagrange -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
PATCH 3/3 mpc5xxx/cpu_init.c: fix warning: unused variable 'cdm'
In reply to Wolfgang Denk--- cpu/mpc5xxx/cpu_init.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
cpu/mpc5xxx/cpu_init.c +7 -5
@@ -40,12 +40,14 @@ void cpu_init_f (void) (struct mpc5xxx_mmap_ctl *)CONFIG_SYS_MBAR ;volatile struct mpc5xxx_lpb *lpb = (struct mpc5xxx_lpb *)MPC5XXX_LPB ; -volatile struct mpc5xxx_cdm *cdm = - (struct mpc5xxx_cdm *)MPC5XXX_CDM ;volatile struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO ;volatile struct mpc5xxx_xlb *xlb = (struct mpc5xxx_xlb *)MPC5XXX_XLBARB ; +#if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK ) +volatile struct mpc5xxx_cdm *cdm = + (struct mpc5xxx_cdm *)MPC5XXX_CDM ; +#endif /* CONFIG_SYS_IPBCLK_EQUALS_XLBCLK */ #if defined(CONFIG_WATCHDOG )volatile struct mpc5xxx_gpt *gpt0 = (struct mpc5xxx_gpt *)MPC5XXX_GPT ;
@@ -187,11 +189,11 @@ void cpu_init_f (void)# if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK )/* Motorola reports IPB should better run at 133 MHz. */ -#if defined(CONFIG_MGT5100 ) +# if defined(CONFIG_MGT5100 )setbits_be32 (&mm->addecr,1 ); -#elif defined(CONFIG_MPC5200 ) +# elif defined(CONFIG_MPC5200 )setbits_be32 (&mm->ipbi_ws_ctrl,1 ); -#endif +# endif /* pci_clk_sel = 0x02, ipb_clk_sel = 0x00; */ addecr =in_be32 (&cdm->cfg); addecr &= ~0x103 ;
Signature · 1 line
1.6.2.5
PATCH 3/3 mpc5xxx/cpu_init.c: fix warning: unused variable 'cdm'
Hi Wolfgang,
Quoted 1 line
Signed-off-by Wolfgang Denk <[email protected]>
By the way, now that we have a patch touching this stuff on the mailing list - would anyone object to removing the mgt5100 stuff? If I am not missing anything, this is not being used anywhere and makes the code look overly complicated.
Would such a cleanup patch be accepted?
Thanks
Detlev
Quoted 40 lines
--- cpu/mpc5xxx/cpu_init.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)cpu/mpc5xxx/cpu_init.c +7
-5@@ -40,12 +40,14 @@ void cpu_init_f (void) (struct mpc5xxx_mmap_ctl *)CONFIG_SYS_MBAR ;volatile struct mpc5xxx_lpb *lpb = (struct mpc5xxx_lpb *)MPC5XXX_LPB ; -volatile struct mpc5xxx_cdm *cdm = - (struct mpc5xxx_cdm *)MPC5XXX_CDM ;volatile struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5XXX_GPIO ;volatile struct mpc5xxx_xlb *xlb = (struct mpc5xxx_xlb *)MPC5XXX_XLBARB ; +#if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK ) +volatile struct mpc5xxx_cdm *cdm = + (struct mpc5xxx_cdm *)MPC5XXX_CDM ; +#endif /* CONFIG_SYS_IPBCLK_EQUALS_XLBCLK */ #if defined(CONFIG_WATCHDOG )volatile struct mpc5xxx_gpt *gpt0 = (struct mpc5xxx_gpt *)MPC5XXX_GPT ;@@ -187,11 +189,11 @@ void cpu_init_f (void)# if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK )/* Motorola reports IPB should better run at 133 MHz. */ -#if defined(CONFIG_MGT5100 ) +# if defined(CONFIG_MGT5100 )setbits_be32 (&mm->addecr,1 ); -#elif defined(CONFIG_MPC5200 ) +# elif defined(CONFIG_MPC5200 )setbits_be32 (&mm->ipbi_ws_ctrl,1 ); -#endif +# endif /* pci_clk_sel = 0x02, ipb_clk_sel = 0x00; */ addecr =in_be32 (&cdm->cfg); addecr &= ~0x103 ;
Signature · 6 lines
Question : If you were redesigning UNIX, what would you do differently? Ken Thompson: I'd spell creat with an e. -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
PATCH 3/3 mpc5xxx/cpu_init.c: fix warning: unused variable 'cdm'
Dear Detlev,
Quoted 5 lines · In message <[email protected]> you wrote:
By the way, now that we have a patch touching this stuff on the mailing list - would anyone object to removing the mgt5100 stuff? If I am not missing anything, this is not being used anywhere and makes the code look overly complicated.
It is a pretty safe ssumption that no MGT5100 systems are out there that are still being used for software development, i. e. where we need current versions of U-Boot.
Quoted 1 line
Would such a cleanup patch be accepted?
Accepted and appreciated.
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 Humanity has the stars in its future, and that future is too important to be lost under the burden of juvenile folly and ignorant superstition. - Isaac Asimov
PATCH 1/1 mpc5xxx: Remove all references to MGT5100
We do not support a processor that never reached a real customer.
---
This is really -next stuff. The patch was tested on lite5200b and on TQM5200.
MAINTAINERS | 1 - MAKEALL | 4 +- Makefile | 24 +-- board/bc3450/bc3450.c | 56 ---- board/bc3450/mt48lc16m16a2-75.h | 13 - board/canmb/canmb.c | 52 ---- board/canmb/mt48lc16m32s2-75.h | 13 - board/esd/cpci5200/mt46v16m16-75.h | 5 - board/esd/mecp5200/mt46v16m16-75.h | 5 - board/esd/pf5200/mt46v16m16-75.h | 5 - board/icecube/icecube.c | 60 +---- board/icecube/mt46v16m16-75.h | 5 - board/icecube/mt46v32m16.h | 5 - board/icecube/mt48lc16m16a2-75.h | 13 - board/jupiter/jupiter.c | 6 - board/mcc200/mt46v16m16-75.h | 5 - board/mcc200/mt48lc16m16a2-75.h | 13 - board/mcc200/mt48lc16m32s2-75.h | 13 - board/munices/mt48lc16m16a2-75.h | 13 - board/pm520/mt46v16m16-75.h | 5 - board/pm520/mt48lc16m16a2-75.h | 13 - board/pm520/pm520.c | 60 ----- board/total5200/mt48lc16m16a2-75.h | 13 - board/total5200/mt48lc32m16a2-75.h | 5 - board/total5200/sdram.c | 52 ---- board/total5200/sdram.h | 5 - board/total5200/total5200.c | 27 +-- board/tqc/tqm5200/mt48lc16m16a2-75.h | 13 - cpu/mpc5xxx/Makefile | 2 +- cpu/mpc5xxx/cpu.c | 7 - cpu/mpc5xxx/cpu_init.c | 35 +-- cpu/mpc5xxx/firmware_sc_task.impl.S | 364 -------------------------- cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S | 4 - cpu/mpc5xxx/pci_mpc5200.c | 4 +- cpu/mpc5xxx/serial.c | 17 -- cpu/mpc5xxx/start.S | 8 - cpu/mpc5xxx/usb_ohci.c | 7 - cpu/mpc5xxx/usb_ohci.h | 5 - drivers/input/ps2ser.c | 11 - drivers/net/mpc5xxx_fec.c | 10 +- include/configs/BC3450.h | 9 +- include/configs/IceCube.h | 13 +- include/configs/PM520.h | 11 - include/configs/TB5200.h | 5 - include/configs/TQM5200.h | 5 - include/configs/Total5200.h | 23 +-- include/configs/aev.h | 5 - include/configs/cpci5200.h | 11 - include/configs/hmi1001.h | 5 - include/configs/inka4x0.h | 5 - include/configs/ipek01.h | 5 - include/configs/manroland/mpc5200-common.h | 5 - include/configs/mecp5200.h | 14 - include/configs/o2dnt.h | 7 - include/configs/pf5200.h | 11 - include/configs/smmaco4.h | 5 - include/configs/spieval.h | 5 - include/configs/v38b.h | 2 - include/mpc5xxx.h | 69 +----- 59 files changed, 23 insertions(+), 1170 deletions(-) delete mode 100644 cpu/mpc5xxx/firmware_sc_task.impl.S
MAINTAINERS +0 -1
@@ -80,7 +80,6 @@ Torsten Demke <[email protected]> Wolfgang Denk <[email protected]> - IceCube_5100 MGT5100 IceCube_5200 MPC5200 ARIA MPC5121e
MAKEALL +1 -3
@@ -7,7 +7,7 @@ trap print_stats 0 # Determine number of CPU cores if no default was set : ${BUILD_NCPUS:="`getconf _NPROCESSORS_ONLN`"} -if [ "$BUILD_NCPUS" -gt 1 ] +if [ "$BUILD_NCPUS" -gt 0 ] then JOBS="-j $((BUILD_NCPUS + 1))" else
@@ -61,7 +61,6 @@ LIST_5xxx=" \ EVAL5200 \ fo300 \ galaxy5200 \ - icecube_5100 \ icecube_5200 \ inka4x0 \ ipek01 \
@@ -76,7 +75,6 @@ LIST_5xxx=" \ pf5200 \ PM520 \ TB5200 \ - Total5100 \ Total5200 \ Total5200_Rev2 \ TQM5200 \
Makefile +2 -22
@@ -1,5 +1,5 @@ # -# (C) Copyright 2000-2009 +# (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, wd at denx.de. # # See file CREDITS for list of people who contributed to this
@@ -549,8 +549,7 @@ icecube_5200_LOWBOOT_config \ icecube_5200_LOWBOOT08_config \ icecube_5200_DDR_config \ icecube_5200_DDR_LOWBOOT_config \ -icecube_5200_DDR_LOWBOOT08_config \ -icecube_5100_config: unconfig +icecube_5200_DDR_LOWBOOT08_config: unconfig @mkdir -p $(obj)include @mkdir -p $(obj)board/icecube @[ -z "$(findstring LOWBOOT_,$@)" ] || \
@@ -569,14 +568,6 @@ icecube_5100_config: unconfig { echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h ; \ $(XECHO) "... DDR memory revision" ; \ } - @[ -z "$(findstring 5200,$@)" ] || \ - { echo "#define CONFIG_MPC5200" >>$(obj)include/config.h ; \ - $(XECHO) "... with MPC5200 processor" ; \ - } - @[ -z "$(findstring 5100,$@)" ] || \ - { echo "#define CONFIG_MGT5100" >>$(obj)include/config.h ; \ - $(XECHO) "... with MGT5100 processor" ; \ - } @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube jupiter_config: unconfig
@@ -595,7 +586,6 @@ lite5200b_LOWBOOT_config: unconfig @mkdir -p $(obj)board/icecube @ echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h @ $(XECHO) "... DDR memory revision" - @ echo "#define CONFIG_MPC5200" >>$(obj)include/config.h @ echo "#define CONFIG_LITE5200B" >>$(obj)include/config.h @[ -z "$(findstring _PM_,$@)" ] || \ { echo "#define CONFIG_LITE5200B_PM" >>$(obj)include/config.h ; \
@@ -605,7 +595,6 @@ lite5200b_LOWBOOT_config: unconfig { echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \ $(XECHO) "... with LOWBOOT configuration" ; \ } - @ $(XECHO) "... with MPC5200B processor" @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube mcc200_config \
@@ -729,21 +718,12 @@ TOP5200_config: unconfig @ echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h @$(MKCONFIG) -n $@ -a TOP5200 ppc mpc5xxx top5200 emk -Total5100_config \ Total5200_config \ Total5200_lowboot_config \ Total5200_Rev2_config \ Total5200_Rev2_lowboot_config: unconfig @mkdir -p $(obj)include @mkdir -p $(obj)board/total5200 - @[ -z "$(findstring 5100,$@)" ] || \ - { echo "#define CONFIG_MGT5100" >>$(obj)include/config.h ; \ - $(XECHO) "... with MGT5100 processor" ; \ - } - @[ -z "$(findstring 5200,$@)" ] || \ - { echo "#define CONFIG_MPC5200" >>$(obj)include/config.h ; \ - $(XECHO) "... with MPC5200 processor" ; \ - } @[ -n "$(findstring Rev,$@)" ] || \ { echo "#define CONFIG_TOTAL5200_REV 1" >>$(obj)include/config.h ; \ $(XECHO) "... revision 1 board" ; \
board/bc3450/bc3450.c +0 -56
74 lines not on this page · raw message
board/bc3450/mt48lc16m16a2-75.h +0 -13
@@ -23,7 +23,6 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000/* #define SDRAM_MODE 0x008D0000 */ /* CAS latency 2 */
@@ -33,15 +32,3 @@/*#define SDRAM_CONFIG1 0xD7322800 */ /* SDRAM controller bug workaround */ #define SDRAM_CONFIG2 0x8AD70000/*#define SDRAM_CONFIG2 0xDDD70000 */ /* SDRAM controller bug workaround */ - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/canmb/canmb.c +0 -52
64 lines not on this page · raw message
board/canmb/mt48lc16m32s2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/esd/cpci5200/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/esd/mecp5200/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/esd/pf5200/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/icecube/icecube.c +1 -59
83 lines not on this page · raw message
board/icecube/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/icecube/mt46v32m16.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/icecube/mt48lc16m16a2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/jupiter/jupiter.c +0 -6
@@ -227,10 +227,6 @@ void flash_preinit(void)* Note that CS_BOOT cannot be cleared when * executing in flash. */ -#if defined(CONFIG_MGT5100 ) - *(vu_long *)MPC5XXX_ADDECR &= ~(1 <<25 );/* disable CS_BOOT */ - *(vu_long *)MPC5XXX_ADDECR |= (1 <<16 );/* enable CS0 */ -#endif *(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1 ;/* clear RO */ }
@@ -248,10 +244,8 @@ void flash_afterinit(ulong size) *(vu_long *)MPC5XXX_BOOTCS_STOP = *(vu_long *)MPC5XXX_CS0_STOP =STOP_REG (CONFIG_SYS_BOOTCS_START | size, size); } -#if defined(CONFIG_MPC5200 ) *(vu_long *)MPC5XXX_ADDECR &= ~(1 <<25 );/* disable CS_BOOT */ *(vu_long *)MPC5XXX_ADDECR |= (1 <<16 );/* enable CS0 */ -#endif }int update_flash_size (int flash_size)
board/mcc200/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/mcc200/mt48lc16m16a2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/mcc200/mt48lc16m32s2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/munices/mt48lc16m16a2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/pm520/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/pm520/mt48lc16m16a2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/pm520/pm520.c +0 -60
81 lines not on this page · raw message
board/total5200/mt48lc16m16a2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/total5200/mt48lc32m16a2-75.h +0 -5
@@ -28,13 +28,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x514F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#else -#error CONFIG_MPC5200 is not defined -#endif
board/total5200/sdram.c +0 -52
61 lines not on this page · raw message
board/total5200/sdram.h +0 -5
@@ -28,12 +28,7 @@ typedef struct {ulong control;ulong config1;ulong config2; -#if defined(CONFIG_MPC5200 )ulong tapdelay; -#endif -#if defined(CONFIG_MGT5100 ) -ulong addrsel; -#endif } sdram_conf_t;long int mpc5xxx_sdram_init (sdram_conf_t *sdram_conf);
board/total5200/total5200.c +1 -26
@@ -47,26 +47,17 @@ phys_size_t initdram (int board_type) sdram_conf.control =SDRAM_CONTROL ; sdram_conf.config1 =SDRAM_CONFIG1 ; sdram_conf.config2 =SDRAM_CONFIG2 ; -#if defined(CONFIG_MPC5200 ) sdram_conf.tapdelay =0 ; -#endif -#if defined(CONFIG_MGT5100 ) - sdram_conf.addrsel =SDRAM_ADDRSEL ; -#endif return mpc5xxx_sdram_init (&sdram_conf); }int checkboard (void ) { -#if defined(CONFIG_MPC5200 )#if CONFIG_TOTAL5200_REV ==2 puts ("Board: Total5200 Rev.2 " );#else puts ("Board: Total5200 " );#endif -#elif defined(CONFIG_MGT5100 ) -puts ("Board: Total5100 " ); -#endif /* * Retrieve FPGA Revision.
@@ -85,20 +76,6 @@ int checkboard (void)return 0 ; } -#if defined(CONFIG_MGT5100 ) -int board_early_init_r (void ) -{ -/* -* Now, when we are in RAM, enable CS0 -* because CS_BOOT cannot be written. -*/ - *(vu_long *)MPC5XXX_ADDECR &= ~(1 <<25 );/* disable CS_BOOT */ - *(vu_long *)MPC5XXX_ADDECR |= (1 <<16 );/* enable CS0 */ - -return 0 ; -} -#endif -#ifdef CONFIG_PCI static struct pci_controller hose;
@@ -266,9 +243,7 @@ static const S1D_REGS init_regs [] =void video_get_info_str (int line_number,char *info) {if (line_number ==1 ) { -#ifdef CONFIG_MGT5100 -strcpy (info," Total5100" ); -#elif CONFIG_TOTAL5200_REV ==1 +#if CONFIG_TOTAL5200_REV ==1 strcpy (info," Total5200" );#elif CONFIG_TOTAL5200_REV ==2 strcpy (info," Total5200 Rev.2" );
board/tqc/tqm5200/mt48lc16m16a2-75.h +0 -13
@@ -23,7 +23,6 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000/* #define SDRAM_MODE 0x008D0000 */ /* CAS latency 2 */
@@ -33,15 +32,3 @@/*#define SDRAM_CONFIG1 0xD7322800 */ /* SDRAM controller bug workaround */ #define SDRAM_CONFIG2 0x8AD70000/*#define SDRAM_CONFIG2 0xDDD70000 */ /* SDRAM controller bug workaround */ - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
cpu/mpc5xxx/Makefile +1 -1
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a START = start.o -SOBJS = io.o firmware_sc_task_bestcomm.impl.o firmware_sc_task.impl.o +SOBJS = io.o firmware_sc_task_bestcomm.impl.o COBJS = i2c.o traps.o cpu.o cpu_init.o ide.o interrupts.o \ loadtask.o pci_mpc5200.o serial.o speed.o usb_ohci.o usb.o
cpu/mpc5xxx/cpu.c +0 -7
@@ -50,16 +50,10 @@ int checkcpu (void) {ulong clock = gd->cpu_clk;char buf[32 ]; -#ifndef CONFIG_MGT5100 uint svr, pvr; -#endif puts ("CPU: " ); -#ifdef CONFIG_MGT5100 -puts (CPU_ID_STR ); -printf (" (JTAG ID %08lx)" , *(vu_long *)MPC5XXX_CDM_JTAGID ); -#else svr =get_svr (); pvr =get_pvr ();
@@ -77,7 +71,6 @@ int checkcpu (void)printf (" v%d.%d, Core v%d.%d" ,SVR_MJREV (svr),SVR_MNREV (svr),PVR_MAJ (pvr),PVR_MIN (pvr)); -#endif printf (" at %s MHz\n" ,strmhz (buf, clock));return 0 ; }
cpu/mpc5xxx/cpu_init.c +7 -28
@@ -53,10 +53,6 @@ void cpu_init_f (void) (struct mpc5xxx_gpt *)MPC5XXX_GPT ;#endif /* CONFIG_WATCHDOG */ unsigned long addecr = (1 <<25 );/* Boot_CS */ - -#if defined(CONFIG_SYS_RAMBOOT ) && defined(CONFIG_MGT5100 ) - addecr |= (1 <<22 );/* SDRAM enable */ -#endif /* Pointer is writable since we allocated a register for it */ gd = (gd_t *) (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_GBL_DATA_OFFSET );
@@ -136,7 +132,6 @@ void cpu_init_f (void)out_be32 (&lpb->cs5_cfg,CONFIG_SYS_CS5_CFG );#endif -#if defined(CONFIG_MPC5200 ) addecr |=1 ;#if defined(CONFIG_SYS_CS6_START ) && defined(CONFIG_SYS_CS6_SIZE )out_be32 (&mm->cs6_start,START_REG (CONFIG_SYS_CS6_START ));
@@ -164,14 +159,9 @@ void cpu_init_f (void)#if defined(CONFIG_SYS_CS_DEADCYCLE )out_be32 (&lpb->cs_deadcycle,CONFIG_SYS_CS_DEADCYCLE );#endif -#endif /* CONFIG_MPC5200 */ /* Enable chip selects */ -#if defined(CONFIG_MGT5100 ) -out_be32 (&mm->addecr, addecr); -#elif defined(CONFIG_MPC5200 )out_be32 (&mm->ipbi_ws_ctrl, addecr); -#endif out_be32 (&lpb->cs_ctrl, (1 <<24 ));/* Setup pin multiplexing */
@@ -179,7 +169,6 @@ void cpu_init_f (void)out_be32 (&gpio->port_config,CONFIG_SYS_GPS_PORT_CONFIG );#endif -#if defined(CONFIG_MPC5200 )/* enable timebase */ setbits_be32 (&xlb->config, (1 <<13 ));
@@ -187,33 +176,29 @@ void cpu_init_f (void)setbits_be32 (&xlb->config, (1 <<15 ));out_be32 (&xlb->snoop_window,CONFIG_SYS_SDRAM_BASE |0x1d ); -# if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK ) +#if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK )/* Motorola reports IPB should better run at 133 MHz. */ -# if defined(CONFIG_MGT5100 ) -setbits_be32 (&mm->addecr,1 ); -# elif defined(CONFIG_MPC5200 )setbits_be32 (&mm->ipbi_ws_ctrl,1 ); -# endif /* pci_clk_sel = 0x02, ipb_clk_sel = 0x00; */ addecr =in_be32 (&cdm->cfg); addecr &= ~0x103 ; -# if defined(CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 ) +# if defined(CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 )/* pci_clk_sel = 0x01 -> IPB_CLK/2 */ addecr |=0x01 ; -# else +# else /* pci_clk_sel = 0x02 -> XLB_CLK/4 = IPB_CLK/4 */ addecr |=0x02 ; -# endif /* CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 */ +# endif /* CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 */ out_be32 (&cdm->cfg, addecr); -# endif /* CONFIG_SYS_IPBCLK_EQUALS_XLBCLK */ +#endif /* CONFIG_SYS_IPBCLK_EQUALS_XLBCLK */ /* Configure the XLB Arbiter */ out_be32 (&xlb->master_pri_enable,0xff );out_be32 (&xlb->master_priority,0x11111111 ); -# if defined(CONFIG_SYS_XLB_PIPELINING ) +#if defined(CONFIG_SYS_XLB_PIPELINING )/* Enable piplining */ clrbits_be32 (&xlb->config, (1 <<31 )); -# endif +#endif #if defined(CONFIG_WATCHDOG )/* Charge the watchdog timer - prescaler = 64k, count = 64k*/
@@ -222,8 +207,6 @@ void cpu_init_f (void)reset_5xxx_watchdog ();#endif /* CONFIG_WATCHDOG */ - -#endif /* CONFIG_MPC5200 */ }/*
@@ -235,11 +218,7 @@ int cpu_init_r (void) (struct mpc5xxx_intr *)MPC5XXX_ICTL ;/* mask all interrupts */ -#if defined(CONFIG_MGT5100 ) -out_be32 (&intr->per_mask,0xfffffc00 ); -#elif defined(CONFIG_MPC5200 )out_be32 (&intr->per_mask,0xffffff00 ); -#endif setbits_be32 (&intr->main_mask,0x0001ffff );clrbits_be32 (&intr->ctrl,0x00000f00 );/* route critical ints to normal ints */
cpu/mpc5xxx/firmware_sc_task.impl.S deleted +0 -364
364 lines not on this page · raw message
cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S +0 -4
@@ -6,8 +6,6 @@ #include <config.h> -#if defined(CONFIG_MPC5200) - /* sas/sccg, gas target */ .section smartdmaInitData,"aw", at progbits /* Initialized data for task variables */ .section smartdmaTaskTable,"aw", at progbits /* Task tables */
@@ -359,5 +357,3 @@ scEthernetRecv_CSave: /* Task 0 context save space */ .globl scEthernetXmit_CSave scEthernetXmit_CSave: /* Task 1 context save space */ .space 128, 0x0 - -#endif /* CONFIG_MPC5200 */
cpu/mpc5xxx/pci_mpc5200.c +2 -2
@@ -23,7 +23,7 @@#include <common.h> -#if defined(CONFIG_PCI ) && defined(CONFIG_MPC5200 ) +#if defined(CONFIG_PCI )#include <asm/processor.h> #include <asm/io.h>
@@ -184,4 +184,4 @@ void pci_mpc5xxx_init (struct pci_controller *hose) hose->last_busno = pci_hose_scan(hose); } -#endif /* CONFIG_PCI && CONFIG_MPC5200 */ +#endif /* CONFIG_PCI */
cpu/mpc5xxx/serial.c +0 -17
@@ -50,8 +50,6 @@ DECLARE_GLOBAL_DATA_PTR;#define PSC_BASE MPC5XXX_PSC2#elif CONFIG_PSC_CONSOLE ==3 #define PSC_BASE MPC5XXX_PSC3 -#elif defined(CONFIG_MGT5100 ) -#error CONFIG_PSC_CONSOLE must be in 1, 2 or 3#elif CONFIG_PSC_CONSOLE ==4 #define PSC_BASE MPC5XXX_PSC4#elif CONFIG_PSC_CONSOLE ==5
@@ -73,8 +71,6 @@ DECLARE_GLOBAL_DATA_PTR;#define PSC_BASE2 MPC5XXX_PSC2#elif CONFIG_PSC_CONSOLE2 ==3 #define PSC_BASE2 MPC5XXX_PSC3 -#elif defined(CONFIG_MGT5100 ) -#error CONFIG_PSC_CONSOLE2 must be in 1, 2 or 3#elif CONFIG_PSC_CONSOLE2 ==4 #define PSC_BASE2 MPC5XXX_PSC4#elif CONFIG_PSC_CONSOLE2 ==5
@@ -104,23 +100,14 @@ int serial_init (void) psc->command =PSC_SEL_MODE_REG_1 ;/* select clock sources */ -#if defined(CONFIG_MGT5100 ) - psc->psc_clock_select =0xdd00 ; - baseclk = (CONFIG_SYS_MPC5XXX_CLKIN +16 ) /32 ; -#elif defined(CONFIG_MPC5200 ) psc->psc_clock_select =0 ; baseclk = (gd->ipb_clk +16 ) /32 ; -#endif /* switch to UART mode */ psc->sicr =0 ;/* configure parity, bit length and so on */ -#if defined(CONFIG_MGT5100 ) - psc->mode =PSC_MODE_ERR |PSC_MODE_8_BITS |PSC_MODE_PARNONE ; -#elif defined(CONFIG_MPC5200 ) psc->mode =PSC_MODE_8_BITS |PSC_MODE_PARNONE ; -#endif psc->mode =PSC_MODE_ONE_STOP ;/* set up UART divisor */
@@ -246,11 +233,7 @@ void serial_setbrg(void)#endif unsigned long baseclk, div; -#if defined(CONFIG_MGT5100 ) - baseclk = (CONFIG_SYS_MPC5XXX_CLKIN +16 ) /32 ; -#elif defined(CONFIG_MPC5200 ) baseclk = (gd->ipb_clk +16 ) /32 ; -#endif /* set up UART divisor */ div = (baseclk + (gd->baudrate/2 )) / gd->baudrate;
cpu/mpc5xxx/start.S +0 -8
@@ -111,9 +111,6 @@ boot_warm: # if defined(CONFIG_SYS_RAMBOOT) # error CONFIG_SYS_LOWBOOT is incompatible with CONFIG_SYS_RAMBOOT # endif /* CONFIG_SYS_RAMBOOT */ -# if defined(CONFIG_MGT5100) -# error CONFIG_SYS_LOWBOOT is incompatible with MGT5100 -# endif /* CONFIG_MGT5100 */ lis r4, CONFIG_SYS_DEFAULT_MBAR at h lis r3, START_REG(CONFIG_SYS_BOOTCS_START)@h ori r3, r3, START_REG(CONFIG_SYS_BOOTCS_START)@l
@@ -145,14 +142,9 @@ lowboot_reentry: #if defined(CONFIG_SYS_DEFAULT_MBAR) && !defined(CONFIG_SYS_RAMBOOT) lis r3, CONFIG_SYS_MBAR at h ori r3, r3, CONFIG_SYS_MBAR at l -#if defined(CONFIG_MPC5200) /* MBAR is mirrored into the MBAR SPR */ mtspr MBAR,r3 rlwinm r3, r3, 16, 16, 31 -#endif -#if defined(CONFIG_MGT5100) - rlwinm r3, r3, 17, 15, 31 -#endif lis r4, CONFIG_SYS_DEFAULT_MBAR at h stw r3, 0(r4) #endif /* CONFIG_SYS_DEFAULT_MBAR */
cpu/mpc5xxx/usb_ohci.c +0 -7
@@ -76,13 +76,8 @@#define m16_swap (x) swap_16(x)#define m32_swap (x) swap_32(x) -#ifdef CONFIG_MPC5200 #define ohci_cpu_to_le16 (x) (x)#define ohci_cpu_to_le32 (x) (x) -#else -#define ohci_cpu_to_le16 (x) swap_16(x) -#define ohci_cpu_to_le32 (x) swap_32(x) -#endif /* global ohci_t */ static ohci_t gohci;
@@ -803,9 +798,7 @@ static td_t * dl_reverse_done_list (ohci_t *ohci) }else td_list->ed->hwHeadP &=ohci_cpu_to_le32 (0xfffffff2 ); } -#ifdef CONFIG_MPC5200 td_list->hwNextTD =0 ; -#endif } td_list->next_dl_td = td_rev;
cpu/mpc5xxx/usb_ohci.h +0 -5
@@ -127,13 +127,8 @@ typedef struct td td_t;#define NUM_INTS 32/* part of the OHCI standard */ struct ohci_hcca {__u32 int_table[NUM_INTS ];/* Interrupt ED table */ -#if defined(CONFIG_MPC5200 )__u16 pad1;/* set to 0 on each frame_no change */ __u16 frame_no;/* current frame number */ -#else -__u16 frame_no;/* current frame number */ -__u16 pad1;/* set to 0 on each frame_no change */ -#endif __u32 done_head;/* info returned for an interrupt */ u8 reserved_for_hc[116 ]; } __attribute__((aligned (256 )));
drivers/input/ps2ser.c +0 -11
@@ -36,8 +36,6 @@ DECLARE_GLOBAL_DATA_PTR;#define PSC_BASE MPC5XXX_PSC2#elif CONFIG_PS2SERIAL ==3 #define PSC_BASE MPC5XXX_PSC3 -#elif defined(CONFIG_MGT5100 ) -#error CONFIG_PS2SERIAL must be in 1, 2 or 3#elif CONFIG_PS2SERIAL ==4 #define PSC_BASE MPC5XXX_PSC4#elif CONFIG_PS2SERIAL ==5
@@ -87,23 +85,14 @@ int ps2ser_init(void) psc->command =PSC_SEL_MODE_REG_1 ;/* select clock sources */ -#if defined(CONFIG_MGT5100 ) - psc->psc_clock_select =0xdd00 ; - baseclk = (CONFIG_SYS_MPC5XXX_CLKIN +16 ) /32 ; -#elif defined(CONFIG_MPC5200 ) psc->psc_clock_select =0 ; baseclk = (gd->ipb_clk +16 ) /32 ; -#endif /* switch to UART mode */ psc->sicr =0 ;/* configure parity, bit length and so on */ -#if defined(CONFIG_MGT5100 ) - psc->mode =PSC_MODE_ERR |PSC_MODE_8_BITS |PSC_MODE_PARNONE ; -#elif defined(CONFIG_MPC5200 ) psc->mode =PSC_MODE_8_BITS |PSC_MODE_PARNONE ; -#endif psc->mode =PSC_MODE_ONE_STOP ;/* set up UART divisor */
drivers/net/mpc5xxx_fec.c +2 -8
@@ -336,13 +336,11 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis)*/ fec->eth->xmit_fsm =0x03000000 ; -#if defined(CONFIG_MPC5200 )/* -* Turn off COMM bus prefetch in the MGT5200 BestComm. It doesn't +* Turn off COMM bus prefetch in the MPC5200 BestComm. It doesn't * work w/ the current receive task. */ sdma->PtdCntrl |=0x00000001 ; -#endif /* * Set priority of different initiators
@@ -579,9 +577,7 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis)/********************************************************************/ static void mpc5xxx_fec_halt (struct eth_device *dev) { -#if defined(CONFIG_MPC5200 )struct mpc5xxx_sdma *sdma = (struct mpc5xxx_sdma *)MPC5XXX_SDMA ; -#endif mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv;int counter =0xffff ;
@@ -611,13 +607,11 @@ static void mpc5xxx_fec_halt(struct eth_device *dev)SDMA_TASK_DISABLE (FEC_XMIT_TASK_NO );SDMA_TASK_DISABLE (FEC_RECV_TASK_NO ); -#if defined(CONFIG_MPC5200 )/* -* Turn on COMM bus prefetch in the MGT5200 BestComm after we're +* Turn on COMM bus prefetch in the MPC5200 BestComm after we're * done. It doesn't work w/ the current receive task. */ sdma->PtdCntrl &= ~0x00000001 ; -#endif /* * Disable the Ethernet Controller
include/configs/BC3450.h +2 -7
@@ -471,13 +471,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 ) -# define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI -# define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -# define CONFIG_SYS_HID0_INIT 0 -# define CONFIG_SYS_HID0_FINAL 0 -#endif +#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI +#define CONFIG_SYS_HID0_FINAL HID0_ICE#define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/IceCube.h +1 -12
@@ -30,6 +30,7 @@*/ #define CONFIG_MPC5xxx 1/* This is an MPC5xxx CPU */ +#define CONFIG_MPC5200 1/* (more precisely a MPC5200 CPU) */ #define CONFIG_ICECUBE 1/* ... on IceCube board */ #define CONFIG_SYS_MPC5XXX_CLKIN 33000000/* ... running at 33.000000MHz */
@@ -47,7 +48,6 @@#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory
@@ -77,10 +77,6 @@#define CONFIG_SYS_RX_ETH_BUFFER 8/* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1 -#else -#define CONFIG_MII 1 -#endif -/* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION
@@ -169,7 +165,6 @@#define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */
@@ -178,7 +173,6 @@#else #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ #endif -#endif /* CONFIG_MPC5200 */ /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1
@@ -338,13 +332,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #if defined(CONFIG_LITE5200B )#define CONFIG_SYS_CS1_START CONFIG_SYS_FLASH_BASE
include/configs/PM520.h +0 -11
@@ -50,7 +50,6 @@#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory
@@ -75,7 +74,6 @@#define CONFIG_SYS_RX_ETH_BUFFER 8/* use 8 rx buffer on eepro100 */ #undef CONFIG_NS8382X -#endif /* Partitions */ #define CONFIG_DOS_PARTITION
@@ -111,9 +109,7 @@#define CONFIG_CMD_SNTP #define CONFIG_CMD_USB -#if defined(CONFIG_MPC5200 )#define CONFIG_CMD_PCI -#endif /*
@@ -147,12 +143,10 @@#define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ -#endif /* * I2C configuration */
@@ -301,13 +295,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #if defined(CONFIG_BOOT_ROM )#define CONFIG_SYS_BOOTCS_START CONFIG_SYS_BOOTROM_BASE
include/configs/TB5200.h +0 -5
@@ -430,13 +430,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/TQM5200.h +0 -5
@@ -633,13 +633,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/Total5200.h +2 -21
@@ -41,6 +41,7 @@*/ #define CONFIG_MPC5xxx 1/* This is an MPC5xxx CPU */ +#define CONFIG_MPC5200 1/* (more precisely a MPC5200 CPU) */ #define CONFIG_TOTAL5200 1/* ... on Total5200 board */ #define CONFIG_SYS_MPC5XXX_CLKIN 33000000/* ... running at 33.000000MHz */
@@ -73,7 +74,6 @@#define CONFIG_SPLASH_SCREEN -#ifdef CONFIG_MPC5200 /* MGT5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory
@@ -98,12 +98,6 @@#define CONFIG_SYS_RX_ETH_BUFFER 8/* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1 -#else /* MGT5100 */ - -#define CONFIG_MII 1 - -#endif -/* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION
@@ -127,9 +121,7 @@*/ #include <config_cmd_default.h> -#if defined(CONFIG_MPC5200 ) -#define CONFIG_CMD_PCI -#endif +#define CONFIG_CMD_PCI #define CONFIG_CMD_BMP #define CONFIG_CMD_EEPROM
@@ -176,12 +168,10 @@#define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ -#endif /* * I2C configuration
@@ -326,17 +316,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif - -#if defined (CONFIG_MGT5100 ) -# define CONFIG_BOARD_EARLY_INIT_R /* switch from CS_BOOT to CS0 */ -#endif #if CONFIG_TOTAL5200_REV ==1 # define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE
include/configs/aev.h +0 -5
@@ -362,13 +362,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/cpci5200.h +0 -11
@@ -59,7 +59,6 @@#define CONFIG_BAUDRATE 9600/* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory
@@ -90,8 +89,6 @@#define CONFIG_NS8382X 1#endif -#endif -/* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION
@@ -169,8 +166,6 @@#define CONFIG_BOOTCOMMAND "run flash_vxworks0" -#if defined(CONFIG_MPC5200 ) -#define CONFIG_RTC_M48T35A 1/* ST Electronics M48 timekeeper */ #define CONFIG_SYS_NVRAM_BASE_ADDR 0xfd010000#define CONFIG_SYS_NVRAM_SIZE 32*1024
@@ -179,7 +174,6 @@* IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ -#endif /* * I2C configuration */
@@ -303,13 +297,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/hmi1001.h +0 -5
@@ -261,13 +261,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/inka4x0.h +0 -5
@@ -366,13 +366,8 @@ static inline void tws_data_config_output(unsigned output)/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/ipek01.h +0 -5
@@ -327,13 +327,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/manroland/mpc5200-common.h +0 -5
@@ -170,13 +170,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/mecp5200.h +0 -14
@@ -63,9 +63,6 @@#endif #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } - -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ -#define CONFIG_MII #if 0 /* test-only !!! */ #define CONFIG_NET_MULTI 1
@@ -74,10 +71,6 @@#define CONFIG_NS8382X 1#endif -#else /* MPC5100 */ - -#endif -/* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION
@@ -152,12 +145,10 @@#define CONFIG_BOOTCOMMAND "run flash_vxworks0" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBSPEED_133/* define for 133MHz speed */ -#endif /* * I2C configuration */
@@ -288,13 +279,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/o2dnt.h +0 -7
@@ -138,7 +138,6 @@#define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */
@@ -154,7 +153,6 @@*/ #define CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 /* define for 66MHz speed */ #endif -#endif /* * I2C configuration
@@ -276,13 +274,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/pf5200.h +0 -11
@@ -61,7 +61,6 @@#endif #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory
@@ -87,7 +86,6 @@#define CONFIG_SYS_RX_ETH_BUFFER 8/* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1#endif -#endif /* Partitions */ #define CONFIG_MAC_PARTITION
@@ -121,9 +119,7 @@#define CONFIG_CMD_I2C #define CONFIG_CMD_IDE -#ifdef CONFIG_MPC5200 #define CONFIG_CMD_PCI -#endif #if (TEXT_BASE ==0xFF000000 )/* Boot low with 16 MB Flash */
@@ -166,12 +162,10 @@#define CONFIG_BOOTCOMMAND "run flash_vxworks0" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ -#endif /* * I2C configuration */
@@ -289,13 +283,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/smmaco4.h +0 -5
@@ -358,13 +358,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/spieval.h +0 -5
@@ -438,13 +438,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/v38b.h +0 -2
@@ -170,12 +170,10 @@#define CONFIG_BOOTCOMMAND "run net_nfs" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ -#endif /* * I2C configuration
include/mpc5xxx.h +1 -68
188 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH 1/1 mpc5xxx: Remove all references to MGT5100
Quoted 7 lines · Detlev Zundel
We do not support a processor that never reached a real customer.
Signed-off-by Detlev Zundel <[email protected]>---
This is really -next stuff. The patch was tested on lite5200b and on TQM5200.
[...]
MAKEALL trap print_stats 0 · line 13
Quoted 13 lines
MAKEALL +1
-1@@ -7,7 +7,7 @@ trap print_stats 0 # Determine number of CPU cores if no default was set : ${BUILD_NCPUS:="`getconf _NPROCESSORS_ONLN`"} -if [ "$BUILD_NCPUS" -gt 1 ] +if [ "$BUILD_NCPUS" -gt 0 ] then JOBS="-j $((BUILD_NCPUS + 1))" else
Ooops, this chunk slipped through the cracks and will be fixed in subsequent versions, sorry.
Cheers
Detlev
Signature · 6 lines
He who can properly define and divide is to be considered a god.
-- Plato
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.dePATCH v2 1/1 mpc5xxx: Remove all references to MGT5100
We do not support a processor that never reached a real customer.
--- MAINTAINERS | 1 - MAKEALL | 2 - Makefile | 24 +-- board/bc3450/bc3450.c | 56 ---- board/bc3450/mt48lc16m16a2-75.h | 13 - board/canmb/canmb.c | 52 ---- board/canmb/mt48lc16m32s2-75.h | 13 - board/esd/cpci5200/mt46v16m16-75.h | 5 - board/esd/mecp5200/mt46v16m16-75.h | 5 - board/esd/pf5200/mt46v16m16-75.h | 5 - board/icecube/icecube.c | 60 +---- board/icecube/mt46v16m16-75.h | 5 - board/icecube/mt46v32m16.h | 5 - board/icecube/mt48lc16m16a2-75.h | 13 - board/jupiter/jupiter.c | 6 - board/mcc200/mt46v16m16-75.h | 5 - board/mcc200/mt48lc16m16a2-75.h | 13 - board/mcc200/mt48lc16m32s2-75.h | 13 - board/munices/mt48lc16m16a2-75.h | 13 - board/pm520/mt46v16m16-75.h | 5 - board/pm520/mt48lc16m16a2-75.h | 13 - board/pm520/pm520.c | 60 ----- board/total5200/mt48lc16m16a2-75.h | 13 - board/total5200/mt48lc32m16a2-75.h | 5 - board/total5200/sdram.c | 52 ---- board/total5200/sdram.h | 5 - board/total5200/total5200.c | 27 +-- board/tqc/tqm5200/mt48lc16m16a2-75.h | 13 - cpu/mpc5xxx/Makefile | 2 +- cpu/mpc5xxx/cpu.c | 7 - cpu/mpc5xxx/cpu_init.c | 35 +-- cpu/mpc5xxx/firmware_sc_task.impl.S | 364 -------------------------- cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S | 4 - cpu/mpc5xxx/pci_mpc5200.c | 4 +- cpu/mpc5xxx/serial.c | 17 -- cpu/mpc5xxx/start.S | 8 - cpu/mpc5xxx/usb_ohci.c | 7 - cpu/mpc5xxx/usb_ohci.h | 5 - drivers/input/ps2ser.c | 11 - drivers/net/mpc5xxx_fec.c | 10 +- include/configs/BC3450.h | 9 +- include/configs/IceCube.h | 13 +- include/configs/PM520.h | 11 - include/configs/TB5200.h | 5 - include/configs/TQM5200.h | 5 - include/configs/Total5200.h | 23 +-- include/configs/aev.h | 5 - include/configs/cpci5200.h | 11 - include/configs/hmi1001.h | 5 - include/configs/inka4x0.h | 5 - include/configs/ipek01.h | 5 - include/configs/manroland/mpc5200-common.h | 5 - include/configs/mecp5200.h | 14 - include/configs/o2dnt.h | 7 - include/configs/pf5200.h | 11 - include/configs/smmaco4.h | 5 - include/configs/spieval.h | 5 - include/configs/v38b.h | 2 - include/mpc5xxx.h | 69 +----- 59 files changed, 22 insertions(+), 1169 deletions(-) delete mode 100644 cpu/mpc5xxx/firmware_sc_task.impl.S
MAINTAINERS +0 -1
@@ -80,7 +80,6 @@ Torsten Demke <[email protected]> Wolfgang Denk <[email protected]> - IceCube_5100 MGT5100 IceCube_5200 MPC5200 ARIA MPC5121e
MAKEALL +0 -2
@@ -61,7 +61,6 @@ LIST_5xxx=" \ EVAL5200 \ fo300 \ galaxy5200 \ - icecube_5100 \ icecube_5200 \ inka4x0 \ ipek01 \
@@ -76,7 +75,6 @@ LIST_5xxx=" \ pf5200 \ PM520 \ TB5200 \ - Total5100 \ Total5200 \ Total5200_Rev2 \ TQM5200 \
Makefile +2 -22
@@ -1,5 +1,5 @@ # -# (C) Copyright 2000-2009 +# (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, wd at denx.de. # # See file CREDITS for list of people who contributed to this
@@ -549,8 +549,7 @@ icecube_5200_LOWBOOT_config \ icecube_5200_LOWBOOT08_config \ icecube_5200_DDR_config \ icecube_5200_DDR_LOWBOOT_config \ -icecube_5200_DDR_LOWBOOT08_config \ -icecube_5100_config: unconfig +icecube_5200_DDR_LOWBOOT08_config: unconfig @mkdir -p $(obj)include @mkdir -p $(obj)board/icecube @[ -z "$(findstring LOWBOOT_,$@)" ] || \
@@ -569,14 +568,6 @@ icecube_5100_config: unconfig { echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h ; \ $(XECHO) "... DDR memory revision" ; \ } - @[ -z "$(findstring 5200,$@)" ] || \ - { echo "#define CONFIG_MPC5200" >>$(obj)include/config.h ; \ - $(XECHO) "... with MPC5200 processor" ; \ - } - @[ -z "$(findstring 5100,$@)" ] || \ - { echo "#define CONFIG_MGT5100" >>$(obj)include/config.h ; \ - $(XECHO) "... with MGT5100 processor" ; \ - } @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube jupiter_config: unconfig
@@ -595,7 +586,6 @@ lite5200b_LOWBOOT_config: unconfig @mkdir -p $(obj)board/icecube @ echo "#define CONFIG_MPC5200_DDR" >>$(obj)include/config.h @ $(XECHO) "... DDR memory revision" - @ echo "#define CONFIG_MPC5200" >>$(obj)include/config.h @ echo "#define CONFIG_LITE5200B" >>$(obj)include/config.h @[ -z "$(findstring _PM_,$@)" ] || \ { echo "#define CONFIG_LITE5200B_PM" >>$(obj)include/config.h ; \
@@ -605,7 +595,6 @@ lite5200b_LOWBOOT_config: unconfig { echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \ $(XECHO) "... with LOWBOOT configuration" ; \ } - @ $(XECHO) "... with MPC5200B processor" @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube mcc200_config \
@@ -729,21 +718,12 @@ TOP5200_config: unconfig @ echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h @$(MKCONFIG) -n $@ -a TOP5200 ppc mpc5xxx top5200 emk -Total5100_config \ Total5200_config \ Total5200_lowboot_config \ Total5200_Rev2_config \ Total5200_Rev2_lowboot_config: unconfig @mkdir -p $(obj)include @mkdir -p $(obj)board/total5200 - @[ -z "$(findstring 5100,$@)" ] || \ - { echo "#define CONFIG_MGT5100" >>$(obj)include/config.h ; \ - $(XECHO) "... with MGT5100 processor" ; \ - } - @[ -z "$(findstring 5200,$@)" ] || \ - { echo "#define CONFIG_MPC5200" >>$(obj)include/config.h ; \ - $(XECHO) "... with MPC5200 processor" ; \ - } @[ -n "$(findstring Rev,$@)" ] || \ { echo "#define CONFIG_TOTAL5200_REV 1" >>$(obj)include/config.h ; \ $(XECHO) "... revision 1 board" ; \
board/bc3450/bc3450.c +0 -56
74 lines not on this page · raw message
board/bc3450/mt48lc16m16a2-75.h +0 -13
@@ -23,7 +23,6 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000/* #define SDRAM_MODE 0x008D0000 */ /* CAS latency 2 */
@@ -33,15 +32,3 @@/*#define SDRAM_CONFIG1 0xD7322800 */ /* SDRAM controller bug workaround */ #define SDRAM_CONFIG2 0x8AD70000/*#define SDRAM_CONFIG2 0xDDD70000 */ /* SDRAM controller bug workaround */ - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/canmb/canmb.c +0 -52
64 lines not on this page · raw message
board/canmb/mt48lc16m32s2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/esd/cpci5200/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/esd/mecp5200/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/esd/pf5200/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/icecube/icecube.c +1 -59
83 lines not on this page · raw message
board/icecube/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/icecube/mt46v32m16.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/icecube/mt48lc16m16a2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/jupiter/jupiter.c +0 -6
@@ -227,10 +227,6 @@ void flash_preinit(void)* Note that CS_BOOT cannot be cleared when * executing in flash. */ -#if defined(CONFIG_MGT5100 ) - *(vu_long *)MPC5XXX_ADDECR &= ~(1 <<25 );/* disable CS_BOOT */ - *(vu_long *)MPC5XXX_ADDECR |= (1 <<16 );/* enable CS0 */ -#endif *(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1 ;/* clear RO */ }
@@ -248,10 +244,8 @@ void flash_afterinit(ulong size) *(vu_long *)MPC5XXX_BOOTCS_STOP = *(vu_long *)MPC5XXX_CS0_STOP =STOP_REG (CONFIG_SYS_BOOTCS_START | size, size); } -#if defined(CONFIG_MPC5200 ) *(vu_long *)MPC5XXX_ADDECR &= ~(1 <<25 );/* disable CS_BOOT */ *(vu_long *)MPC5XXX_ADDECR |= (1 <<16 );/* enable CS0 */ -#endif }int update_flash_size (int flash_size)
board/mcc200/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/mcc200/mt48lc16m16a2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/mcc200/mt48lc16m32s2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/munices/mt48lc16m16a2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/pm520/mt46v16m16-75.h +0 -5
@@ -23,7 +23,6 @@#define SDRAM_DDR 1/* is DDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x018D0000#define SDRAM_EMODE 0x40090000
@@ -31,7 +30,3 @@#define SDRAM_CONFIG1 0x73722930#define SDRAM_CONFIG2 0x47770000#define SDRAM_TAPDELAY 0x10000000 - -#else -#error CONFIG_MPC5200 not defined -#endif
board/pm520/mt48lc16m16a2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/pm520/pm520.c +0 -60
81 lines not on this page · raw message
board/total5200/mt48lc16m16a2-75.h +0 -13
@@ -23,21 +23,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x504F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
board/total5200/mt48lc32m16a2-75.h +0 -5
@@ -28,13 +28,8 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000#define SDRAM_CONTROL 0x514F0000#define SDRAM_CONFIG1 0xD2322800#define SDRAM_CONFIG2 0x8AD70000 - -#else -#error CONFIG_MPC5200 is not defined -#endif
board/total5200/sdram.c +0 -52
61 lines not on this page · raw message
board/total5200/sdram.h +0 -5
@@ -28,12 +28,7 @@ typedef struct {ulong control;ulong config1;ulong config2; -#if defined(CONFIG_MPC5200 )ulong tapdelay; -#endif -#if defined(CONFIG_MGT5100 ) -ulong addrsel; -#endif } sdram_conf_t;long int mpc5xxx_sdram_init (sdram_conf_t *sdram_conf);
board/total5200/total5200.c +1 -26
@@ -47,26 +47,17 @@ phys_size_t initdram (int board_type) sdram_conf.control =SDRAM_CONTROL ; sdram_conf.config1 =SDRAM_CONFIG1 ; sdram_conf.config2 =SDRAM_CONFIG2 ; -#if defined(CONFIG_MPC5200 ) sdram_conf.tapdelay =0 ; -#endif -#if defined(CONFIG_MGT5100 ) - sdram_conf.addrsel =SDRAM_ADDRSEL ; -#endif return mpc5xxx_sdram_init (&sdram_conf); }int checkboard (void ) { -#if defined(CONFIG_MPC5200 )#if CONFIG_TOTAL5200_REV ==2 puts ("Board: Total5200 Rev.2 " );#else puts ("Board: Total5200 " );#endif -#elif defined(CONFIG_MGT5100 ) -puts ("Board: Total5100 " ); -#endif /* * Retrieve FPGA Revision.
@@ -85,20 +76,6 @@ int checkboard (void)return 0 ; } -#if defined(CONFIG_MGT5100 ) -int board_early_init_r (void ) -{ -/* -* Now, when we are in RAM, enable CS0 -* because CS_BOOT cannot be written. -*/ - *(vu_long *)MPC5XXX_ADDECR &= ~(1 <<25 );/* disable CS_BOOT */ - *(vu_long *)MPC5XXX_ADDECR |= (1 <<16 );/* enable CS0 */ - -return 0 ; -} -#endif -#ifdef CONFIG_PCI static struct pci_controller hose;
@@ -266,9 +243,7 @@ static const S1D_REGS init_regs [] =void video_get_info_str (int line_number,char *info) {if (line_number ==1 ) { -#ifdef CONFIG_MGT5100 -strcpy (info," Total5100" ); -#elif CONFIG_TOTAL5200_REV ==1 +#if CONFIG_TOTAL5200_REV ==1 strcpy (info," Total5200" );#elif CONFIG_TOTAL5200_REV ==2 strcpy (info," Total5200 Rev.2" );
board/tqc/tqm5200/mt48lc16m16a2-75.h +0 -13
@@ -23,7 +23,6 @@#define SDRAM_DDR 0/* is SDR */ -#if defined(CONFIG_MPC5200 )/* Settings for XLB = 132 MHz */ #define SDRAM_MODE 0x00CD0000/* #define SDRAM_MODE 0x008D0000 */ /* CAS latency 2 */
@@ -33,15 +32,3 @@/*#define SDRAM_CONFIG1 0xD7322800 */ /* SDRAM controller bug workaround */ #define SDRAM_CONFIG2 0x8AD70000/*#define SDRAM_CONFIG2 0xDDD70000 */ /* SDRAM controller bug workaround */ - -#elif defined(CONFIG_MGT5100 ) -/* Settings for XLB = 66 MHz */ -#define SDRAM_MODE 0x008D0000 -#define SDRAM_CONTROL 0x504F0000 -#define SDRAM_CONFIG1 0xC2222600 -#define SDRAM_CONFIG2 0x88B70004 -#define SDRAM_ADDRSEL 0x02000000 - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif
cpu/mpc5xxx/Makefile +1 -1
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a START = start.o -SOBJS = io.o firmware_sc_task_bestcomm.impl.o firmware_sc_task.impl.o +SOBJS = io.o firmware_sc_task_bestcomm.impl.o COBJS = i2c.o traps.o cpu.o cpu_init.o ide.o interrupts.o \ loadtask.o pci_mpc5200.o serial.o speed.o usb_ohci.o usb.o
cpu/mpc5xxx/cpu.c +0 -7
@@ -50,16 +50,10 @@ int checkcpu (void) {ulong clock = gd->cpu_clk;char buf[32 ]; -#ifndef CONFIG_MGT5100 uint svr, pvr; -#endif puts ("CPU: " ); -#ifdef CONFIG_MGT5100 -puts (CPU_ID_STR ); -printf (" (JTAG ID %08lx)" , *(vu_long *)MPC5XXX_CDM_JTAGID ); -#else svr =get_svr (); pvr =get_pvr ();
@@ -77,7 +71,6 @@ int checkcpu (void)printf (" v%d.%d, Core v%d.%d" ,SVR_MJREV (svr),SVR_MNREV (svr),PVR_MAJ (pvr),PVR_MIN (pvr)); -#endif printf (" at %s MHz\n" ,strmhz (buf, clock));return 0 ; }
cpu/mpc5xxx/cpu_init.c +7 -28
@@ -53,10 +53,6 @@ void cpu_init_f (void) (struct mpc5xxx_gpt *)MPC5XXX_GPT ;#endif /* CONFIG_WATCHDOG */ unsigned long addecr = (1 <<25 );/* Boot_CS */ - -#if defined(CONFIG_SYS_RAMBOOT ) && defined(CONFIG_MGT5100 ) - addecr |= (1 <<22 );/* SDRAM enable */ -#endif /* Pointer is writable since we allocated a register for it */ gd = (gd_t *) (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_GBL_DATA_OFFSET );
@@ -136,7 +132,6 @@ void cpu_init_f (void)out_be32 (&lpb->cs5_cfg,CONFIG_SYS_CS5_CFG );#endif -#if defined(CONFIG_MPC5200 ) addecr |=1 ;#if defined(CONFIG_SYS_CS6_START ) && defined(CONFIG_SYS_CS6_SIZE )out_be32 (&mm->cs6_start,START_REG (CONFIG_SYS_CS6_START ));
@@ -164,14 +159,9 @@ void cpu_init_f (void)#if defined(CONFIG_SYS_CS_DEADCYCLE )out_be32 (&lpb->cs_deadcycle,CONFIG_SYS_CS_DEADCYCLE );#endif -#endif /* CONFIG_MPC5200 */ /* Enable chip selects */ -#if defined(CONFIG_MGT5100 ) -out_be32 (&mm->addecr, addecr); -#elif defined(CONFIG_MPC5200 )out_be32 (&mm->ipbi_ws_ctrl, addecr); -#endif out_be32 (&lpb->cs_ctrl, (1 <<24 ));/* Setup pin multiplexing */
@@ -179,7 +169,6 @@ void cpu_init_f (void)out_be32 (&gpio->port_config,CONFIG_SYS_GPS_PORT_CONFIG );#endif -#if defined(CONFIG_MPC5200 )/* enable timebase */ setbits_be32 (&xlb->config, (1 <<13 ));
@@ -187,33 +176,29 @@ void cpu_init_f (void)setbits_be32 (&xlb->config, (1 <<15 ));out_be32 (&xlb->snoop_window,CONFIG_SYS_SDRAM_BASE |0x1d ); -# if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK ) +#if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK )/* Motorola reports IPB should better run at 133 MHz. */ -# if defined(CONFIG_MGT5100 ) -setbits_be32 (&mm->addecr,1 ); -# elif defined(CONFIG_MPC5200 )setbits_be32 (&mm->ipbi_ws_ctrl,1 ); -# endif /* pci_clk_sel = 0x02, ipb_clk_sel = 0x00; */ addecr =in_be32 (&cdm->cfg); addecr &= ~0x103 ; -# if defined(CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 ) +# if defined(CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 )/* pci_clk_sel = 0x01 -> IPB_CLK/2 */ addecr |=0x01 ; -# else +# else /* pci_clk_sel = 0x02 -> XLB_CLK/4 = IPB_CLK/4 */ addecr |=0x02 ; -# endif /* CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 */ +# endif /* CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 */ out_be32 (&cdm->cfg, addecr); -# endif /* CONFIG_SYS_IPBCLK_EQUALS_XLBCLK */ +#endif /* CONFIG_SYS_IPBCLK_EQUALS_XLBCLK */ /* Configure the XLB Arbiter */ out_be32 (&xlb->master_pri_enable,0xff );out_be32 (&xlb->master_priority,0x11111111 ); -# if defined(CONFIG_SYS_XLB_PIPELINING ) +#if defined(CONFIG_SYS_XLB_PIPELINING )/* Enable piplining */ clrbits_be32 (&xlb->config, (1 <<31 )); -# endif +#endif #if defined(CONFIG_WATCHDOG )/* Charge the watchdog timer - prescaler = 64k, count = 64k*/
@@ -222,8 +207,6 @@ void cpu_init_f (void)reset_5xxx_watchdog ();#endif /* CONFIG_WATCHDOG */ - -#endif /* CONFIG_MPC5200 */ }/*
@@ -235,11 +218,7 @@ int cpu_init_r (void) (struct mpc5xxx_intr *)MPC5XXX_ICTL ;/* mask all interrupts */ -#if defined(CONFIG_MGT5100 ) -out_be32 (&intr->per_mask,0xfffffc00 ); -#elif defined(CONFIG_MPC5200 )out_be32 (&intr->per_mask,0xffffff00 ); -#endif setbits_be32 (&intr->main_mask,0x0001ffff );clrbits_be32 (&intr->ctrl,0x00000f00 );/* route critical ints to normal ints */
cpu/mpc5xxx/firmware_sc_task.impl.S deleted +0 -364
364 lines not on this page · raw message
cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S +0 -4
@@ -6,8 +6,6 @@ #include <config.h> -#if defined(CONFIG_MPC5200) - /* sas/sccg, gas target */ .section smartdmaInitData,"aw", at progbits /* Initialized data for task variables */ .section smartdmaTaskTable,"aw", at progbits /* Task tables */
@@ -359,5 +357,3 @@ scEthernetRecv_CSave: /* Task 0 context save space */ .globl scEthernetXmit_CSave scEthernetXmit_CSave: /* Task 1 context save space */ .space 128, 0x0 - -#endif /* CONFIG_MPC5200 */
cpu/mpc5xxx/pci_mpc5200.c +2 -2
@@ -23,7 +23,7 @@#include <common.h> -#if defined(CONFIG_PCI ) && defined(CONFIG_MPC5200 ) +#if defined(CONFIG_PCI )#include <asm/processor.h> #include <asm/io.h>
@@ -184,4 +184,4 @@ void pci_mpc5xxx_init (struct pci_controller *hose) hose->last_busno = pci_hose_scan(hose); } -#endif /* CONFIG_PCI && CONFIG_MPC5200 */ +#endif /* CONFIG_PCI */
cpu/mpc5xxx/serial.c +0 -17
@@ -50,8 +50,6 @@ DECLARE_GLOBAL_DATA_PTR;#define PSC_BASE MPC5XXX_PSC2#elif CONFIG_PSC_CONSOLE ==3 #define PSC_BASE MPC5XXX_PSC3 -#elif defined(CONFIG_MGT5100 ) -#error CONFIG_PSC_CONSOLE must be in 1, 2 or 3#elif CONFIG_PSC_CONSOLE ==4 #define PSC_BASE MPC5XXX_PSC4#elif CONFIG_PSC_CONSOLE ==5
@@ -73,8 +71,6 @@ DECLARE_GLOBAL_DATA_PTR;#define PSC_BASE2 MPC5XXX_PSC2#elif CONFIG_PSC_CONSOLE2 ==3 #define PSC_BASE2 MPC5XXX_PSC3 -#elif defined(CONFIG_MGT5100 ) -#error CONFIG_PSC_CONSOLE2 must be in 1, 2 or 3#elif CONFIG_PSC_CONSOLE2 ==4 #define PSC_BASE2 MPC5XXX_PSC4#elif CONFIG_PSC_CONSOLE2 ==5
@@ -104,23 +100,14 @@ int serial_init (void) psc->command =PSC_SEL_MODE_REG_1 ;/* select clock sources */ -#if defined(CONFIG_MGT5100 ) - psc->psc_clock_select =0xdd00 ; - baseclk = (CONFIG_SYS_MPC5XXX_CLKIN +16 ) /32 ; -#elif defined(CONFIG_MPC5200 ) psc->psc_clock_select =0 ; baseclk = (gd->ipb_clk +16 ) /32 ; -#endif /* switch to UART mode */ psc->sicr =0 ;/* configure parity, bit length and so on */ -#if defined(CONFIG_MGT5100 ) - psc->mode =PSC_MODE_ERR |PSC_MODE_8_BITS |PSC_MODE_PARNONE ; -#elif defined(CONFIG_MPC5200 ) psc->mode =PSC_MODE_8_BITS |PSC_MODE_PARNONE ; -#endif psc->mode =PSC_MODE_ONE_STOP ;/* set up UART divisor */
@@ -246,11 +233,7 @@ void serial_setbrg(void)#endif unsigned long baseclk, div; -#if defined(CONFIG_MGT5100 ) - baseclk = (CONFIG_SYS_MPC5XXX_CLKIN +16 ) /32 ; -#elif defined(CONFIG_MPC5200 ) baseclk = (gd->ipb_clk +16 ) /32 ; -#endif /* set up UART divisor */ div = (baseclk + (gd->baudrate/2 )) / gd->baudrate;
cpu/mpc5xxx/start.S +0 -8
@@ -111,9 +111,6 @@ boot_warm: # if defined(CONFIG_SYS_RAMBOOT) # error CONFIG_SYS_LOWBOOT is incompatible with CONFIG_SYS_RAMBOOT # endif /* CONFIG_SYS_RAMBOOT */ -# if defined(CONFIG_MGT5100) -# error CONFIG_SYS_LOWBOOT is incompatible with MGT5100 -# endif /* CONFIG_MGT5100 */ lis r4, CONFIG_SYS_DEFAULT_MBAR at h lis r3, START_REG(CONFIG_SYS_BOOTCS_START)@h ori r3, r3, START_REG(CONFIG_SYS_BOOTCS_START)@l
@@ -145,14 +142,9 @@ lowboot_reentry: #if defined(CONFIG_SYS_DEFAULT_MBAR) && !defined(CONFIG_SYS_RAMBOOT) lis r3, CONFIG_SYS_MBAR at h ori r3, r3, CONFIG_SYS_MBAR at l -#if defined(CONFIG_MPC5200) /* MBAR is mirrored into the MBAR SPR */ mtspr MBAR,r3 rlwinm r3, r3, 16, 16, 31 -#endif -#if defined(CONFIG_MGT5100) - rlwinm r3, r3, 17, 15, 31 -#endif lis r4, CONFIG_SYS_DEFAULT_MBAR at h stw r3, 0(r4) #endif /* CONFIG_SYS_DEFAULT_MBAR */
cpu/mpc5xxx/usb_ohci.c +0 -7
@@ -76,13 +76,8 @@#define m16_swap (x) swap_16(x)#define m32_swap (x) swap_32(x) -#ifdef CONFIG_MPC5200 #define ohci_cpu_to_le16 (x) (x)#define ohci_cpu_to_le32 (x) (x) -#else -#define ohci_cpu_to_le16 (x) swap_16(x) -#define ohci_cpu_to_le32 (x) swap_32(x) -#endif /* global ohci_t */ static ohci_t gohci;
@@ -803,9 +798,7 @@ static td_t * dl_reverse_done_list (ohci_t *ohci) }else td_list->ed->hwHeadP &=ohci_cpu_to_le32 (0xfffffff2 ); } -#ifdef CONFIG_MPC5200 td_list->hwNextTD =0 ; -#endif } td_list->next_dl_td = td_rev;
cpu/mpc5xxx/usb_ohci.h +0 -5
@@ -127,13 +127,8 @@ typedef struct td td_t;#define NUM_INTS 32/* part of the OHCI standard */ struct ohci_hcca {__u32 int_table[NUM_INTS ];/* Interrupt ED table */ -#if defined(CONFIG_MPC5200 )__u16 pad1;/* set to 0 on each frame_no change */ __u16 frame_no;/* current frame number */ -#else -__u16 frame_no;/* current frame number */ -__u16 pad1;/* set to 0 on each frame_no change */ -#endif __u32 done_head;/* info returned for an interrupt */ u8 reserved_for_hc[116 ]; } __attribute__((aligned (256 )));
drivers/input/ps2ser.c +0 -11
@@ -36,8 +36,6 @@ DECLARE_GLOBAL_DATA_PTR;#define PSC_BASE MPC5XXX_PSC2#elif CONFIG_PS2SERIAL ==3 #define PSC_BASE MPC5XXX_PSC3 -#elif defined(CONFIG_MGT5100 ) -#error CONFIG_PS2SERIAL must be in 1, 2 or 3#elif CONFIG_PS2SERIAL ==4 #define PSC_BASE MPC5XXX_PSC4#elif CONFIG_PS2SERIAL ==5
@@ -87,23 +85,14 @@ int ps2ser_init(void) psc->command =PSC_SEL_MODE_REG_1 ;/* select clock sources */ -#if defined(CONFIG_MGT5100 ) - psc->psc_clock_select =0xdd00 ; - baseclk = (CONFIG_SYS_MPC5XXX_CLKIN +16 ) /32 ; -#elif defined(CONFIG_MPC5200 ) psc->psc_clock_select =0 ; baseclk = (gd->ipb_clk +16 ) /32 ; -#endif /* switch to UART mode */ psc->sicr =0 ;/* configure parity, bit length and so on */ -#if defined(CONFIG_MGT5100 ) - psc->mode =PSC_MODE_ERR |PSC_MODE_8_BITS |PSC_MODE_PARNONE ; -#elif defined(CONFIG_MPC5200 ) psc->mode =PSC_MODE_8_BITS |PSC_MODE_PARNONE ; -#endif psc->mode =PSC_MODE_ONE_STOP ;/* set up UART divisor */
drivers/net/mpc5xxx_fec.c +2 -8
@@ -336,13 +336,11 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis)*/ fec->eth->xmit_fsm =0x03000000 ; -#if defined(CONFIG_MPC5200 )/* -* Turn off COMM bus prefetch in the MGT5200 BestComm. It doesn't +* Turn off COMM bus prefetch in the MPC5200 BestComm. It doesn't * work w/ the current receive task. */ sdma->PtdCntrl |=0x00000001 ; -#endif /* * Set priority of different initiators
@@ -579,9 +577,7 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis)/********************************************************************/ static void mpc5xxx_fec_halt (struct eth_device *dev) { -#if defined(CONFIG_MPC5200 )struct mpc5xxx_sdma *sdma = (struct mpc5xxx_sdma *)MPC5XXX_SDMA ; -#endif mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv;int counter =0xffff ;
@@ -611,13 +607,11 @@ static void mpc5xxx_fec_halt(struct eth_device *dev)SDMA_TASK_DISABLE (FEC_XMIT_TASK_NO );SDMA_TASK_DISABLE (FEC_RECV_TASK_NO ); -#if defined(CONFIG_MPC5200 )/* -* Turn on COMM bus prefetch in the MGT5200 BestComm after we're +* Turn on COMM bus prefetch in the MPC5200 BestComm after we're * done. It doesn't work w/ the current receive task. */ sdma->PtdCntrl &= ~0x00000001 ; -#endif /* * Disable the Ethernet Controller
include/configs/BC3450.h +2 -7
@@ -471,13 +471,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 ) -# define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI -# define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -# define CONFIG_SYS_HID0_INIT 0 -# define CONFIG_SYS_HID0_FINAL 0 -#endif +#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI +#define CONFIG_SYS_HID0_FINAL HID0_ICE#define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/IceCube.h +1 -12
@@ -30,6 +30,7 @@*/ #define CONFIG_MPC5xxx 1/* This is an MPC5xxx CPU */ +#define CONFIG_MPC5200 1/* (more precisely a MPC5200 CPU) */ #define CONFIG_ICECUBE 1/* ... on IceCube board */ #define CONFIG_SYS_MPC5XXX_CLKIN 33000000/* ... running at 33.000000MHz */
@@ -47,7 +48,6 @@#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory
@@ -77,10 +77,6 @@#define CONFIG_SYS_RX_ETH_BUFFER 8/* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1 -#else -#define CONFIG_MII 1 -#endif -/* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION
@@ -169,7 +165,6 @@#define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */
@@ -178,7 +173,6 @@#else #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ #endif -#endif /* CONFIG_MPC5200 */ /* pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1
@@ -338,13 +332,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #if defined(CONFIG_LITE5200B )#define CONFIG_SYS_CS1_START CONFIG_SYS_FLASH_BASE
include/configs/PM520.h +0 -11
@@ -50,7 +50,6 @@#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory
@@ -75,7 +74,6 @@#define CONFIG_SYS_RX_ETH_BUFFER 8/* use 8 rx buffer on eepro100 */ #undef CONFIG_NS8382X -#endif /* Partitions */ #define CONFIG_DOS_PARTITION
@@ -111,9 +109,7 @@#define CONFIG_CMD_SNTP #define CONFIG_CMD_USB -#if defined(CONFIG_MPC5200 )#define CONFIG_CMD_PCI -#endif /*
@@ -147,12 +143,10 @@#define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ -#endif /* * I2C configuration */
@@ -301,13 +295,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #if defined(CONFIG_BOOT_ROM )#define CONFIG_SYS_BOOTCS_START CONFIG_SYS_BOOTROM_BASE
include/configs/TB5200.h +0 -5
@@ -430,13 +430,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/TQM5200.h +0 -5
@@ -633,13 +633,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/Total5200.h +2 -21
@@ -41,6 +41,7 @@*/ #define CONFIG_MPC5xxx 1/* This is an MPC5xxx CPU */ +#define CONFIG_MPC5200 1/* (more precisely a MPC5200 CPU) */ #define CONFIG_TOTAL5200 1/* ... on Total5200 board */ #define CONFIG_SYS_MPC5XXX_CLKIN 33000000/* ... running at 33.000000MHz */
@@ -73,7 +74,6 @@#define CONFIG_SPLASH_SCREEN -#ifdef CONFIG_MPC5200 /* MGT5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory
@@ -98,12 +98,6 @@#define CONFIG_SYS_RX_ETH_BUFFER 8/* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1 -#else /* MGT5100 */ - -#define CONFIG_MII 1 - -#endif -/* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION
@@ -127,9 +121,7 @@*/ #include <config_cmd_default.h> -#if defined(CONFIG_MPC5200 ) -#define CONFIG_CMD_PCI -#endif +#define CONFIG_CMD_PCI #define CONFIG_CMD_BMP #define CONFIG_CMD_EEPROM
@@ -176,12 +168,10 @@#define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ -#endif /* * I2C configuration
@@ -326,17 +316,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif - -#if defined (CONFIG_MGT5100 ) -# define CONFIG_BOARD_EARLY_INIT_R /* switch from CS_BOOT to CS0 */ -#endif #if CONFIG_TOTAL5200_REV ==1 # define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE
include/configs/aev.h +0 -5
@@ -362,13 +362,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/cpci5200.h +0 -11
@@ -59,7 +59,6 @@#define CONFIG_BAUDRATE 9600/* ... at 115200 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory
@@ -90,8 +89,6 @@#define CONFIG_NS8382X 1#endif -#endif -/* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION
@@ -169,8 +166,6 @@#define CONFIG_BOOTCOMMAND "run flash_vxworks0" -#if defined(CONFIG_MPC5200 ) -#define CONFIG_RTC_M48T35A 1/* ST Electronics M48 timekeeper */ #define CONFIG_SYS_NVRAM_BASE_ADDR 0xfd010000#define CONFIG_SYS_NVRAM_SIZE 32*1024
@@ -179,7 +174,6 @@* IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ -#endif /* * I2C configuration */
@@ -303,13 +297,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/hmi1001.h +0 -5
@@ -261,13 +261,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/inka4x0.h +0 -5
@@ -366,13 +366,8 @@ static inline void tws_data_config_output(unsigned output)/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/ipek01.h +0 -5
@@ -327,13 +327,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/manroland/mpc5200-common.h +0 -5
@@ -170,13 +170,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/mecp5200.h +0 -14
@@ -63,9 +63,6 @@#endif #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } - -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ -#define CONFIG_MII #if 0 /* test-only !!! */ #define CONFIG_NET_MULTI 1
@@ -74,10 +71,6 @@#define CONFIG_NS8382X 1#endif -#else /* MPC5100 */ - -#endif -/* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION
@@ -152,12 +145,10 @@#define CONFIG_BOOTCOMMAND "run flash_vxworks0" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBSPEED_133/* define for 133MHz speed */ -#endif /* * I2C configuration */
@@ -288,13 +279,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/o2dnt.h +0 -7
@@ -138,7 +138,6 @@#define CONFIG_BOOTCOMMAND "run flash_self" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */
@@ -154,7 +153,6 @@*/ #define CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 /* define for 66MHz speed */ #endif -#endif /* * I2C configuration
@@ -276,13 +274,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/pf5200.h +0 -11
@@ -61,7 +61,6 @@#endif #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifdef CONFIG_MPC5200 /* MPC5100 PCI is not supported yet. */ /* * PCI Mapping: * 0x40000000 - 0x4fffffff - PCI Memory
@@ -87,7 +86,6 @@#define CONFIG_SYS_RX_ETH_BUFFER 8/* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1#endif -#endif /* Partitions */ #define CONFIG_MAC_PARTITION
@@ -121,9 +119,7 @@#define CONFIG_CMD_I2C #define CONFIG_CMD_IDE -#ifdef CONFIG_MPC5200 #define CONFIG_CMD_PCI -#endif #if (TEXT_BASE ==0xFF000000 )/* Boot low with 16 MB Flash */
@@ -166,12 +162,10 @@#define CONFIG_BOOTCOMMAND "run flash_vxworks0" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ -#endif /* * I2C configuration */
@@ -289,13 +283,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/smmaco4.h +0 -5
@@ -358,13 +358,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/spieval.h +0 -5
@@ -438,13 +438,8 @@/* * Various low-level settings */ -#if defined(CONFIG_MPC5200 )#define CONFIG_SYS_HID0_INIT HID0_ICE | HID0_ICFI#define CONFIG_SYS_HID0_FINAL HID0_ICE -#else -#define CONFIG_SYS_HID0_INIT 0 -#define CONFIG_SYS_HID0_FINAL 0 -#endif #define CONFIG_SYS_BOOTCS_START CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_BOOTCS_SIZE CONFIG_SYS_FLASH_SIZE
include/configs/v38b.h +0 -2
@@ -170,12 +170,10 @@#define CONFIG_BOOTCOMMAND "run net_nfs" -#if defined(CONFIG_MPC5200 )/* * IPB Bus clocking configuration. */ #undef CONFIG_SYS_IPBCLK_EQUALS_XLBCLK/* define for 133MHz speed */ -#endif /* * I2C configuration
include/mpc5xxx.h +1 -68
188 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH v2 1/1 mpc5xxx: Remove all references to MGT5100
Dear Detlev Zundel,
Quoted 57 lines · In message <[email protected]> you wrote:
We do not support a processor that never reached a real customer.
Signed-off-by Detlev Zundel <[email protected]>--- MAINTAINERS | 1 - MAKEALL | 2 - Makefile | 24 +-- board/bc3450/bc3450.c | 56 ---- board/bc3450/mt48lc16m16a2-75.h | 13 - board/canmb/canmb.c | 52 ---- board/canmb/mt48lc16m32s2-75.h | 13 - board/esd/cpci5200/mt46v16m16-75.h | 5 - board/esd/mecp5200/mt46v16m16-75.h | 5 - board/esd/pf5200/mt46v16m16-75.h | 5 - board/icecube/icecube.c | 60 +---- board/icecube/mt46v16m16-75.h | 5 - board/icecube/mt46v32m16.h | 5 - board/icecube/mt48lc16m16a2-75.h | 13 - board/jupiter/jupiter.c | 6 - board/mcc200/mt46v16m16-75.h | 5 - board/mcc200/mt48lc16m16a2-75.h | 13 - board/mcc200/mt48lc16m32s2-75.h | 13 - board/munices/mt48lc16m16a2-75.h | 13 - board/pm520/mt46v16m16-75.h | 5 - board/pm520/mt48lc16m16a2-75.h | 13 - board/pm520/pm520.c | 60 ----- board/total5200/mt48lc16m16a2-75.h | 13 - board/total5200/mt48lc32m16a2-75.h | 5 - board/total5200/sdram.c | 52 ---- board/total5200/sdram.h | 5 - board/total5200/total5200.c | 27 +-- board/tqc/tqm5200/mt48lc16m16a2-75.h | 13 - cpu/mpc5xxx/Makefile | 2 +- cpu/mpc5xxx/cpu.c | 7 - cpu/mpc5xxx/cpu_init.c | 35 +-- cpu/mpc5xxx/firmware_sc_task.impl.S | 364 -------------------------- cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S | 4 - cpu/mpc5xxx/pci_mpc5200.c | 4 +- cpu/mpc5xxx/serial.c | 17 -- cpu/mpc5xxx/start.S | 8 - cpu/mpc5xxx/usb_ohci.c | 7 - cpu/mpc5xxx/usb_ohci.h | 5 - drivers/input/ps2ser.c | 11 - drivers/net/mpc5xxx_fec.c | 10 +- include/configs/BC3450.h | 9 +- include/configs/IceCube.h | 13 +- include/configs/PM520.h | 11 - include/configs/TB5200.h | 5 - include/configs/TQM5200.h | 5 - include/configs/Total5200.h | 23 +-- include/configs/aev.h | 5 - include/configs/cpci5200.h | 11 - include/configs/hmi1001.h | 5 - include/configs/inka4x0.h | 5 - include/configs/ipek01.h | 5 - include/configs/manroland/mpc5200-common.h | 5 - include/configs/mecp5200.h | 14 -
Quoted 8 lines
include/configs/o2dnt.h | 7 - include/configs/pf5200.h | 11 - include/configs/smmaco4.h | 5 - include/configs/spieval.h | 5 - include/configs/v38b.h | 2 - include/mpc5xxx.h | 69 +----- 59 files changed, 22 insertions(+), 1169 deletions(-) delete mode 100644 cpu/mpc5xxx/firmware_sc_task.impl.S
Actually this fixes a build warnings in the current code (Total5100 board) so I'm tempted to pull this in now.
Well, guess we should give the board maintainers a few days to respond - and maybe explicit notice, to the extend possible.
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 The easiest way to figure the cost of living is to take your income and add ten percent.
PATCH v2 1/1 mpc5xxx: Remove all references to MGT5100
Hi Wolfgang,
Quoted 6 lines
Dear Detlev Zundel,
Quoted 3 lines · In message <[email protected]> you wrote:
We do not support a processor that never reached a real customer.
Signed-off-by Detlev Zundel <[email protected]>
[...]
Quoted 5 lines
Actually this fixes a build warnings in the current code (Total5100 board) so I'm tempted to pull this in now.
Well, guess we should give the board maintainers a few days to respond - and maybe explicit notice, to the extend possible.
Actually I do not believe that thre removed code has had a lot of testing lately, so I would also be inclined to pull the change in before fixing anything which will be removed in a few weeks anyway.
Cheers
Detlev
Signature · 6 lines
A statistician can have his head in an oven and his feet in ice, and he will say that on the average he feels fine. -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
PATCH v2 1/1 mpc5xxx: Remove all references to MGT5100
Dear Detlev Zundel,
Quoted 7 lines · In message <[email protected]> you wrote:
Quoted 3 lines
Well, guess we should give the board maintainers a few days to respond - and maybe explicit notice, to the extend possible.
Actually I do not believe that thre removed code has had a lot of testing lately, so I would also be inclined to pull the change in before fixing anything which will be removed in a few weeks anyway.
Agreed. But there is the (slight) chance that the removal of the MGT5100 support might cause some (accidential) breakage to some of the affected boards, so I think it is only fair to give the respective board maintainere a heads-up and a short grace period.
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 Nobody trips over mountains. It is the small pebble that causes you to stumble. Pass all the pebbles in your path and you will find you have crossed the mountain.
Wolfgang Denk
AppliedPATCH v2 1/1 mpc5xxx: Remove all references to MGT5100
In reply to Detlev ZundelDear Detlev Zundel,
Quoted 57 lines · In message <[email protected]> you wrote:
We do not support a processor that never reached a real customer.
Signed-off-by Detlev Zundel <[email protected]>--- MAINTAINERS | 1 - MAKEALL | 2 - Makefile | 24 +-- board/bc3450/bc3450.c | 56 ---- board/bc3450/mt48lc16m16a2-75.h | 13 - board/canmb/canmb.c | 52 ---- board/canmb/mt48lc16m32s2-75.h | 13 - board/esd/cpci5200/mt46v16m16-75.h | 5 - board/esd/mecp5200/mt46v16m16-75.h | 5 - board/esd/pf5200/mt46v16m16-75.h | 5 - board/icecube/icecube.c | 60 +---- board/icecube/mt46v16m16-75.h | 5 - board/icecube/mt46v32m16.h | 5 - board/icecube/mt48lc16m16a2-75.h | 13 - board/jupiter/jupiter.c | 6 - board/mcc200/mt46v16m16-75.h | 5 - board/mcc200/mt48lc16m16a2-75.h | 13 - board/mcc200/mt48lc16m32s2-75.h | 13 - board/munices/mt48lc16m16a2-75.h | 13 - board/pm520/mt46v16m16-75.h | 5 - board/pm520/mt48lc16m16a2-75.h | 13 - board/pm520/pm520.c | 60 ----- board/total5200/mt48lc16m16a2-75.h | 13 - board/total5200/mt48lc32m16a2-75.h | 5 - board/total5200/sdram.c | 52 ---- board/total5200/sdram.h | 5 - board/total5200/total5200.c | 27 +-- board/tqc/tqm5200/mt48lc16m16a2-75.h | 13 - cpu/mpc5xxx/Makefile | 2 +- cpu/mpc5xxx/cpu.c | 7 - cpu/mpc5xxx/cpu_init.c | 35 +-- cpu/mpc5xxx/firmware_sc_task.impl.S | 364 -------------------------- cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S | 4 - cpu/mpc5xxx/pci_mpc5200.c | 4 +- cpu/mpc5xxx/serial.c | 17 -- cpu/mpc5xxx/start.S | 8 - cpu/mpc5xxx/usb_ohci.c | 7 - cpu/mpc5xxx/usb_ohci.h | 5 - drivers/input/ps2ser.c | 11 - drivers/net/mpc5xxx_fec.c | 10 +- include/configs/BC3450.h | 9 +- include/configs/IceCube.h | 13 +- include/configs/PM520.h | 11 - include/configs/TB5200.h | 5 - include/configs/TQM5200.h | 5 - include/configs/Total5200.h | 23 +-- include/configs/aev.h | 5 - include/configs/cpci5200.h | 11 - include/configs/hmi1001.h | 5 - include/configs/inka4x0.h | 5 - include/configs/ipek01.h | 5 - include/configs/manroland/mpc5200-common.h | 5 - include/configs/mecp5200.h | 14 -
Quoted 8 lines
include/configs/o2dnt.h | 7 - include/configs/pf5200.h | 11 - include/configs/smmaco4.h | 5 - include/configs/spieval.h | 5 - include/configs/v38b.h | 2 - include/mpc5xxx.h | 69 +----- 59 files changed, 22 insertions(+), 1169 deletions(-) delete mode 100644 cpu/mpc5xxx/firmware_sc_task.impl.S
Applied to "next" branch, 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 "It is better for civilization to be going down the drain than to be coming up it." - Henry Allen
Wolfgang Denk
AppliedPATCH 3/3 mpc5xxx/cpu_init.c: fix warning: unused variable 'cdm'
In reply to Wolfgang DenkQuoted 4 lines · In message <[email protected]> you wrote:
Signed-off-by Wolfgang Denk <[email protected]>--- cpu/mpc5xxx/cpu_init.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 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
The moral of the story is: "Don't stop to tighten your shoe laces
during the Olympics 100m finals".
- Kevin Jones in <[email protected]>