1 files changed, 11 insertions, 15 deletions
diff --git a/configs/arbel_evb_defconfig b/configs/arbel_evb_defconfig
index c27a7cdd3a..ce7f2355e1 100644
--- a/configs/arbel_evb_defconfig
+++ b/configs/arbel_evb_defconfig
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_NPCM=y
+CONFIG_TEXT_BASE=0x06208000
 CONFIG_SYS_MALLOC_LEN=0x240000
 CONFIG_SYS_MALLOC_F_LEN=0x1000
-CONFIG_TEXT_BASE=0x06208000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x40000
 CONFIG_ENV_OFFSET=0x3C0000
@@ -14,7 +14,7 @@ CONFIG_DM_RESET=y
 # CONFIG_PSCI_RESET is not set
 CONFIG_ARCH_NPCM8XX=y
 CONFIG_TARGET_ARBEL_EVB=y
-CONFIG_SYS_LOAD_ADDR=0x10000000
+CONFIG_SYS_LOAD_ADDR=0x06208000
 CONFIG_ENV_ADDR=0x803C0000
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
@@ -23,12 +23,12 @@ CONFIG_BOOTCOMMAND="run common_bootargs; run romboot"
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_BOOTM_LEN=0x1400000
-CONFIG_SYS_LOAD_ADDR=0x06208000
-CONFIG_SYS_INIT_SP_ADDR=0x06208000
 CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_PART=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
@@ -38,7 +38,9 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_RNG=y
 CONFIG_CMD_UUID=y
 CONFIG_CMD_HASH=y
+CONFIG_CMD_TPM=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
@@ -50,6 +52,7 @@ CONFIG_DM_I2C=y
 # CONFIG_INPUT is not set
 CONFIG_MISC=y
 CONFIG_NPCM_HOST=y
+CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_NPCM=y
 CONFIG_DM_SPI_FLASH=y
@@ -68,7 +71,6 @@ CONFIG_PINCTRL_NPCM8XX=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_NPCM8XX=y
 CONFIG_RESET_SYSCON=y
-CONFIG_DM_RNG=y
 CONFIG_RNG_NPCM=y
 CONFIG_DM_SERIAL=y
 CONFIG_NPCM_SERIAL=y
@@ -76,8 +78,11 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_NPCM_FIU_SPI=y
 CONFIG_NPCM_PSPI=y
+CONFIG_TEE=y
+CONFIG_OPTEE=y
 CONFIG_TIMER=y
 CONFIG_NPCM_TIMER=y
+CONFIG_TPM2_FTPM_TEE=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_NPCM=y
@@ -87,15 +92,6 @@ CONFIG_USB_OHCI_GENERIC=y
 CONFIG_USB_OHCI_NPCM=y
 CONFIG_USB_STORAGE=y
 CONFIG_LIB_HW_RAND=y
+CONFIG_TPM=y
 CONFIG_SHA_HW_ACCEL=y
 # CONFIG_EFI_LOADER is not set
-CONFIG_TEE=y
-CONFIG_OPTEE=y
-CONFIG_TPM=y
-CONFIG_TPM_V2=y
-CONFIG_TPM2_FTPM_TEE=y
-CONFIG_CMD_TPM=y
-CONFIG_SUPPORT_EMMC_RPMB=y
-CONFIG_CMD_GPT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_CMD_PART=y