diff options
| author | Wenyou Yang <wenyou.yang@microchip.com> | 2017-09-14 11:07:44 +0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-14 16:02:48 -0400 |
| commit | 5541543f686b43210fb92181003ff7175d4ab036 (patch) | |
| tree | a9e5f81fe6a382c1caae6eacb4114232c8a8eed6 /include/configs/at91sam9n12ek.h | |
| parent | a35c34025e4ae08441f2e26ddcac86aec63c33af (diff) | |
configs: at91: Remove CONFIG_SYS_EXTRA_OPTIONS assignment
To remove the assignment of CONFIG_SYS_EXTRA_OPTIONS option,
which is deprecated, use the CONFIG_XXXX_BOOT options to
indicate the boot media, and the SoC is selected by the board.
Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
Diffstat (limited to 'include/configs/at91sam9n12ek.h')
| -rw-r--r-- | include/configs/at91sam9n12ek.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index c9adcf9754..111a7dce7d 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -108,7 +108,7 @@ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 #endif -#ifdef CONFIG_SYS_USE_SPIFLASH +#ifdef CONFIG_SPI_BOOT /* bootstrap + u-boot + env + linux in dataflash on CS0 */ #define CONFIG_ENV_OFFSET 0x5000 @@ -119,7 +119,7 @@ "sf probe 0; sf read 0x22000000 0x100000 0x300000; " \ "bootm 0x22000000" -#elif defined(CONFIG_SYS_USE_NANDFLASH) +#elif defined(CONFIG_NAND_BOOT) /* bootstrap + u-boot + env + linux in nandflash */ #define CONFIG_ENV_OFFSET 0x120000 @@ -131,7 +131,7 @@ "nand read 0x22000000 0x200000 0x400000;" \ "bootm 0x22000000 - 0x21000000" -#else /* CONFIG_SYS_USE_MMC */ +#else /* CONFIG_SD_BOOT */ /* bootstrap + u-boot + env + linux in mmc */ @@ -180,13 +180,19 @@ #define CONFIG_SYS_MCKR 0x1301 #define CONFIG_SYS_MCKR_CSS 0x1302 -#ifdef CONFIG_SYS_USE_MMC +#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_SPL_SPI_LOAD +#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 #define CONFIG_SYS_NAND_PAGE_SIZE 0x800 @@ -196,10 +202,4 @@ #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0x0 #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER -#elif CONFIG_SYS_USE_SPIFLASH -#define CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400 - -#endif - #endif |