Merge branch 'next'

[platform/kernel/u-boot.git] / include / configs / ls1088ardb.h

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 0f7778c..0a1a48b 100644 (file)
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -16,7 +16,6 @@
 #define SYS_NO_FLASH
 #endif
 
-#define CONFIG_SYS_CLK_FREQ            100000000
 #define COUNTER_FREQUENCY_REAL         25000000        /* 25MHz */
 #define COUNTER_FREQUENCY              25000000        /* 25MHz */
 
@@ -61,7 +60,6 @@
 #define CONFIG_SYS_FLASH_QUIET_TEST
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_MAX_FLASH_BANKS     1       /* number of banks */
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
@@ -224,12 +222,6 @@
 #define CONFIG_SYS_I2C_EEPROM_NXID
 #define CONFIG_SYS_EEPROM_BUS_NUM              0
 
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE
-#else
-#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
-#endif
-
 #define CONFIG_FSL_MEMAC
 
 #ifndef SPL_NO_ENV
@@ -457,8 +449,6 @@
 #define QSGMII2_PORT2_PHY_ADDR         0x1d
 #define QSGMII2_PORT3_PHY_ADDR         0x1e
 #define QSGMII2_PORT4_PHY_ADDR         0x1f
-
-#define CONFIG_ETHPRIME                "DPMAC1@xgmii"
 #endif
 #endif