Merge with testing-4xx_enet (Create generic 4xx Ethernet code)

[u-boot] / cpu / mpc5xxx / start.S

diff --git a/cpu/mpc5xxx/start.S b/cpu/mpc5xxx/start.S
index 99cad9c567b54a166eae7e51ee7ab38a04d0cf45..3936b5551f3c11d33437c755083dfccd4a6fc82a 100644 (file)
--- a/cpu/mpc5xxx/start.S
+++ b/cpu/mpc5xxx/start.S
@@ -107,9 +107,12 @@ boot_warm:
        /*--------------------------------------------------------------*/
 
 #if defined(CFG_LOWBOOT)
-#if defined(CFG_RAMBOOT)
-#error CFG_LOWBOOT is incompatible with CFG_RAMBOOT
-#endif /* CFG_RAMBOOT */
+# if defined(CFG_RAMBOOT)
+#  error CFG_LOWBOOT is incompatible with CFG_RAMBOOT
+# endif /* CFG_RAMBOOT */
+# if defined(CONFIG_MGT5100)
+#  error CFG_LOWBOOT is incompatible with MGT5100
+# endif /* CONFIG_MGT5100 */
        lis     r4, CFG_DEFAULT_MBAR@h
        lis     r3,     START_REG(CFG_BOOTCS_START)@h
        ori     r3, r3, START_REG(CFG_BOOTCS_START)@l