Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

[oweals/u-boot.git] / include / configs / mpc7448hpc2.h

diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 4237228bebe5e0c887559927f9ce427752fce90a..2f249674050f701c66bf993270e06034ae32a4df 100644 (file)
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -33,15 +33,13 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#undef DEBUG
-
 /* Board Configuration Definitions */
 /* MPC7448HPC2 (High-Performance Computing II) (Taiga) board */
 
 #define CONFIG_MPC7448HPC2
 
 #define CONFIG_74xx
-#define CONFIG_750FX           /* this option to enable init of extended BATs */
+#define CONFIG_HIGH_BATS       /* High BATs supported */
 #define CONFIG_ALTIVEC         /* undef to disable */
 
 #define CFG_BOARD_NAME         "MPC7448 HPC II"
@@ -60,6 +58,7 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_MISC_INIT_R
 
+#define CONFIG_HAS_ETH0
 #define CONFIG_HAS_ETH1
 
 #define CONFIG_ENV_OVERWRITE
@@ -77,12 +76,9 @@
 #define CFG_PROMPT_HUSH_PS2    "> "
 
 /* Pass open firmware flat tree */
-#define CONFIG_OF_FLAT_TREE    1
+#define CONFIG_OF_LIBFDT       1
 #define CONFIG_OF_BOARD_SETUP  1
 
-/* maximum size of the flat tree (8K) */
-#define OF_FLAT_TREE_MAX_SIZE  8192
-
 #define OF_CPU                 "PowerPC,7448@0"
 #define OF_TSI                 "tsi108@c0000000"
 #define OF_TBCLK               (bd->bi_busfreq / 8)
@@ -112,8 +108,7 @@
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 
 #undef CONFIG_BOOTARGS
-/* #define CONFIG_PREBOOT  "echo;echo Type \"run flash_nfs\"
- * to mount root filesystem over NFS;echo" */
+/* #define CONFIG_PREBOOT  "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo" */
 
 #if (CONFIG_BOOTDELAY >= 0)
 #define CONFIG_BOOTCOMMAND     "tftpboot 0x400000 zImage.initrd.elf;\
@@ -375,9 +370,9 @@
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
-#define CFG_MAX_FLASH_BANKS    1/* Flash can be at one of two addresses */
+#define CFG_MAX_FLASH_BANKS    1               /* Flash can be at one of two addresses */
 #define FLASH_BANK_SIZE                0x01000000      /* 16 MB Total */
-#define CFG_FLASH_BANKS_LIST {CFG_FLASH_BASE, CFG_FLASH_BASE2}
+#define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE, /* CFG_FLASH_BASE2 */ }
 
 #define CFG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI