Skip to contentSkip to conversation

ppc4xx: Rename CONFIG_XILINX_ML300 to CONFIG_XILINX_405

PATCH New monstr at seznam.cz 3 participants 5 messages Jun 24, 2008 – Jul 6, 2008

lore
Share & tools
lore

monstr at seznam.cz

author
#0 lore raw

PATCH 1/1 ppc4xx: Rename CONFIG_XILINX_ML300 to CONFIG_XILINX_405

From: Michal Simek <[email protected]>

This change helps with better handling with others Xilinx based platform.

Signed-off-by Michal Simek <[email protected]>
---
 common/cmd_bdinfo.c     |    8 ++++----
 cpu/ppc4xx/speed.c      |    2 +-
 include/configs/ml300.h |    1 +
 lib_ppc/board.c         |    2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
common/cmd_bdinfo.c +4 -4
index 5bb39d8..caa467d 100644
@@ -60,18 +60,18 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #endif
 	print_num ("bootflags",	    bd->bi_bootflags	);
 #if defined(CONFIG_405GP) || defined(CONFIG_405CR) || \
-    defined(CONFIG_405EP) || defined(CONFIG_XILINX_ML300) || \
+    defined(CONFIG_405EP) || defined(CONFIG_XILINX_405) || \
     defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
     defined(CONFIG_440EPX) || defined(CONFIG_440GRX) ||	\
     defined(CONFIG_440SP) || defined(CONFIG_440SPE)
 	print_str ("procfreq",	    strmhz(buf, bd->bi_procfreq));
 	print_str ("plb_busfreq",   strmhz(buf, bd->bi_plb_busfreq));
-#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || defined(CONFIG_XILINX_ML300) || \
+#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || defined(CONFIG_XILINX_405) || \
     defined(CONFIG_440EP) || defined(CONFIG_440GR) || defined(CONFIG_440SPE) || \
     defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
 	print_str ("pci_busfreq",   strmhz(buf, bd->bi_pci_busfreq));
 #endif
-#else	/* ! CONFIG_405GP, CONFIG_405CR, CONFIG_405EP, CONFIG_XILINX_ML300, CONFIG_440EP CONFIG_440GR */
+#else	/* ! CONFIG_405GP, CONFIG_405CR, CONFIG_405EP, CONFIG_XILINX_405, CONFIG_440EP CONFIG_440GR */
 #if defined(CONFIG_CPM2)
 	print_str ("vco",	    strmhz(buf, bd->bi_vco));
 	print_str ("sccfreq",	    strmhz(buf, bd->bi_sccfreq));

@@ -82,7 +82,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	print_str ("cpmfreq",	    strmhz(buf, bd->bi_cpmfreq));
 #endif
 	print_str ("busfreq",	    strmhz(buf, bd->bi_busfreq));
-#endif /* CONFIG_405GP, CONFIG_405CR, CONFIG_405EP, CONFIG_XILINX_ML300, CONFIG_440EP CONFIG_440GR */
+#endif /* CONFIG_405GP, CONFIG_405CR, CONFIG_405EP, CONFIG_XILINX_405, CONFIG_440EP CONFIG_440GR */
 #if defined(CONFIG_MPC8220)
 	print_str ("inpfreq",	    strmhz(buf, bd->bi_inpfreq));
 	print_str ("flbfreq",	    strmhz(buf, bd->bi_flbfreq));
cpu/ppc4xx/speed.c +1 -1
index ef47ffc..34bd721 100644
@@ -754,7 +754,7 @@ ulong get_OPB_freq (void)
 	return sys_info.freqOPB;
 }
 
-#elif defined(CONFIG_XILINX_ML300)
+#elif defined(CONFIG_XILINX_405)
 extern void get_sys_info (sys_info_t * sysInfo);
 extern ulong get_PCI_freq (void);
include/configs/ml300.h +1 -0
index 1945918..319923a 100644
@@ -54,6 +54,7 @@
 
 #define CONFIG_405		1	/* This is a PPC405 CPU		*/
 #define CONFIG_4xx		1	/* ...member of PPC4xx family	*/
+#define CONFIG_XILINX_405	1
 #define CONFIG_XILINX_ML300	1	/* ...on a Xilinx ML300 board	*/
 
 #define CONFIG_SYSTEMACE	1
lib_ppc/board.c +1 -1
index c42e088..947e38d 100644
@@ -627,7 +627,7 @@ void board_init_f (ulong bootflag)
     defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
 	bd->bi_pci_busfreq = get_PCI_freq ();
 	bd->bi_opbfreq = get_OPB_freq ();
-#elif defined(CONFIG_XILINX_ML300)
+#elif defined(CONFIG_XILINX_405)
 	bd->bi_pci_busfreq = get_PCI_freq ();
 #endif
 #endif
Signature · 1 line
1.5.4.GIT
#1 lore raw

PATCH 1/1 ppc4xx: Rename CONFIG_XILINX_ML300 to CONFIG_XILINX_405

Quoted 6 lines · monstr at seznam.cz

From: Michal Simek <[email protected]>

This change helps with better handling with others Xilinx based platform.

Signed-off-by Michal Simek <[email protected]>
Acked-by Stefan Roese <[email protected]>

Wolfgang, please apply this directly, since it doesn't "fit" into one of the custodian repositories.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

author
#2 lore raw

PATCH 1/1 ppc4xx: Rename CONFIG_XILINX_ML300 to CONFIG_XILINX_405

Thanks Stefan,

M

Quoted 6 lines

From: Michal Simek <[email protected]>

This change helps with better handling with others Xilinx based platform.

Signed-off-by Michal Simek <[email protected]>
Acked-by Stefan Roese <[email protected]>

Wolfgang, please apply this directly, since it doesn't "fit" into one of the custodian repositories.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

#3 lore raw

PATCH 1/1 ppc4xx: Rename CONFIG_XILINX_ML300 to CONFIG_XILINX_405

In reply to Stefan Roese
Quoted 5 lines · In message <[email protected]> you wrote:
Acked-by Stefan Roese <[email protected]>

Wolfgang, please apply this directly, since it doesn't "fit" into one of the custodian repositories.

Done, but pulling this into the ppc4xx repo would have been fine with me.

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
When a woman marries again it is because she detested her first  hus-
band.  When  a  man  marries again, it is because he adored his first
wife.                                                  -- Oscar Wilde
Applied
#4 lore raw

PATCH 1/1 ppc4xx: Rename CONFIG_XILINX_ML300 to CONFIG_XILINX_405

In reply to monstr at seznam.cz
Quoted 5 lines · In message <[email protected]> you wrote:

From: Michal Simek <[email protected]>

This change helps with better handling with others Xilinx based platform.

Quoted 7 lines
Signed-off-by Michal Simek <[email protected]>
---
 common/cmd_bdinfo.c     |    8 ++++----
 cpu/ppc4xx/speed.c      |    2 +-
 include/configs/ml300.h |    1 +
 lib_ppc/board.c         |    2 +-
 4 files changed, 7 insertions(+), 6 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
"A fractal is by definition a set for which the Hausdorff Besicovitch
dimension strictly exceeds the topological dimension."
- Mandelbrot, _The Fractal Geometry of Nature_