Code cleanup; make several boards compile & link.

[u-boot] / include / configs / MPC8266ADS.h

diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 8501b2b4d9b01b647facd043ffa17f60e79db053..5b2a8a33e2dec77231c66fcd0a2d7fda7bcf4da2 100644 (file)
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -49,10 +49,10 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is an MPC8260 CPU   */
-#define CONFIG_MPC8266ADS      1       /* ...on motorola ads board */
+#define CONFIG_MPC8260         1       /* This is an MPC8260 CPU       */
+#define CONFIG_MPC8266ADS      1       /* ...on motorola ADS board     */
 
-#define CONFIG_BOARD_PRE_INIT  1       /* Call board_pre_init  */
+#define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f      */
 
 /* allow serial and ethaddr to be overwritten */
 #define CONFIG_ENV_OVERWRITE
@@ -175,7 +175,7 @@
 #define CONFIG_BOOT_ROOT_INITRD 0      /* Use ram disk for the root file system */
 #define CONFIG_BOOT_ROOT_NFS   1       /* Use a NFS mounted root file system */
 
-#if CONFIG_BOOT_ROOT_INITRD
+#ifdef CONFIG_BOOT_ROOT_INITRD
 #define CONFIG_BOOTCOMMAND \
        "version;" \
        "echo;" \
@@ -185,7 +185,7 @@
        "bootm"
 #endif /* CONFIG_BOOT_ROOT_INITRD */
 
-#if CONFIG_BOOT_ROOT_NFS
+#ifdef CONFIG_BOOT_ROOT_NFS
 #define CONFIG_BOOTCOMMAND \
        "version;" \
        "echo;" \
@@ -508,7 +508,8 @@
 #define CFG_MPTPR              0x00001900
 #define CFG_PSRT               0x00000021
 
-#define CFG_RESET_ADDRESS      0x04400000
+/* This address must not exist */
+#define CFG_RESET_ADDRESS      0xFCFFFF00
 
 /* PCI Memory map (if different from default map */
 #define CFG_PCI_SLV_MEM_LOCAL  CFG_SDRAM_BASE          /* Local base */