Merge tag 'v2021.10-rc4' into next

[platform/kernel/u-boot.git] / include / configs / sama5d4_xplained.h

diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index d00be5a..3032297 100644 (file)
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -22,8 +22,6 @@
        (CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
 #endif
 
-#define CONFIG_SYS_LOAD_ADDR           0x22000000 /* load address */
-
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
@@ -45,7 +43,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 #endif
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x40000