Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 584c59de486dca9155a5985c16f4df0b5d24922b..331f4c93a20354f53fc61d1bbec67b9f0b8e2b1d 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -29,8 +29,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#undef DEBUG
-
 /*
  * High Level Configuration Options
  */
@@ -356,9 +354,9 @@
 #define CFG_I2C2_OFFSET                0x3100
 
 /* SPI */
-#define CONFIG_HARD_SPI                        /* SPI with hardware support*/
+#define CONFIG_MPC8XXX_SPI
+#define CONFIG_HARD_SPI                        /* SPI with hardware support */
 #undef CONFIG_SOFT_SPI                 /* SPI bit-banged */
-#define CONFIG_FSL_SPI
 
 /* GPIOs.  Used as SPI chip selects */
 #define CFG_GPIO1_PRELIM