Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig

[people/ms/u-boot.git] / include / configs / axs10x.h

diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index 58b1850d64340e5530cc9aa758affd69c9b4d8e2..5f11f42e3278c158544e0612fdb4f37ac81313b2 100644 (file)
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -11,8 +11,6 @@
 /*
  *  CPU configuration
  */
-#define CONFIG_SYS_TIMER_RATE          CONFIG_SYS_CLK_FREQ
-
 #define ARC_FPGA_PERIPHERAL_BASE       0xE0000000
 #define ARC_APB_PERIPHERAL_BASE                0xF0000000
 #define ARC_DWMMC_BASE                 (ARC_FPGA_PERIPHERAL_BASE + 0x15000)
@@ -31,7 +29,7 @@
        (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE)
 
 #define CONFIG_SYS_MALLOC_LEN          SZ_2M
-#define CONFIG_SYS_BOOTM_LEN           SZ_32M
+#define CONFIG_SYS_BOOTM_LEN           SZ_128M
 #define CONFIG_SYS_LOAD_ADDR           0x82000000
 
 /*
@@ -42,7 +40,6 @@
 /*
  * NAND Flash configuration
  */
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_SYS_NAND_BASE           (ARC_FPGA_PERIPHERAL_BASE + 0x16000)
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 
@@ -53,45 +50,11 @@
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK         33333333
 #define CONFIG_SYS_NS16550_MEM32
-#define CONFIG_BAUDRATE                        115200
-
-/*
- * I2C configuration
- */
-#define CONFIG_SYS_I2C
-#define CONFIG_I2C_ENV_EEPROM_BUS      2
-#define CONFIG_SYS_I2C_SPEED           100000
-#define CONFIG_SYS_I2C_SPEED1          100000
-#define CONFIG_SYS_I2C_SPEED2          100000
-#define CONFIG_SYS_I2C_SLAVE           0
-#define CONFIG_SYS_I2C_SLAVE1          0
-#define CONFIG_SYS_I2C_SLAVE2          0
-#define CONFIG_SYS_I2C_BASE            0xE001D000
-#define CONFIG_SYS_I2C_BASE1           0xE001E000
-#define CONFIG_SYS_I2C_BASE2           0xE001F000
-#define CONFIG_SYS_I2C_BUS_MAX         3
-#define IC_CLK                         50
-
-/*
- * EEPROM configuration
- */
-#define CONFIG_SYS_I2C_EEPROM_ADDR             (0xA8 >> 1)
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         1
-#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW    1
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      3
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  64
-
-/*
- * SD/MMC configuration
- */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
 
 /*
  * Ethernet PHY configuration
  */
 #define CONFIG_MII
-#define CONFIG_PHY_GIGE
 
 /*
  * USB 1.1 configuration
@@ -99,36 +62,20 @@
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
 
-/*
- * Commands still not supported in Kconfig
- */
-#define CONFIG_CMD_NAND
-
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_MAXARGS             16
-
 /*
  * Environment settings
  */
-#define CONFIG_ENV_IS_IN_EEPROM
-#define CONFIG_ENV_SIZE                        SZ_512
-#define CONFIG_ENV_OFFSET              0
+#define CONFIG_ENV_SIZE                        SZ_16K
 
 /*
  * Environment configuration
  */
 #define CONFIG_BOOTFILE                        "uImage"
-#define CONFIG_BOOTARGS                        "console=ttyS3,115200n8"
 #define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
 
 /*
  * Console configuration
  */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE              SZ_256
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                               sizeof(CONFIG_SYS_PROMPT) + 16)
 
 /*
  * Misc utility configuration