Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-sh into next

[J-u-boot.git] / configs / r2dplus_defconfig

diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index 4217175345dacd51d456f80807c3d88152a72844..4a85ffbaaf636c5730efd00ad6eaab499f098bd9 100644 (file)
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -5,21 +5,22 @@ CONFIG_SYS_MALLOC_F_LEN=0x400
 CONFIG_ENV_SIZE=0x40000
 CONFIG_ENV_SECT_SIZE=0x40000
 CONFIG_DEFAULT_DEVICE_TREE="sh7751-r2dplus"
-CONFIG_SYS_CLK_FREQ=60000000
+CONFIG_SYS_MONITOR_LEN=262144
 CONFIG_SYS_LOAD_ADDR=0x8e000000
+CONFIG_SYS_CLK_FREQ=60000000
 CONFIG_ENV_ADDR=0xA0040000
+CONFIG_PCI=y
 CONFIG_TARGET_R2DPLUS=y
-CONFIG_SYS_MONITOR_LEN=262144
 CONFIG_SYS_MONITOR_BASE=0xA0000000
 CONFIG_BOOTDELAY=-1
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttySC0,115200"
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="pci enum"
-CONFIG_DISPLAY_BOARDINFO=y
-CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=256
+CONFIG_DISPLAY_BOARDINFO=y
+CONFIG_HUSH_PARSER=y
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_DM=y
 CONFIG_CMD_IDE=y
@@ -42,8 +43,10 @@ CONFIG_SYS_ATA_REG_OFFSET=0x1000
 CONFIG_SYS_ATA_ALT_OFFSET=0x800
 CONFIG_IDE_RESET=y
 CONFIG_CLK=y
+CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=256
 CONFIG_E1000=y
@@ -51,7 +54,6 @@ CONFIG_EEPRO100=y
 CONFIG_PCNET=y
 CONFIG_RTL8139=y
 CONFIG_TULIP=y
-CONFIG_PCI=y
 CONFIG_SH7751_PCI=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y