mpc83xx: Get rid of CONFIG_83XX_CLKIN

MPC83xx uses CONFIG_83XX_CLKIN instead of CONFIG_SYS_CLK_FREQ to set the
system clock. To migrate the architecture, we can replace
CONFIG_83XX_CLKIN with CONFIG_SYS_CLK_FREQ.

To do this
* replace all occurrences of CONFIG_83XX_CLKIN with CONFIG_SYS_CLK_FREQ
* set CONFIG_SYS_CLK_FREQ to the old value of CONFIG_83XX_CLKIN in all
  MPC83xx config files

Signed-off-by: Mario Six <mario.six@gdsys.cc>

diff --git a/Kconfig b/Kconfig
index da208d65a32c3cc7614a97067d114b9c8c0152e9..5f5c5ccfd6b6b51f28ee433f7b7cfd528ef91755 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -512,7 +512,7 @@ config SYS_TEXT_BASE
 
 
 config SYS_CLK_FREQ
-       depends on ARC || ARCH_SUNXI
+       depends on ARC || ARCH_SUNXI || MPC83xx
        int "CPU clock frequency"
        help
          TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture

diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 668ed27862b316efa2591db8ce8a960d0f7e2b67..e870a23103b68c62ce8bee4e9631a2fa642c70c5 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -137,8 +137,8 @@ int get_clocks(void)
        clkin_div = ((im->clk.spmr & SPMR_CKID) >> SPMR_CKID_SHIFT);
 
        if (im->reset.rcwh & HRCWH_PCI_HOST) {
-#if defined(CONFIG_83XX_CLKIN)
-               pci_sync_in = CONFIG_83XX_CLKIN / (1 + clkin_div);
+#if defined(CONFIG_SYS_CLK_FREQ)
+               pci_sync_in = CONFIG_SYS_CLK_FREQ / (1 + clkin_div);
 #else
                pci_sync_in = 0xDEADBEEF;
 #endif

diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
index 3315ee05e113142f22cb82be304fbe4ea68b7cd2..2d6ba12e2d95d28a26083cd3e762bdcc5dd2c7ca 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c
+++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c
@@ -95,5 +95,5 @@ ulong get_bus_freq(ulong dummy)
        volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
        u8 spmf = (im->clk.spmr & SPMR_SPMF) >> SPMR_SPMF_SHIFT;
 
-       return CONFIG_83XX_CLKIN * spmf;
+       return CONFIG_SYS_CLK_FREQ * spmf;
 }

diff --git a/board/freescale/mpc8349emds/MAINTAINERS b/board/freescale/mpc8349emds/MAINTAINERS
index b676c074925035f3f6485faf857fa8c8d76c6e4f..0719225671b9d05d1648943beeb9115c56dacac5 100644 (file)
--- a/board/freescale/mpc8349emds/MAINTAINERS
+++ b/board/freescale/mpc8349emds/MAINTAINERS
@@ -5,3 +5,4 @@ F:      board/freescale/mpc8349emds/
 F:     include/configs/MPC8349EMDS.h
 F:     configs/MPC8349EMDS_defconfig
 F:     configs/MPC8349EMDS_SDRAM_defconfig
+F:     configs/MPC8349EMDS_SLAVE_defconfig

diff --git a/board/freescale/mpc837xerdb/MAINTAINERS b/board/freescale/mpc837xerdb/MAINTAINERS
index 81b4eed5edea8f535f4ea614254348f58a617540..9f44a37a0d943fbc8d0388138d9035a4a02802d2 100644 (file)
--- a/board/freescale/mpc837xerdb/MAINTAINERS
+++ b/board/freescale/mpc837xerdb/MAINTAINERS
@@ -4,3 +4,4 @@ S:      Maintained
 F:     board/freescale/mpc837xerdb/
 F:     include/configs/MPC837XERDB.h
 F:     configs/MPC837XERDB_defconfig
+F:     configs/MPC837XERDB_SLAVE_defconfig

diff --git a/board/tqc/tqm834x/pci.c b/board/tqc/tqm834x/pci.c
index 34c68ac463772dfbc71e86212b75319d74be2219..c9b05e44c2442a0935fb1409e74ac1046a0e7333 100644 (file)
--- a/board/tqc/tqm834x/pci.c
+++ b/board/tqc/tqm834x/pci.c
@@ -71,7 +71,7 @@ pci_init_board(void)
        reg32 = 0xff000000;
 #endif
        if (clk->spmr & SPMR_CKID) {
-               /* PCI Clock is half CONFIG_83XX_CLKIN so need to set up OCCR
+               /* PCI Clock is half CONFIG_SYS_CLK_FREQ so need to set up OCCR
                 * fields accordingly */
                reg32 |= (OCCR_PCI1CR | OCCR_PCI2CR);
 

diff --git a/configs/MPC8308RDB_defconfig b/configs/MPC8308RDB_defconfig
index 06657b2bfe9864404554bed303186ffda4311446..59dde136f2c8aa9ddb2b80fa010664d0178d3f3a 100644 (file)
--- a/configs/MPC8308RDB_defconfig
+++ b/configs/MPC8308RDB_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=33333333
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8308RDB=y
 CONFIG_FIT=y

diff --git a/configs/MPC8313ERDB_33_defconfig b/configs/MPC8313ERDB_33_defconfig
index cacb5ba07745730ab938fe449d28f18471c1f820..4851611cf53bfe69156521299a27994be9c458b4 100644 (file)
--- a/configs/MPC8313ERDB_33_defconfig
+++ b/configs/MPC8313ERDB_33_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=33333333
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB_NOR=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC8313ERDB_66_defconfig b/configs/MPC8313ERDB_66_defconfig
index 6b29c2e5c9ddc454a2af9556a4bd1bcfd3a656ad..fb4fddec469c7aa0e10543bf2fa020e027243126 100644 (file)
--- a/configs/MPC8313ERDB_66_defconfig
+++ b/configs/MPC8313ERDB_66_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66666667
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB_NOR=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC8313ERDB_NAND_33_defconfig b/configs/MPC8313ERDB_NAND_33_defconfig
index bcb83b1308cfb68a85ce951ba9c8c1c04ddc14a8..80ed52b2e1d0b49dada368205ec80c56e46cc5b7 100644 (file)
--- a/configs/MPC8313ERDB_NAND_33_defconfig
+++ b/configs/MPC8313ERDB_NAND_33_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0x00100000
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
+CONFIG_SYS_CLK_FREQ=33333333
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB_NAND=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC8313ERDB_NAND_66_defconfig b/configs/MPC8313ERDB_NAND_66_defconfig
index 746ea27dc53dc47a0559fb58f34762f86e6c2398..d0d84d429dbfef283faef8d62616c583e08ac285 100644 (file)
--- a/configs/MPC8313ERDB_NAND_66_defconfig
+++ b/configs/MPC8313ERDB_NAND_66_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0x00100000
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
+CONFIG_SYS_CLK_FREQ=66666667
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB_NAND=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig
index b45369e626404432bb301aea0a99f2d1f1387a8e..15dbbe35dd1c123e78a038c17ea5b58f8b0878d8 100644 (file)
--- a/configs/MPC8315ERDB_defconfig
+++ b/configs/MPC8315ERDB_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66666667
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8315ERDB=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC8323ERDB_defconfig b/configs/MPC8323ERDB_defconfig
index a1227bfdade9cf4554f0e20a3b2f646038fd17ce..c43ae8c99298a22d6c16314e675e7d56c83792d1 100644 (file)
--- a/configs/MPC8323ERDB_defconfig
+++ b/configs/MPC8323ERDB_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66666667
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8323ERDB=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC832XEMDS_ATM_defconfig b/configs/MPC832XEMDS_ATM_defconfig
index e4c44d90a96542a9f62c2dd946afc0543b905575..a40f16d49b4b186fe8035779cd67d81323ea8d2a 100644 (file)
--- a/configs/MPC832XEMDS_ATM_defconfig
+++ b/configs/MPC832XEMDS_ATM_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC832XEMDS_HOST_33_defconfig b/configs/MPC832XEMDS_HOST_33_defconfig
index 2b03a56245f6b4863c6d8739e3b3fb13b422b33d..1031dd655ad11d15ef317eda5598bc13a1a27ce1 100644 (file)
--- a/configs/MPC832XEMDS_HOST_33_defconfig
+++ b/configs/MPC832XEMDS_HOST_33_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC832XEMDS_HOST_66_defconfig b/configs/MPC832XEMDS_HOST_66_defconfig
index 4aa34dc331422b407a585d4ed2f62002ff3a4fad..416e0e9aeabfd952b15784b1e953658cddb2ba5d 100644 (file)
--- a/configs/MPC832XEMDS_HOST_66_defconfig
+++ b/configs/MPC832XEMDS_HOST_66_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC832XEMDS_SLAVE_defconfig b/configs/MPC832XEMDS_SLAVE_defconfig
index 332088934a076d01cb120980025f152e4db531a7..29b8f1a988debce425901590cd1952faf79afa62 100644 (file)
--- a/configs/MPC832XEMDS_SLAVE_defconfig
+++ b/configs/MPC832XEMDS_SLAVE_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC832XEMDS_defconfig b/configs/MPC832XEMDS_defconfig
index f3ec967b3ccfa5dae74b708e819652e2c8f3c5e0..2a15e5c18e944f6fb4468b0e344a49a38f47b070 100644 (file)
--- a/configs/MPC832XEMDS_defconfig
+++ b/configs/MPC832XEMDS_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC8349EMDS_SDRAM_defconfig b/configs/MPC8349EMDS_SDRAM_defconfig
index a98cc74027ce52cf21af9e54fc0ada3bb8d2afe3..d4f6587bb38cf964e988db23758cac4f362ccd29 100644 (file)
--- a/configs/MPC8349EMDS_SDRAM_defconfig
+++ b/configs/MPC8349EMDS_SDRAM_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349EMDS_SDRAM=y
 CONFIG_PCI_ONE_PCI1=y

diff --git a/configs/MPC8349EMDS_SLAVE_defconfig b/configs/MPC8349EMDS_SLAVE_defconfig
new file mode 100644 (file)
index 0000000..11e3b14
--- /dev/null
+++ b/configs/MPC8349EMDS_SLAVE_defconfig
@@ -0,0 +1,25 @@
+CONFIG_PPC=y
+CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66666666
+CONFIG_MPC83xx=y
+CONFIG_TARGET_MPC8349EMDS=y
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_OF_STDOUT_VIA_ALIAS=y
+CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE"
+CONFIG_BOOTDELAY=6
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_IMLS=y
+CONFIG_CMD_I2C=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_DATE=y
+# CONFIG_MMC is not set
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
+CONFIG_SYS_FLASH_CFI=y
+CONFIG_PHYLIB=y
+# CONFIG_PCI is not set
+CONFIG_SYS_NS16550=y
+CONFIG_OF_LIBFDT=y

diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig
index bd8ff625e19c242ea55755edf6cb94248e05457c..9a6eebf746c716eebc642e6f0fa70b564621b109 100644 (file)
--- a/configs/MPC8349EMDS_defconfig
+++ b/configs/MPC8349EMDS_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349EMDS=y
 CONFIG_PCI_ONE_PCI1=y

diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
index 95d807bac004acd36268556f645f7db7ebb17be4..c7f465e4095f110f82f34f207de02c06929dab2f 100644 (file)
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -1,9 +1,11 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66666666
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
+CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFE000000"
 CONFIG_BOOTDELAY=6
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitxgp:eth0:off console=ttyS0,115200"

diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
index 22225e3ad6ef0c642ed5ad833f4a8966a5b3c0f4..7dbde3222b2f9e48f1736751234a64b4a0191f30 100644 (file)
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/configs/MPC8349ITX_LOWBOOT_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66666666
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig
index 7f9b9cb283df95bf7e94419e4b3943e2a0416df9..d3ab1eafeb12e384c98fbc63d952b0c335c56775 100644 (file)
--- a/configs/MPC8349ITX_defconfig
+++ b/configs/MPC8349ITX_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFEF00000
+CONFIG_SYS_CLK_FREQ=66666666
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC837XEMDS_HOST_defconfig b/configs/MPC837XEMDS_HOST_defconfig
index 4ac95735b2d2a0844befb9c063f1e88b5b50edba..15d60a2ccd36feb1c5957df03cf3c3e16c552a99 100644 (file)
--- a/configs/MPC837XEMDS_HOST_defconfig
+++ b/configs/MPC837XEMDS_HOST_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC837XEMDS=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC837XEMDS_defconfig b/configs/MPC837XEMDS_defconfig
index 9ee8c7d8806fd813a784aad5fa6839e094b39131..d5d42ab12fab96e35e5f6f676496ed7328502385 100644 (file)
--- a/configs/MPC837XEMDS_defconfig
+++ b/configs/MPC837XEMDS_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC837XEMDS=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/MPC837XERDB_SLAVE_defconfig b/configs/MPC837XERDB_SLAVE_defconfig
new file mode 100644 (file)
index 0000000..8c2389c
--- /dev/null
+++ b/configs/MPC837XERDB_SLAVE_defconfig
@@ -0,0 +1,34 @@
+CONFIG_PPC=y
+CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66666667
+CONFIG_MPC83xx=y
+CONFIG_TARGET_MPC837XERDB=y
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_OF_STDOUT_VIA_ALIAS=y
+CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE,PCIE"
+CONFIG_BOOTDELAY=6
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_IMLS=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_SATA=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_DATE=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_FAT=y
+CONFIG_FSL_SATA=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_NETDEVICES=y
+CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
+CONFIG_SYS_FLASH_CFI=y
+CONFIG_TSEC_ENET=y
+CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_OF_LIBFDT=y

diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index 45b68e909231d89ce7f8fe9a5c7c1e4366a7376d..090b9e51522d39c9b4d1c7b248c4a76aeeabe853 100644 (file)
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -1,9 +1,11 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=66666667
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC837XERDB=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
+CONFIG_SYS_EXTRA_OPTIONS="PCIE"
 CONFIG_BOOTDELAY=6
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y

diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig
index e1a7a0630641af5119f6316cc32937549a651c9e..8f68804a482aa725d0e00f1eb93c9a469a769489 100644 (file)
--- a/configs/TQM834x_defconfig
+++ b/configs/TQM834x_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0x80000000
+CONFIG_SYS_CLK_FREQ=66666000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TQM834X=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/caddy2_defconfig b/configs/caddy2_defconfig
index fe0c34fc61a18668f1c6ba52e0f53e66a06e9ca3..2d2d64d1038fdb62214557a45d32bb8a3efb0c05 100644 (file)
--- a/configs/caddy2_defconfig
+++ b/configs/caddy2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFFF00000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_CADDY2=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig
index 7605c56619ced89ff5bc131046a2a7f564fbb84a..2a7b932b1e0afc2cdb62cd19af9929f53999af1a 100644 (file)
--- a/configs/hrcon_defconfig
+++ b/configs/hrcon_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
 CONFIG_IDENT_STRING=" hrcon 0.01"
+CONFIG_SYS_CLK_FREQ=33333333
 CONFIG_MPC83xx=y
 CONFIG_TARGET_HRCON=y
 CONFIG_CMD_IOLOOP=y

diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig
index bc51a5d02a9aa99a0ba13e671a2b3c65baa3caaf..3b1fbca2687f287a6d2830602d556f64fac6428b 100644 (file)
--- a/configs/hrcon_dh_defconfig
+++ b/configs/hrcon_dh_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
 CONFIG_IDENT_STRING=" hrcon dh 0.01"
+CONFIG_SYS_CLK_FREQ=33333333
 CONFIG_MPC83xx=y
 CONFIG_TARGET_HRCON=y
 CONFIG_CMD_IOLOOP=y

diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 0d055e395ddd98ebdb63a93c9ecf9b34badfd97d..7223af1f55fbbed2a7e1501b5b2a56274085adc6 100644 (file)
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFFF00000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_IDS8313=y
 CONFIG_FIT=y

diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index b7c42fa9cbef6366bc68a4f1b7def552959225b6..beac453ce5c33c889750dc15e98a703394a53cbf 100644 (file)
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_KMCOGE5NE=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 1773f74358e6c6706d1fa4f50e6daeea9d1335f7..2bf2c40a6379c06963fd0c26bad6e4cfb98e4c49 100644 (file)
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_KMETER1=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index c0927dd4788a9f38803ec048819e1ea3e3584575..1b63b427f0f51f6e8903b1711759925f1c6eb967 100644 (file)
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_KMOPTI2=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index 7a00c85a841908bb5ea3dbefa2453e299ccab31b..df1bfaef187e0ddc5b9cef6331a83fcfd4d6a5fd 100644 (file)
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_KMSUPX5=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig
index 38a861b86107070f8adb93bdf07668260307105e..7187af77863a22db6e932f315b55032b9abce68d 100644 (file)
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_KMTEGR1=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
index 310cf5ac66fe8750598d2ab0411cc12132278826..bbd13b8bfaae2cb973b1ee37b9266508a005e890 100644 (file)
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_KMTEPR2=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index 2f71ee75198c6fe767a443071697cb056940885d..98dd9e2b374aac5233f62b0a76cc28ccf8c3a906 100644 (file)
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_KMVECT1=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/mpc8308_p1m_defconfig b/configs/mpc8308_p1m_defconfig
index 114ffeeddba15b24cf5b2fa8e8cf0668e39b63e2..1e50782f7cfbcdb572cb19cb71f12263742bfed5 100644 (file)
--- a/configs/mpc8308_p1m_defconfig
+++ b/configs/mpc8308_p1m_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFC000000
+CONFIG_SYS_CLK_FREQ=33333333
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8308_P1M=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/sbc8349_PCI_33_defconfig b/configs/sbc8349_PCI_33_defconfig
index 5c2720aef14efc7f6b5ddcae2fc9bd9731bd7f17..eca22bec3ab17767b1a4d8c693c78da434e3e61b 100644 (file)
--- a/configs/sbc8349_PCI_33_defconfig
+++ b/configs/sbc8349_PCI_33_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFF800000
+CONFIG_SYS_CLK_FREQ=33000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SBC8349=y
 CONFIG_PCI_64BIT=y

diff --git a/configs/sbc8349_PCI_66_defconfig b/configs/sbc8349_PCI_66_defconfig
index e6535dafcf73385f582a6ef591bc51afd7c69e43..fa1ec519c51ef0cf14d0e4e1bc44a2cadf1ec039 100644 (file)
--- a/configs/sbc8349_PCI_66_defconfig
+++ b/configs/sbc8349_PCI_66_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFF800000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SBC8349=y
 CONFIG_PCI_64BIT=y

diff --git a/configs/sbc8349_defconfig b/configs/sbc8349_defconfig
index 82379e67d2ced83b7362b49d085b3ae5cd424ec2..d70332c785c478005a3152ff6eba9290c9a6eab4 100644 (file)
--- a/configs/sbc8349_defconfig
+++ b/configs/sbc8349_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFF800000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SBC8349=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig
index 24c793dfc5d8963ac9b2a1be0b3fe014aed0e9b3..194cebdb67f589d92267ee3403b3cd449cb8c1c3 100644 (file)
--- a/configs/strider_con_defconfig
+++ b/configs/strider_con_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
 CONFIG_IDENT_STRING=" strider con 0.01"
+CONFIG_SYS_CLK_FREQ=33333333
 CONFIG_MPC83xx=y
 CONFIG_TARGET_STRIDER=y
 CONFIG_CMD_IOLOOP=y

diff --git a/configs/strider_con_dp_defconfig b/configs/strider_con_dp_defconfig
index c70d99a7e67f456a453d00c304383fd6c89c8c82..4e72582d2f6a450227288315f659e77eed5a511c 100644 (file)
--- a/configs/strider_con_dp_defconfig
+++ b/configs/strider_con_dp_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
 CONFIG_IDENT_STRING=" strider con dp 0.01"
+CONFIG_SYS_CLK_FREQ=33333333
 CONFIG_MPC83xx=y
 CONFIG_TARGET_STRIDER=y
 CONFIG_CMD_IOLOOP=y

diff --git a/configs/strider_cpu_defconfig b/configs/strider_cpu_defconfig
index fef58848af9eac04d9137c5257068f74a897f289..c633e030e34f3db2b2661d7afb0e460aa2e88392 100644 (file)
--- a/configs/strider_cpu_defconfig
+++ b/configs/strider_cpu_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
 CONFIG_IDENT_STRING=" strider cpu 0.01"
+CONFIG_SYS_CLK_FREQ=33333333
 CONFIG_MPC83xx=y
 CONFIG_TARGET_STRIDER=y
 CONFIG_CMD_IOLOOP=y

diff --git a/configs/strider_cpu_dp_defconfig b/configs/strider_cpu_dp_defconfig
index fc8f39eb54aabb0dc52c1f006816e2ef8955469e..e1d08e782d486a814659094f3aa610d437fe0719 100644 (file)
--- a/configs/strider_cpu_dp_defconfig
+++ b/configs/strider_cpu_dp_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
 CONFIG_IDENT_STRING=" strider cpu dp 0.01"
+CONFIG_SYS_CLK_FREQ=33333333
 CONFIG_MPC83xx=y
 CONFIG_TARGET_STRIDER=y
 CONFIG_CMD_IOLOOP=y

diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index e6b97b866dd80e0338e89e3e43491cd69487ef24..4744122e4ed3146965e9be3966d6766250f9e338 100644 (file)
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SUVD3=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index a3e04bc0f8ad5a2f9e51c6f1b273c6b3674dee77..349b1d00094006913657aa639924ea1ee1d45d1a 100644 (file)
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TUGE1=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index d1fc62697e3a1a6ea527450bb13d1538cbca2bfe..a6654c902591fe9a3720ebd6489ab89575de8374 100644 (file)
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xF0000000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/ve8313_defconfig b/configs/ve8313_defconfig
index 584aafb08fb04c64499e8d05de0b0a09c5d8a24b..084b1bdeaf555e02b3e9c919a0e480ccd05b866f 100644 (file)
--- a/configs/ve8313_defconfig
+++ b/configs/ve8313_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFE000000
+CONFIG_SYS_CLK_FREQ=32000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_VE8313=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/vme8349_defconfig b/configs/vme8349_defconfig
index 90c29b7fedfe1b9c2444323385e203a53e41ffc2..aae221419275b993a7233d10f61360e2b0b50856 100644 (file)
--- a/configs/vme8349_defconfig
+++ b/configs/vme8349_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0xFFF00000
+CONFIG_SYS_CLK_FREQ=66000000
 CONFIG_MPC83xx=y
 CONFIG_TARGET_VME8349=y
 CONFIG_PCI_64BIT=y

diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 7bf91524c8874742a41d55f4e95b718e3844527d..77c30093bfd20907fa06290d9035b465f6268c94 100644 (file)
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -27,12 +27,6 @@
 #define CONFIG_TSEC1
 #define CONFIG_VSC7385_ENET
 
-/*
- * System Clock Setup
- */
-#define CONFIG_83XX_CLKIN      33333333 /* in Hz */
-#define CONFIG_SYS_CLK_FREQ    CONFIG_83XX_CLKIN
-
 /*
  * Hardware Reset Configuration Word
  * if CLKIN is 66.66MHz, then

diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h
index 31c29001807efa063471913544ee86cb656443c2..103ace2d3a983ad38a72356df3526933c2e71c12 100644 (file)
--- a/include/configs/MPC8313ERDB_NAND.h
+++ b/include/configs/MPC8313ERDB_NAND.h
@@ -54,16 +54,6 @@
 #define CONFIG_VSC7385_ENET
 #define CONFIG_TSEC2
 
-#ifdef CONFIG_SYS_66MHZ
-#define CONFIG_83XX_CLKIN      66666667        /* in Hz */
-#elif defined(CONFIG_SYS_33MHZ)
-#define CONFIG_83XX_CLKIN      33333333        /* in Hz */
-#else
-#error Unknown oscillator frequency.
-#endif
-
-#define CONFIG_SYS_CLK_FREQ    CONFIG_83XX_CLKIN
-
 #define CONFIG_SYS_IMMR                0xE0000000
 
 #if !defined(CONFIG_SPL_BUILD)
@@ -445,9 +435,6 @@
        HRCWL_DDR_TO_SCB_CLK_2X1 |\
        HRCWL_CSB_TO_CLKIN_2X1 |\
        HRCWL_CORE_TO_CSB_2X1)
-
-#define CONFIG_SYS_NS16550_CLK (CONFIG_83XX_CLKIN * 2)
-
 #elif defined(CONFIG_SYS_33MHZ)
 
 /* 33MHz IN, 165MHz CSB, 330 DDR, 330 CORE */
@@ -459,9 +446,6 @@
        HRCWL_DDR_TO_SCB_CLK_2X1 |\
        HRCWL_CSB_TO_CLKIN_5X1 |\
        HRCWL_CORE_TO_CSB_2X1)
-
-#define CONFIG_SYS_NS16550_CLK (CONFIG_83XX_CLKIN * 5)
-
 #endif
 
 #define CONFIG_SYS_HRCW_HIGH_BASE (\
@@ -478,6 +462,7 @@
                       HRCWH_FROM_0XFFF00100 |\
                       HRCWH_ROM_LOC_NAND_SP_8BIT |\
                       HRCWH_RL_EXT_NAND)
+#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0))
 
 /* System IO Config */
 #define CONFIG_SYS_SICRH       (SICRH_TSOBI1 | SICRH_TSOBI2)   /* RGMII */

diff --git a/include/configs/MPC8313ERDB_NOR.h b/include/configs/MPC8313ERDB_NOR.h
index afb0586c4b925aa24f375cbbe9db2e3148ac4930..64b289adce4e4e3dc9f03d4e1a9e3ebc91bdb804 100644 (file)
--- a/include/configs/MPC8313ERDB_NOR.h
+++ b/include/configs/MPC8313ERDB_NOR.h
@@ -30,16 +30,6 @@
 #define CONFIG_VSC7385_ENET
 #define CONFIG_TSEC2
 
-#ifdef CONFIG_SYS_66MHZ
-#define CONFIG_83XX_CLKIN      66666667        /* in Hz */
-#elif defined(CONFIG_SYS_33MHZ)
-#define CONFIG_83XX_CLKIN      33333333        /* in Hz */
-#else
-#error Unknown oscillator frequency.
-#endif
-
-#define CONFIG_SYS_CLK_FREQ    CONFIG_83XX_CLKIN
-
 #define CONFIG_SYS_IMMR                0xE0000000
 
 #define CONFIG_SYS_MEMTEST_START       0x00001000
@@ -420,8 +410,6 @@
        HRCWL_CSB_TO_CLKIN_2X1 |\
        HRCWL_CORE_TO_CSB_2X1)
 
-#define CONFIG_SYS_NS16550_CLK (CONFIG_83XX_CLKIN * 2)
-
 #elif defined(CONFIG_SYS_33MHZ)
 
 /* 33MHz IN, 165MHz CSB, 330 DDR, 330 CORE */
@@ -434,8 +422,6 @@
        HRCWL_CSB_TO_CLKIN_5X1 |\
        HRCWL_CORE_TO_CSB_2X1)
 
-#define CONFIG_SYS_NS16550_CLK (CONFIG_83XX_CLKIN * 5)
-
 #endif
 
 #define CONFIG_SYS_HRCW_HIGH_BASE (\
@@ -452,6 +438,7 @@
                       HRCWH_FROM_0X00000100 |\
                       HRCWH_ROM_LOC_LOCAL_16BIT |\
                       HRCWH_RL_EXT_LEGACY)
+#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0))
 
 /* System IO Config */
 #define CONFIG_SYS_SICRH       (SICRH_TSOBI1 | SICRH_TSOBI2)   /* RGMII */

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index adb2bb6c2d8a152299abd0da06d96bb2a092bc14..53a02f415fe7bee865cc99a5427e6f3436facd68 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -23,12 +23,6 @@
  */
 #define CONFIG_E300            1 /* E300 family */
 
-/*
- * System Clock Setup
- */
-#define CONFIG_83XX_CLKIN      66666667 /* in Hz */
-#define CONFIG_SYS_CLK_FREQ    CONFIG_83XX_CLKIN
-
 /*
  * Hardware Reset Configuration Word
  * if CLKIN is 66.66MHz, then

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index bd1b1bb0a7c663d9e54a16a559e8214451d79dd8..ee4eeec8856af619cc1a89dcc9287b53c3f9564f 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -15,15 +15,6 @@
 #define CONFIG_E300            1       /* E300 family */
 #define CONFIG_QE              1       /* Has QE */
 
-/*
- * System Clock Setup
- */
-#define CONFIG_83XX_CLKIN      66666667        /* in Hz */
-
-#ifndef CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_CLK_FREQ    CONFIG_83XX_CLKIN
-#endif
-
 /*
  * Hardware Reset Configuration Word
  */

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 4cb595bb8e5f531b4fb3ffe3f1e9960257051d63..0ba647725423c4e615caecca98f16b8c769d82c9 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -12,19 +12,6 @@
 #define CONFIG_E300            1       /* E300 family */
 #define CONFIG_QE              1       /* Has QE */
 
-/*
- * System Clock Setup
- */
-#ifdef CONFIG_PCISLAVE
-#define CONFIG_83XX_PCICLK     66000000        /* in HZ */
-#else
-#define CONFIG_83XX_CLKIN      66000000        /* in Hz */
-#endif
-
-#ifndef CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_CLK_FREQ    66000000
-#endif
-
 /*
  * Hardware Reset Configuration Word
  */

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 40e5c1997dad54cc7d6ee4e65a88e88a6b721e9a..4c9ee76815c21040287bd1e6384bcd45d618f984 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -17,26 +17,11 @@
  */
 #define CONFIG_E300            1       /* E300 Family */
 
-#define CONFIG_PCI_66M
-#ifdef CONFIG_PCI_66M
-#define CONFIG_83XX_CLKIN      66000000        /* in Hz */
-#else
-#define CONFIG_83XX_CLKIN      33000000        /* in Hz */
-#endif
-
-#ifdef CONFIG_PCISLAVE
-#define CONFIG_83XX_PCICLK     66666666        /* in Hz */
-#endif /* CONFIG_PCISLAVE */
-
-#ifndef CONFIG_SYS_CLK_FREQ
-#ifdef CONFIG_PCI_66M
-#define CONFIG_SYS_CLK_FREQ    66000000
+#if CONFIG_SYS_CLK_FREQ == 66000000 || CONFIG_SYS_CLK_FREQ == 66666666
 #define HRCWL_CSB_TO_CLKIN     HRCWL_CSB_TO_CLKIN_4X1
-#else
-#define CONFIG_SYS_CLK_FREQ    33000000
+#elif CONFIG_SYS_CLK_FREQ == 33000000
 #define HRCWL_CSB_TO_CLKIN     HRCWL_CSB_TO_CLKIN_8X1
 #endif
-#endif
 
 #define CONFIG_SYS_IMMR                0xE0000000
 

diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h
index 15f10492a584eb35d32b68a1ae3b865f88b96308..b9710b65882b33a5df6862988e96d29307ac3de1 100644 (file)
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@@ -17,26 +17,11 @@
  */
 #define CONFIG_E300            1       /* E300 Family */
 
-#define CONFIG_PCI_66M
-#ifdef CONFIG_PCI_66M
-#define CONFIG_83XX_CLKIN      66000000        /* in Hz */
-#else
-#define CONFIG_83XX_CLKIN      33000000        /* in Hz */
-#endif
-
-#ifdef CONFIG_PCISLAVE
-#define CONFIG_83XX_PCICLK     66666666        /* in Hz */
-#endif /* CONFIG_PCISLAVE */
-
-#ifndef CONFIG_SYS_CLK_FREQ
-#ifdef CONFIG_PCI_66M
-#define CONFIG_SYS_CLK_FREQ    66000000
+#if CONFIG_SYS_CLK_FREQ == 66000000 || CONFIG_SYS_CLK_FREQ == 66666666
 #define HRCWL_CSB_TO_CLKIN     HRCWL_CSB_TO_CLKIN_4X1
-#else
-#define CONFIG_SYS_CLK_FREQ    33000000
+#elif CONFIG_SYS_CLK_FREQ == 33000000
 #define HRCWL_CSB_TO_CLKIN     HRCWL_CSB_TO_CLKIN_8X1
 #endif
-#endif
 
 #define CONFIG_SYS_IMMR                0xE0000000
 

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 5877279adaf13f4128491f78fb8934eaa58bd946..e170271c40de601d1e461d3ebe830dc452f2282a 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -391,13 +391,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 
 #endif
 
-#define CONFIG_PCI_66M
-#ifdef CONFIG_PCI_66M
-#define CONFIG_83XX_CLKIN      66666666        /* in Hz */
-#else
-#define CONFIG_83XX_CLKIN      33333333        /* in Hz */
-#endif
-
 /* TSEC */
 
 #ifdef CONFIG_TSEC_ENET

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 577f7ec0b2f9eb359ac140371efc4cd194a4d255..33c485aab78ea6ce2b6eb35a700f72d3a49fe882 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -12,19 +12,6 @@
  */
 #define CONFIG_E300            1 /* E300 family */
 
-/*
- * System Clock Setup
- */
-#ifdef CONFIG_PCISLAVE
-#define CONFIG_83XX_PCICLK     66000000 /* in HZ */
-#else
-#define CONFIG_83XX_CLKIN      66000000 /* in Hz */
-#endif
-
-#ifndef CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_CLK_FREQ    66000000
-#endif
-
 /*
  * Hardware Reset Configuration Word
  * if CLKIN is 66MHz, then

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index a8f5b013b2868f6baeafd63763ebff94c52c0fa2..806b0f32e5402431d9d9d5b5343db5f3742ff24d 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -20,20 +20,6 @@
  */
 #define CONFIG_VSC7385_ENET
 
-/*
- * System Clock Setup
- */
-#ifdef CONFIG_PCISLAVE
-#define CONFIG_83XX_PCICLK     66666667 /* in HZ */
-#else
-#define CONFIG_83XX_CLKIN      66666667 /* in Hz */
-#define CONFIG_PCIE
-#endif
-
-#ifndef CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_CLK_FREQ    CONFIG_83XX_CLKIN
-#endif
-
 /*
  * Hardware Reset Configuration Word
  */

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 949e370150f2d59f2b9cf40f3c0265c2091a2a4b..58c301553e37e1335ac224f2eca0c406ccb8120c 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -19,9 +19,6 @@
 /* IMMR Base Address Register, use Freescale default: 0xff400000 */
 #define CONFIG_SYS_IMMR                0xff400000
 
-/* System clock. Primary input clock when in PCI host mode */
-#define CONFIG_83XX_CLKIN      66666000        /* 66,666 MHz */
-
 /*
  * Local Bus LCRR
  *    LCRR:  DLL bypass, Clock divider is 8

diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h
index a8f692d5eada23485cc065e3502556aa6035002d..68fb989856cd9b4e03a83685663e42abbdf10361 100644 (file)
--- a/include/configs/caddy2.h
+++ b/include/configs/caddy2.h
@@ -25,22 +25,11 @@
 /* Don't enable PCI2 on vme834x - it doesn't exist physically. */
 #undef CONFIG_MPC83XX_PCI2             /* support for 2nd PCI controller */
 
-#define CONFIG_PCI_66M
 #ifdef CONFIG_PCI_66M
-#define CONFIG_83XX_CLKIN      66000000        /* in Hz */
-#else
-#define CONFIG_83XX_CLKIN      33000000        /* in Hz */
-#endif
-
-#ifndef CONFIG_SYS_CLK_FREQ
-#ifdef CONFIG_PCI_66M
-#define CONFIG_SYS_CLK_FREQ    66000000
 #define HRCWL_CSB_TO_CLKIN     HRCWL_CSB_TO_CLKIN_4X1
 #else
-#define CONFIG_SYS_CLK_FREQ    33000000
 #define HRCWL_CSB_TO_CLKIN     HRCWL_CSB_TO_CLKIN_8X1
 #endif
-#endif
 
 #define CONFIG_SYS_IMMR                0xE0000000
 

diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index cd5e883b7a19fe4fda9bd485e69bc0683fa59810..8eb12b76709549815cc78a3ec57b646f3e7fbbe6 100644 (file)
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -16,12 +16,6 @@
 
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC83xx_ESDHC_ADDR
 
-/*
- * System Clock Setup
- */
-#define CONFIG_83XX_CLKIN      33333333 /* in Hz */
-#define CONFIG_SYS_CLK_FREQ    CONFIG_83XX_CLKIN
-
 /*
  * Hardware Reset Configuration Word
  * if CLKIN is 66.66MHz, then

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 4b0ec273fb7d1c71ddd5fe8dc11dbe0071dac2b6..eff0addd519bf545c52a2b0e25dce68f69d9dc52 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -20,9 +20,6 @@
 #define CONFIG_BOOT_RETRY_MIN          30
 #define CONFIG_RESET_TO_RETRY
 
-#define CONFIG_83XX_CLKIN              66000000        /* in Hz */
-#define CONFIG_SYS_CLK_FREQ            CONFIG_83XX_CLKIN
-
 #define CONFIG_SYS_IMMR                0xF0000000
 
 #define CONFIG_SYS_ACR_PIPE_DEP        3       /* Arbiter pipeline depth (0-3) */

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 976255f57893c2c07c061093668cf98c668169be..2280f007f2fdfc3c24b34da67621f1e7b1c81b67 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -25,13 +25,6 @@
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
 
-/*
- * System Clock Setup
- */
-#define CONFIG_83XX_CLKIN              66000000
-#define CONFIG_SYS_CLK_FREQ            66000000
-#define CONFIG_83XX_PCICLK             66000000
-
 /*
  * IMMR new address
  */

diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index c007877276b9b449c3ce968916dbe5fa3e04ec30..fd59471370d7e8ddd71eb38185d1838badc5ac7e 100644 (file)
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -21,12 +21,6 @@
 #define CONFIG_TSEC1
 #define CONFIG_TSEC2
 
-/*
- * System Clock Setup
- */
-#define CONFIG_83XX_CLKIN      33333333 /* in Hz */
-#define CONFIG_SYS_CLK_FREQ    CONFIG_83XX_CLKIN
-
 /*
  * Hardware Reset Configuration Word
  * if CLKIN is 66.66MHz, then

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 60eb2cf831409a8c4bd313cce24a4c31f405cf7d..2520a77dd3c9feea1166e2f1cd6702fd093bfcd3 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -22,27 +22,11 @@
 /* Don't enable PCI2 on sbc834x - it doesn't exist physically. */
 #undef CONFIG_MPC83XX_PCI2             /* support for 2nd PCI controller */
 
-/*
- * The default if PCI isn't enabled, or if no PCI clk setting is given
- * is 66MHz; this is what the board defaults to when the PCI slot is
- * physically empty.  The board will automatically (i.e w/o jumpers)
- * clock down to 33MHz if you insert a 33MHz PCI card.
- */
 #ifdef CONFIG_PCI_33M
-#define CONFIG_83XX_CLKIN      33000000        /* in Hz */
-#else  /* 66M */
-#define CONFIG_83XX_CLKIN      66000000        /* in Hz */
-#endif
-
-#ifndef CONFIG_SYS_CLK_FREQ
-#ifdef CONFIG_PCI_33M
-#define CONFIG_SYS_CLK_FREQ    33000000
 #define HRCWL_CSB_TO_CLKIN     HRCWL_CSB_TO_CLKIN_8X1
 #else  /* 66M */
-#define CONFIG_SYS_CLK_FREQ    66000000
 #define HRCWL_CSB_TO_CLKIN     HRCWL_CSB_TO_CLKIN_4X1
 #endif
-#endif
 
 #define CONFIG_SYS_IMMR                0xE0000000
 

diff --git a/include/configs/strider.h b/include/configs/strider.h
index c42fe8c3ece2356a412e3dc73f0d27d915aa8b69..8c9acfba8d55c3baac98a71b82855cb725f75d02 100644 (file)
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -16,12 +16,6 @@
 
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC83xx_ESDHC_ADDR
 
-/*
- * System Clock Setup
- */
-#define CONFIG_83XX_CLKIN      33333333 /* in Hz */
-#define CONFIG_SYS_CLK_FREQ    CONFIG_83XX_CLKIN
-
 /*
  * Hardware Reset Configuration Word
  * if CLKIN is 66.66MHz, then

diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 87fbe36640bd1d3c89d4396e3108e92737377dcb..2ef6f88bdf69fba50f6cab15e83cffbf30743fea 100644 (file)
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -24,10 +24,6 @@
  * On-board devices
  *
  */
-#define CONFIG_83XX_CLKIN      32000000        /* in Hz */
-
-#define CONFIG_SYS_CLK_FREQ    CONFIG_83XX_CLKIN
-
 #define CONFIG_SYS_IMMR                0xE0000000
 
 #define CONFIG_SYS_MEMTEST_START       0x00001000

diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index ea0805875225cbce04f5d04c9f0ea093c8a1c7b0..c5086958ff3f75ef5aec5eed428d0359b1549e03 100644 (file)
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -26,21 +26,12 @@
 #undef CONFIG_MPC83XX_PCI2             /* support for 2nd PCI controller */
 
 #define CONFIG_PCI_66M
-#ifdef CONFIG_PCI_66M
-#define CONFIG_83XX_CLKIN      66000000        /* in Hz */
-#else
-#define CONFIG_83XX_CLKIN      33000000        /* in Hz */
-#endif
 
-#ifndef CONFIG_SYS_CLK_FREQ
 #ifdef CONFIG_PCI_66M
-#define CONFIG_SYS_CLK_FREQ    66000000
 #define HRCWL_CSB_TO_CLKIN     HRCWL_CSB_TO_CLKIN_4X1
 #else
-#define CONFIG_SYS_CLK_FREQ    33000000
 #define HRCWL_CSB_TO_CLKIN     HRCWL_CSB_TO_CLKIN_8X1
 #endif
-#endif
 
 #define CONFIG_SYS_IMMR                0xE0000000