configs: Resync with savedefconfig

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

diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index 0e9cb5d..4126286 100644 (file)
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -1,19 +1,18 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_AT91=y
-CONFIG_SYS_TEXT_BASE=0
+CONFIG_TEXT_BASE=0
 CONFIG_SYS_MALLOC_LEN=0x50000
 CONFIG_TARGET_PM9261=y
 CONFIG_NR_DRAM_BANKS=1
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20003f00
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
-CONFIG_SYS_PROMPT="pm9261> "
 CONFIG_SYS_LOAD_ADDR=0x22000000
 CONFIG_ENV_ADDR=0x10040000
-CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20003f00
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/mtdblock4 rootfstype=jffs2 fbcon=rotate:3 "
@@ -24,6 +23,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 # CONFIG_AUTO_COMPLETE is not set
+CONFIG_SYS_PROMPT="pm9261> "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=281
 # CONFIG_CMD_BDI is not set
@@ -45,6 +45,7 @@ CONFIG_AT91_GPIO=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_MTD_RAW_NAND=y
@@ -61,13 +62,9 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
 CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
-CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 CONFIG_USB_ATMEL=y
-CONFIG_DM_VIDEO=y
+CONFIG_VIDEO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_ATMEL_LCD=y
 CONFIG_ATMEL_LCD_BGR555=y
-CONFIG_LCD=y
-CONFIG_LCD_INFO=y
-CONFIG_LCD_LOGO=y
 CONFIG_REGEX=y