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

[u-boot] / include / configs / amcc-common.h

diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 51128a3b566d9334db31d4fd6379740fca741518..13a941ef635c8c677a80f29f4fe3680c6a8a4f39 100644 (file)
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -40,6 +40,7 @@
  * I2C
  */
 #define CONFIG_HARD_I2C                        /* I2C with hardware support    */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 
 /*
@@ -156,6 +157,8 @@
  */
 #define CONFIG_OF_LIBFDT
 #define CONFIG_OF_BOARD_SETUP
+/* Update size in "reg" property of NOR FLASH device tree nodes */
+#define CONFIG_FDT_FIXUP_NOR_FLASH_SIZE
 
 /*
  * Booting and default environment