configs: Resync with savedefconfig

[platform/kernel/u-boot.git] / configs / malta_defconfig

diff --git a/configs/malta_defconfig b/configs/malta_defconfig
index 9911c71..5686003 100644 (file)
--- a/configs/malta_defconfig
+++ b/configs/malta_defconfig
@@ -1,19 +1,20 @@
 CONFIG_MIPS=y
-CONFIG_SYS_TEXT_BASE=0xBE000000
+CONFIG_TEXT_BASE=0xBE000000
 CONFIG_SYS_MALLOC_LEN=0x20000
 CONFIG_SYS_MALLOC_F_LEN=0x400
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_SECT_SIZE=0x20000
 CONFIG_DEFAULT_DEVICE_TREE="mti,malta"
-CONFIG_SYS_PROMPT="malta # "
 CONFIG_SYS_LOAD_ADDR=0x81000000
 CONFIG_ENV_ADDR=0xBE3E0000
 CONFIG_TARGET_MALTA=y
+CONFIG_SYS_MIPS_TIMER_FREQ=250000000
 # CONFIG_AUTOBOOT is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_MISC_INIT_R=y
 CONFIG_SYS_MALLOC_BOOTPARAMS=y
 CONFIG_HUSH_PARSER=y
+CONFIG_SYS_PROMPT="malta # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=281
 CONFIG_SYS_BOOTM_LEN=0x4000000
@@ -24,7 +25,6 @@ CONFIG_CMD_IDE=y
 CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
-# CONFIG_CMD_NFS is not set
 CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 # CONFIG_ISO_PARTITION is not set
@@ -35,6 +35,7 @@ CONFIG_SYS_ATA_REG_OFFSET=0
 CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
@@ -43,3 +44,4 @@ CONFIG_PCI_GT64120=y
 CONFIG_PCI_MSC01=y
 CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y