Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

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

diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index 9e5490d1df436c9cb60131bff995bd672b1577b0..09cfef6575cbb4e96edeff1fca88791b87093e33 100644 (file)
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -33,12 +33,12 @@
  * run from RAM instead of Flash.
  */
 #define        CONFIG_SYS_TEXT_BASE    0x08000000
+#define CONFIG_SYS_LDSCRIPT    "board/amirix/ap1000/u-boot.lds"
 
 #define CONFIG_PCI     1
 
 #define CONFIG_SYS_HUSH_PARSER 1               /* use "hush" command parser    */
 #define CONFIG_SYS_PROMPT              "0> "
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 #define CONFIG_COMMAND_EDIT    1
 #define CONFIG_COMPLETE_ADDRESSES 1
@@ -93,6 +93,14 @@
 
 #define CONFIG_SPD_EEPROM      1       /* use SPD EEPROM for setup    */
 
+/*
+ * I2C
+ */
+#define CONFIG_HARD_I2C                        /* I2C with hardware support    */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
+#define CONFIG_SYS_I2C_SLAVE   0x7F
+#define CONFIG_SYS_I2C_SPEED   400000
+
 /*
  * Miscellaneous configurable options
  */
@@ -230,7 +238,6 @@
 #define CONFIG_SYS_JFFS2_NUM_BANKS     1
 #define CONFIG_SYS_JFFS2_FIRST_SECTOR  1
 
-#define CONFIG_NET_MULTI
 #define CONFIG_E1000
 
 #define CONFIG_SYS_ETH_DEV_FN          0x0800