Convert CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to Kconfig

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

diff --git a/include/configs/sama5d2_icp.h b/include/configs/sama5d2_icp.h
index 5c54a9c..9be6d4f 100644 (file)
--- a/include/configs/sama5d2_icp.h
+++ b/include/configs/sama5d2_icp.h
@@ -30,7 +30,6 @@
 #define CONFIG_SYS_LOAD_ADDR           0x22000000 /* load address */
 
 /* NAND flash */
-#undef CONFIG_CMD_NAND
 
 /* SPI flash */
 #define CONFIG_SF_DEFAULT_SPEED                66000000
@@ -41,14 +40,10 @@
 #define FAT_ENV_INTERFACE      "mmc"
 #define FAT_ENV_DEVICE_AND_PART        "0"
 #define FAT_ENV_FILE           "uboot.env"
-#define CONFIG_ENV_SIZE                0x4000
 /* bootstrap + u-boot + env in sd card */
 #define CONFIG_BOOTCOMMAND     "fatload mmc 0:1 0x21000000 at91-sama5d2_icp.dtb; " \
                                "fatload mmc 0:1 0x22000000 zImage; " \
                                "bootz 0x22000000 - 0x21000000"
-#undef CONFIG_BOOTARGS
-#define CONFIG_BOOTARGS \
-       "console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
 #endif
 
 /* SPL */
@@ -61,7 +56,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