mpc83xx: minor fixups for 8313rdb introduction

diff --git a/MAKEALL b/MAKEALL
index 0f0ec296f26b050c01266681958de8f482d0c92e..a6b93b3c55b63ce571f0124f409848e2e1cfef67 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -132,8 +132,8 @@ LIST_8260=" \
 #########################################################################
 
 LIST_83xx="    \
-       MPC832XEMDS     MPC8349EMDS     MPC8349ITX      MPC8349ITXGP    \
-       MPC8360EMDS     sbc8349         TQM834x                         \
+       MPC8313ERDB     MPC832XEMDS     MPC8349EMDS     MPC8349ITX
+       MPC8349ITXGP    MPC8360EMDS     sbc8349         TQM834x
 "
 
 

diff --git a/Makefile b/Makefile
index 0b0c0d00e0905f65a4df4abc09af2f0f6212610a..f7fde1ebcfaa223e6d971d823835ec793bfa5334 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1624,6 +1624,19 @@ r5200_config :           unconfig
 ## MPC83xx Systems
 #########################################################################
 
+MPC8313ERDB_33_config \
+MPC8313ERDB_66_config: unconfig
+       @echo "" >include/config.h ; \
+       if [ "$(findstring _33_,$@)" ] ; then \
+               echo -n "...33M ..." ; \
+               echo "#define CFG_33MHZ" >>include/config.h ; \
+       fi ; \
+       if [ "$(findstring _66_,$@)" ] ; then \
+               echo -n "...66M..." ; \
+               echo "#define CFG_66MHZ" >>include/config.h ; \
+       fi ;
+       @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb
+
 MPC832XEMDS_config \
 MPC832XEMDS_HOST_33_config \
 MPC832XEMDS_HOST_66_config \
@@ -1689,19 +1702,6 @@ MPC8360EMDS_SLAVE_config:        unconfig
        fi ;
        @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds
 
-MPC8313ERDB_33_config \
-MPC8313ERDB_66_config: unconfig
-       @echo "" >include/config.h ; \
-       if [ "$(findstring _33_,$@)" ] ; then \
-               echo -n "...33M ..." ; \
-               echo "#define CFG_33MHZ" >>include/config.h ; \
-       fi ; \
-       if [ "$(findstring _66_,$@)" ] ; then \
-               echo -n "...66M..." ; \
-               echo "#define CFG_66MHZ" >>include/config.h ; \
-       fi ;
-       @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb
-
 sbc8349_config:                unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc83xx sbc8349
 

diff --git a/cpu/mpc83xx/pci.c b/cpu/mpc83xx/pci.c
index 2a2b0bd90288d05e5303da5e14d599130b5e68e5..785d6129daf76e24ae3bf48c27757551b70f1092 100644 (file)
--- a/cpu/mpc83xx/pci.c
+++ b/cpu/mpc83xx/pci.c
@@ -25,6 +25,7 @@
 
 #include <common.h>
 #include <pci.h>
+#include <ft_build.h>
 #include <asm/mpc8349_pci.h>
 
 #ifdef CONFIG_83XX_GENERIC_PCI

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 2519c6b8b528aac1851d3492133a971ea45d7337..11858bfb8f61824dd4aa86a2537a9d3e89f7888e 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -47,9 +47,9 @@
 #define CONFIG_83XX_GENERIC_PCI
 
 #ifdef CFG_66MHZ
-#define CONFIG_83XX_CLKIN      66000000        /* in Hz */
+#define CONFIG_83XX_CLKIN      66666667        /* in Hz */
 #elif defined(CFG_33MHZ)
-#define CONFIG_83XX_CLKIN      33000000        /* in Hz */
+#define CONFIG_83XX_CLKIN      33333333        /* in Hz */
 #else
 #error Unknown oscillator frequency.
 #endif