Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / ppmc8260.h

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index 91cb05e0a8ff130c5e24aab9cdee714529996530..5dcd9cc0d03bd800e6c24bec12d3d6db0b92f883 100644 (file)
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -293,7 +293,6 @@
  *
  *****************************************************************************/
 
-#define CONFIG_MPC8260         1       /* This is an MPC8260 CPU   */
 #define CONFIG_PPMC8260                1       /* on an Wind River PPMC8260 Board  */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 
@@ -314,7 +313,6 @@
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size     */
 
 #define CONFIG_SYS_LOAD_ADDR           0x140000   /* default load address */
-#define CONFIG_SYS_HZ                  1000    /* decrementer freq: 1 ms ticks */
 
 #define CONFIG_SYS_MEMTEST_START       0x2000  /* memtest works from the end of */
                                        /* the exception vector table */