Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of bogus CONFIG_SYS_BUS_HZ and CONFIG_SYS_CONFIG_BUS_CLK definitions

Browse Source 
CONFIG_SYS_BUS_HZ has not really been used anywhere except to be
redined as CONFIG_SYS_BUS_CLK; in addition, the mpc7448hpc2 had the
bogus CONFIG_SYS_CONFIG_BUS_CLK setting which duplicated the
funtionality.  Change all this to use CONFIG_SYS_BUS_CLK consistently.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Frank Gottschling <fgottschling@eltec.de>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
Cc: Eran Man <eran@nbase.co.il>
Cc: Stefan Roese <sr@denx.de>
Cc: Nye Liu <nyet@zumanetworks.com>
Cc: Roy Zang <tie-fei.zang@freescale.com>
This commit is contained in:
Wolfgang Denk
2010-06-13 18:38:23 +02:00
parent f35f3968c2
commit ee80fa7b6e
17 changed files with 35 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/configs/BAB7xx.h
View File

@@ -436,9 +436,8 @@ extern unsigned char scsi_sym53c8xx_ccf;
extern unsigned long bab7xx_get_bus_freq (void);
extern unsigned long bab7xx_get_gclk_freq (void);
#endif
#define CONFIG_SYS_BUS_HZ bab7xx_get_bus_freq()
#define CONFIG_SYS_BUS_CLK CONFIG_SYS_BUS_HZ
#define CONFIG_SYS_CPU_CLK bab7xx_get_gclk_freq()
#define CONFIG_SYS_BUS_CLK bab7xx_get_bus_freq()
#define CONFIG_SYS_CPU_CLK bab7xx_get_gclk_freq()
/*
* For booting Linux, the board info and command line data

3
include/configs/CPCI750.h
View File

@@ -234,8 +234,7 @@
#define CONFIG_SYS_LOAD_ADDR 0x00300000 /* default load address */
#define CONFIG_SYS_HZ 1000 /* decr freq: 1ms ticks */
#define CONFIG_SYS_BUS_HZ 133000000 /* 133 MHz (CPU = 5*Bus = 666MHz) */
#define CONFIG_SYS_BUS_CLK CONFIG_SYS_BUS_HZ
#define CONFIG_SYS_BUS_CLK 133000000 /* 133 MHz (CPU = 5*Bus = 666MHz) */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }

3
include/configs/DB64360.h
View File

@@ -318,8 +318,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CONFIG_SYS_HZ 1000 /* decr freq: 1ms ticks */
/*ronen - this the Sys clock (cpu bus,internal dram and SDRAM) */
#define CONFIG_SYS_BUS_HZ 133000000 /* 133 MHz (CPU = 5*Bus = 666MHz) */
#define CONFIG_SYS_BUS_CLK CONFIG_SYS_BUS_HZ
#define CONFIG_SYS_BUS_CLK 133000000 /* 133 MHz (CPU = 5*Bus = 666MHz) */
#define CONFIG_SYS_DDR_SDRAM_CYCLE_COUNT_LOP 7 /* define the SDRAM cycle count */
#define CONFIG_SYS_DDR_SDRAM_CYCLE_COUNT_ROP 50 /* for 400MHZ -> 5.0 ns, for 133MHZ -> 7.50 ns */

3
include/configs/DB64460.h
View File

@@ -256,8 +256,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CONFIG_SYS_HZ 1000 /* decr freq: 1ms ticks */
/*ronen - this the Sys clock (cpu bus,internal dram and SDRAM) */
#define CONFIG_SYS_BUS_HZ 133000000 /* 133 MHz (CPU = 5*Bus = 666MHz) */
#define CONFIG_SYS_BUS_CLK CONFIG_SYS_BUS_HZ
#define CONFIG_SYS_BUS_CLK 133000000 /* 133 MHz (CPU = 5*Bus = 666MHz) */
#define CONFIG_SYS_DDR_SDRAM_CYCLE_COUNT_LOP 7 /* define the SDRAM cycle count */
#define CONFIG_SYS_DDR_SDRAM_CYCLE_COUNT_ROP 50 /* for 200MHZ -> 5.0 ns, 166MHZ -> 6.0, 133MHZ -> 7.50 ns */

5
include/configs/ELPPC.h
View File

@@ -314,9 +314,8 @@
/*
* Speed settings are board specific
*/
#define CONFIG_SYS_BUS_HZ 100000000
#define CONFIG_SYS_CPU_CLK 400000000
#define CONFIG_SYS_BUS_CLK CONFIG_SYS_BUS_HZ
#define CONFIG_SYS_BUS_CLK 100000000
#define CONFIG_SYS_CPU_CLK 400000000
/*
* For booting Linux, the board info and command line data

3
include/configs/EVB64260.h
View File

@@ -141,8 +141,7 @@
#define CONFIG_SYS_LOAD_ADDR 0x00300000 /* default load address */
#define CONFIG_SYS_HZ 1000 /* decr freq: 1ms ticks */
#define CONFIG_SYS_BUS_HZ 100000000 /* 100 MHz */
#define CONFIG_SYS_BUS_CLK CONFIG_SYS_BUS_HZ
#define CONFIG_SYS_BUS_CLK 100000000 /* 100 MHz */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }

3
include/configs/P3G4.h
View File

@@ -168,8 +168,7 @@
#define CONFIG_SYS_LOAD_ADDR 0x00300000 /* default load address */
#define CONFIG_SYS_HZ 1000 /* decr freq: 1ms ticks */
#define CONFIG_SYS_BUS_HZ 133000000 /* 133 MHz */
#define CONFIG_SYS_BUS_CLK CONFIG_SYS_BUS_HZ
#define CONFIG_SYS_BUS_CLK 133000000 /* 133 MHz */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }

3
include/configs/PCIPPC2.h
View File

@@ -194,9 +194,8 @@
* For the detail description refer to the PCIPPC2 user's manual.
*/
#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_BUS_HZ 100000000 /* bus speed - 100 mhz */
#define CONFIG_SYS_BUS_CLK 100000000 /* bus speed - 100 mhz */
#define CONFIG_SYS_CPU_CLK 300000000
#define CONFIG_SYS_BUS_CLK 100000000
/*
* For booting Linux, the board info and command line data

3
include/configs/PCIPPC6.h
View File

@@ -196,9 +196,8 @@
* For the detail description refer to the PCIPPC2 user's manual.
*/
#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_BUS_HZ 100000000 /* bus speed - 100 mhz */
#define CONFIG_SYS_BUS_CLK 100000000 /* bus speed - 100 mhz */
#define CONFIG_SYS_CPU_CLK 300000000
#define CONFIG_SYS_BUS_CLK 100000000
/*
* For booting Linux, the board info and command line data

4
include/configs/ZUMA.h
View File

@@ -164,9 +164,7 @@
#define CONFIG_SYS_HZ 1000 /* decr freq: 1ms ticks */
#define CONFIG_SYS_BUS_HZ 133000000 /* 133 MHz */
#define CONFIG_SYS_BUS_CLK CONFIG_SYS_BUS_HZ
#define CONFIG_SYS_BUS_CLK 133000000 /* 133 MHz */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }

2
include/configs/mpc7448hpc2.h
View File

@@ -46,7 +46,7 @@
#define CONFIG_IDENT_STRING " Freescale MPC7448 HPC II"
#define CONFIG_SYS_OCN_CLK 133000000 /* 133 MHz */
#define CONFIG_SYS_CONFIG_BUS_CLK 133000000
#define CONFIG_SYS_BUS_CLK 133000000
#define CONFIG_SYS_CLK_SPREAD /* Enable Spread-Spectrum Clock generation */

6
include/configs/p3mx.h
View File

@@ -44,14 +44,12 @@
#define CONFIG_750FX /* 750GL/GX/FX */
#define CONFIG_HIGH_BATS /* High BATs supported */
#define CONFIG_SYS_BOARD_NAME "P3M750"
#define CONFIG_SYS_BUS_HZ 100000000
#define CONFIG_SYS_BUS_CLK CONFIG_SYS_BUS_HZ
#define CONFIG_SYS_BUS_CLK 100000000
#define CONFIG_SYS_TCLK 100000000
#elif defined (CONFIG_P3M7448)
#define CONFIG_74xx
#define CONFIG_SYS_BOARD_NAME "P3M7448"
#define CONFIG_SYS_BUS_HZ 133333333
#define CONFIG_SYS_BUS_CLK CONFIG_SYS_BUS_HZ
#define CONFIG_SYS_BUS_CLK 133333333
#define CONFIG_SYS_TCLK 133333333
#endif
#define CONFIG_SYS_GT_DUAL_CPU /* also for JTAG even with one cpu */

4
include/configs/ppmc7xx.h
View File

@@ -355,12 +355,10 @@
/*
* Clocks config
*
* CONFIG_SYS_BUS_HZ - Bus clock frequency in Hz
* CONFIG_SYS_BUS_CLK - As above (?)
* CONFIG_SYS_BUS_CLK - Bus clock frequency in Hz
* CONFIG_SYS_HZ - Decrementer freq in Hz
*/
#define CONFIG_SYS_BUS_HZ CONFIG_BUS_CLK
#define CONFIG_SYS_BUS_CLK CONFIG_BUS_CLK
#define CONFIG_SYS_HZ 1000