Convert CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to Kconfig

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

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index a6865b2..2ee07ba 100644 (file)
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -25,7 +25,6 @@
 #define CONFIG_LCD_LOGO
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_ATMEL_HLCD
 #define CONFIG_ATMEL_LCD_RGB565
 
 /*
@@ -33,7 +32,6 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_SYS_SDRAM_BASE          0x20000000
 #define CONFIG_SYS_SDRAM_SIZE          0x08000000
 
@@ -46,13 +44,9 @@
        (0x00300000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
 
 /* DataFlash */
-#ifdef CONFIG_CMD_SF
-#define CONFIG_SF_DEFAULT_SPEED                30000000
-#endif
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_ATMEL
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000
 #define CONFIG_SYS_NAND_MASK_ALE       (1 << 21)
@@ -61,15 +55,6 @@
 #define CONFIG_SYS_NAND_READY_PIN      GPIO_PIN_PD(5)
 #endif
 
-/* PMECC & PMERRLOC */
-#define CONFIG_ATMEL_NAND_HWECC
-#define CONFIG_ATMEL_NAND_HW_PMECC
-#define CONFIG_PMECC_CAP               2
-#define CONFIG_PMECC_SECTOR_SIZE       512
-
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
-
 #define CONFIG_EXTRA_ENV_SETTINGS                                       \
        "console=console=ttyS0,115200\0"                                \
        "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0"                                  \
@@ -77,14 +62,8 @@
        "bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0"
 
 /* Ethernet */
-#define CONFIG_KS8851_MLL
-#define CONFIG_KS8851_MLL_BASEADDR     0x30000000 /* use NCS2 */
-
 #define CONFIG_SYS_LOAD_ADDR           0x22000000 /* load address */
 
-#define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END         0x26e00000
-
 /* USB host */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_ATMEL
@@ -99,9 +78,6 @@
 #ifdef CONFIG_SPI_BOOT
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_OFFSET              0x5000
-#define CONFIG_ENV_SIZE                        0x3000
-#define CONFIG_ENV_SECT_SIZE           0x1000
 #define CONFIG_BOOTCOMMAND                                             \
        "setenv bootargs ${console} ${mtdparts} ${bootargs_nand};"      \
        "sf probe 0; sf read 0x22000000 0x100000 0x300000; "            \
@@ -110,9 +86,6 @@
 #elif defined(CONFIG_NAND_BOOT)
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_OFFSET              0x140000
-#define CONFIG_ENV_OFFSET_REDUND       0x100000
-#define CONFIG_ENV_SIZE                        0x20000         /* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND                                             \
        "setenv bootargs ${console} ${mtdparts} ${bootargs_nand};"      \
        "nand read 0x21000000 0x180000 0x080000;"                       \
@@ -125,12 +98,9 @@
 
 #ifdef CONFIG_ENV_IS_IN_MMC
 /* Use raw reserved sectors to save environment */
-#define CONFIG_ENV_OFFSET              0x2000
-#define CONFIG_ENV_SIZE                        0x1000
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #else
 /* Use file in FAT file to save environment */
-#define CONFIG_ENV_SIZE                        0x4000
 #endif
 
 #define CONFIG_BOOTCOMMAND                                             \
@@ -147,7 +117,6 @@
 #define CONFIG_SYS_MALLOC_LEN  (4 * 1024 * 1024)
 
 /* SPL */
-#define CONFIG_SPL_TEXT_BASE           0x300000
 #define CONFIG_SPL_MAX_SIZE            0x6000
 #define CONFIG_SPL_STACK               0x308000
 
@@ -164,16 +133,7 @@
 #define CONFIG_SYS_MCKR_CSS            0x1302
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
-
-#elif CONFIG_SYS_USE_NANDFLASH
-#elif CONFIG_SPI_BOOT
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x8400
-
-#elif CONFIG_NAND_BOOT
-#define CONFIG_SPL_NAND_DRIVERS
-#define CONFIG_SPL_NAND_BASE
 #endif
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x40000
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
@@ -182,6 +142,5 @@
 #define CONFIG_SYS_NAND_OOBSIZE                64
 #define CONFIG_SYS_NAND_BLOCK_SIZE     0x20000
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS  0x0
-#define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
 
 #endif