ARM: pxa: Fix CONFIG_SYS_HZ on PXA
PATCH 1/1 ARM: pxa: Fix CONFIG_SYS_HZ on PXA
The PXA incorrectly uses CONFIG_SYS_HZ, which should be 1000 across U-Boot. Fix this.
Signed-off-by Marek Vasut <[email protected]>
Cc Tom Rini <[email protected]>
Cc Albert Aribaud <[email protected]>
--- include/configs/balloon3.h | 10 +++++----- include/configs/palmld.h | 10 +++++----- include/configs/palmtc.h | 10 +++++----- include/configs/scb9328.h | 6 +++--- include/configs/zipitz2.h | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-)
include/configs/balloon3.h +5 -5
@@ -86,7 +86,7 @@* Clock Configuration */ #undef CONFIG_SYS_CLKS_IN_HZ -#define CONFIG_SYS_HZ 3250000/* Timer @ 3250000 Hz */ +#define CONFIG_SYS_HZ 1000#define CONFIG_SYS_CPUSPEED 0x290/* 520MHz */ /*
@@ -129,10 +129,10 @@#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 -#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_LOCK_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_UNLOCK_TOUT (2*CONFIG_SYS_HZ) +#define CONFIG_SYS_FLASH_ERASE_TOUT 240000 +#define CONFIG_SYS_FLASH_WRITE_TOUT 240000 +#define CONFIG_SYS_FLASH_LOCK_TOUT 240000 +#define CONFIG_SYS_FLASH_UNLOCK_TOUT 240000#define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_ENV_IS_IN_FLASH #else
include/configs/palmld.h +5 -5
@@ -118,7 +118,7 @@* Clock Configuration */ #undef CONFIG_SYS_CLKS_IN_HZ -#define CONFIG_SYS_HZ 3250000/* Timer @ 3250000 Hz */ +#define CONFIG_SYS_HZ 1000#define CONFIG_SYS_CPUSPEED 0x210/* 416MHz ; N=2,L=16 */ /*
@@ -161,10 +161,10 @@#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 -#define CONFIG_SYS_FLASH_ERASE_TOUT (25*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_WRITE_TOUT (25*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_LOCK_TOUT (25*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_UNLOCK_TOUT (25*CONFIG_SYS_HZ) +#define CONFIG_SYS_FLASH_ERASE_TOUT 240000 +#define CONFIG_SYS_FLASH_WRITE_TOUT 240000 +#define CONFIG_SYS_FLASH_LOCK_TOUT 240000 +#define CONFIG_SYS_FLASH_UNLOCK_TOUT 240000#define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_ENV_IS_IN_FLASH 1
include/configs/palmtc.h +5 -5
@@ -120,7 +120,7 @@* Clock Configuration */ #undef CONFIG_SYS_CLKS_IN_HZ -#define CONFIG_SYS_HZ 3686400/* Timer @ 3686400 Hz */ +#define CONFIG_SYS_HZ 1000#define CONFIG_SYS_CPUSPEED 0x161/* 400MHz;L=1 M=3 T=1 */ /*
@@ -158,10 +158,10 @@#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 -#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_LOCK_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_UNLOCK_TOUT (2*CONFIG_SYS_HZ) +#define CONFIG_SYS_FLASH_ERASE_TOUT 240000 +#define CONFIG_SYS_FLASH_WRITE_TOUT 240000 +#define CONFIG_SYS_FLASH_LOCK_TOUT 240000 +#define CONFIG_SYS_FLASH_UNLOCK_TOUT 240000#define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_ENV_IS_IN_FLASH 1
include/configs/scb9328.h +3 -3
@@ -69,7 +69,7 @@#define CONFIG_SYS_MEMTEST_START 0x08100000/* memtest test area */ #define CONFIG_SYS_MEMTEST_END 0x08F00000 -#define CONFIG_SYS_HZ 3686400/* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000#define CONFIG_SYS_CPUSPEED 0x141/* core clock - register value */ #define CONFIG_BAUDRATE 115200
@@ -143,8 +143,8 @@now.*/ #undef CONFIG_SYS_FLASH_CFI -#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ)/* timeout for Erase operation */ -#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ)/* timeout for Write operation */ +#define CONFIG_SYS_FLASH_ERASE_TOUT 240000/* timeout for Erase operation */ +#define CONFIG_SYS_FLASH_WRITE_TOUT 240000/* timeout for Write operation */ #define CONFIG_SYS_FLASH_BASE SCB9328_FLASH_BASE
include/configs/zipitz2.h +5 -5
@@ -141,7 +141,7 @@ unsigned char zipitz2_spi_read(void);* Clock Configuration */ #undef CONFIG_SYS_CLKS_IN_HZ -#define CONFIG_SYS_HZ 3250000/* Timer @ 3250000 Hz */ +#define CONFIG_SYS_HZ 1000#define CONFIG_SYS_CPUSPEED 0x190/* standard setting for 312MHz; L=16, N=1.5, A=0, SDCLK!=SystemBus */ /*
@@ -188,10 +188,10 @@ unsigned char zipitz2_spi_read(void);#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 -#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_LOCK_TOUT (2*CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_UNLOCK_TOUT (2*CONFIG_SYS_HZ) +#define CONFIG_SYS_FLASH_ERASE_TOUT 240000 +#define CONFIG_SYS_FLASH_WRITE_TOUT 240000 +#define CONFIG_SYS_FLASH_LOCK_TOUT 240000 +#define CONFIG_SYS_FLASH_UNLOCK_TOUT 240000#define CONFIG_SYS_FLASH_PROTECTION /*
Signature · 1 line
1.8.4.rc3