From 60a9e2c994e431997864c5ce6c4497b302628746 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben.dooks@codethink.co.uk>
Date: Fri, 11 Jan 2013 18:09:01 +0000
Subject: Updated xp_test_defconfig

---
 arch/arm/configs/xp_test_defconfig | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/arch/arm/configs/xp_test_defconfig b/arch/arm/configs/xp_test_defconfig
index ea94aab24d3f..4697e68231cf 100644
--- a/arch/arm/configs/xp_test_defconfig
+++ b/arch/arm/configs/xp_test_defconfig
@@ -272,7 +272,7 @@ CONFIG_ARMADA_XP=y
 # CONFIG_ARMADA_XP_REV_Z1 is not set
 # CONFIG_ARMADA_XP_REV_A0 is not set
 CONFIG_ARMADA_XP_REV_B0=y
-# CONFIG_ARMADA_XP_A0_WITH_B0 is not set
+CONFIG_ARMADA_XP_A0_WITH_B0=y
 CONFIG_MACH_ARMADA_XP_DB=y
 CONFIG_MACH_ARMADA_XP_GP=y
 CONFIG_MACH_ARMADA_XP_RDSRV=y
@@ -320,14 +320,9 @@ CONFIG_MV_DCACHE_SIZE=0x8000
 #
 # Armada SoC MTD support
 #
-CONFIG_MV_FLASH_CTRL=y
-CONFIG_MV_INCLUDE_SFLASH_MTD=y
-# CONFIG_MV_SPI_BOOT is not set
-CONFIG_MTD_NAND_NFC=y
-CONFIG_MTD_NAND_NFC_GANG_SUPPORT=y
-CONFIG_MTD_NAND_NFC_MLC_SUPPORT=y
-CONFIG_MTD_NAND_NFC_INIT_RESET=y
-# CONFIG_MTD_NAND_NFC_NEGLECT_RNB is not set
+# CONFIG_MV_FLASH_CTRL is not set
+# CONFIG_MV_INCLUDE_SFLASH_MTD is not set
+# CONFIG_MTD_NAND_NFC is not set
 CONFIG_MV_USB_HOST=y
 # CONFIG_MV_USB_DEVICE is not set
 # CONFIG_FEROCEON_PROC is not set
@@ -500,8 +495,10 @@ CONFIG_CPU_CP15_MMU=y
 CONFIG_ARM_THUMB=y
 # CONFIG_ARM_THUMBEE is not set
 # CONFIG_SWP_EMULATE is not set
-# CONFIG_CPU_BIG_ENDIAN is not set
-# CONFIG_BE8_ON_LE is not set
+CONFIG_CPU_BIG_ENDIAN=y
+CONFIG_CPU_ENDIAN_BE8=y
+# CONFIG_CPU_ENDIAN_BE32 is not set
+CONFIG_BE8_ON_LE=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -513,6 +510,12 @@ CONFIG_ARM_THUMB=y
 # CONFIG_SHEEVA_ERRATA_ARM_CPU_4611 is not set
 # CONFIG_SHEEVA_ERRATA_ARM_CPU_BTS61 is not set
 # CONFIG_SHEEVA_ERRATA_ARM_CPU_4948 is not set
+CONFIG_SHEEVA_ERRATA_ARM_CPU_6409=y
+CONFIG_SHEEVA_ERRATA_ARM_CPU_5980=y
+CONFIG_SHEEVA_ERRATA_ARM_CPU_6043=y
+CONFIG_SHEEVA_ERRATA_ARM_CPU_6075=y
+CONFIG_SHEEVA_ERRATA_ARM_CPU_6076=y
+CONFIG_SHEEVA_ERRATA_ARM_CPU_6136=y
 CONFIG_SHEEVA_ERRATA_ARM_CPU_6124=y
 CONFIG_SHEEVA_ERRATA_ARM_CPU_PMU_RESET=y
 CONFIG_SHEEVA_DEEP_IDLE=y
@@ -947,8 +950,7 @@ CONFIG_MTD_PHYSMAP=y
 #
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_DATAFLASH is not set
-CONFIG_MTD_M25P80=y
-CONFIG_M25PXX_USE_FAST_READ=y
+# CONFIG_MTD_M25P80 is not set
 # CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
@@ -1038,7 +1040,7 @@ CONFIG_BLK_DEV_SR=m
 CONFIG_CHR_DEV_SG=m
 # CONFIG_CHR_DEV_SCH is not set
 # CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
+CONFIG_SCSI_CONSTANTS=y
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
 CONFIG_SCSI_WAIT_SCAN=m
@@ -1672,7 +1674,8 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_ADT7462 is not set
 # CONFIG_SENSORS_ADT7470 is not set
 # CONFIG_SENSORS_ADT7475 is not set
-CONFIG_SENSORS_ARMADA=y
+# CONFIG_SENSORS_ARMADA is not set
+CONFIG_SENSORS_ARMADA_XP=y
 # CONFIG_SENSORS_ASC7621 is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS620 is not set
-- 
cgit v1.2.1