diff options
author | Wenyou Yang <wenyou.yang@microchip.com> | 2017-09-14 06:07:44 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-09-14 23:02:48 +0300 |
commit | 5541543f686b43210fb92181003ff7175d4ab036 (patch) | |
tree | a9e5f81fe6a382c1caae6eacb4114232c8a8eed6 /board/atmel | |
parent | a35c34025e4ae08441f2e26ddcac86aec63c33af (diff) | |
download | u-boot-5541543f686b43210fb92181003ff7175d4ab036.tar.xz |
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 'board/atmel')
-rw-r--r-- | board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 4 | ||||
-rw-r--r-- | board/atmel/at91sam9n12ek/at91sam9n12ek.c | 6 | ||||
-rw-r--r-- | board/atmel/at91sam9x5ek/at91sam9x5ek.c | 4 | ||||
-rw-r--r-- | board/atmel/sama5d2_ptc/sama5d2_ptc.c | 4 | ||||
-rw-r--r-- | board/atmel/sama5d3_xplained/sama5d3_xplained.c | 4 | ||||
-rw-r--r-- | board/atmel/sama5d3xek/sama5d3xek.c | 2 | ||||
-rw-r--r-- | board/atmel/sama5d4_xplained/sama5d4_xplained.c | 2 | ||||
-rw-r--r-- | board/atmel/sama5d4ek/sama5d4ek.c | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c index 903732b23b..98430c4246 100644 --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c @@ -84,9 +84,9 @@ void at91_spl_board_init(void) at91_set_pio_pullup(AT91_PIO_PORTD, 7, 1); at91_set_pio_pullup(AT91_PIO_PORTD, 8, 1); -#ifdef CONFIG_SYS_USE_MMC +#ifdef CONFIG_SD_BOOT at91_mci_hw_init(); -#elif CONFIG_SYS_USE_NANDFLASH +#elif CONFIG_NAND_BOOT at91sam9m10g45ek_nand_hw_init(); #endif } diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c index fec93165c1..540adf55b6 100644 --- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c +++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c @@ -224,11 +224,11 @@ int dram_init(void) void at91_spl_board_init(void) { -#ifdef CONFIG_SYS_USE_MMC +#ifdef CONFIG_SD_BOOT at91_mci_hw_init(); -#elif CONFIG_SYS_USE_NANDFLASH +#elif CONFIG_NAND_BOOT at91sam9n12ek_nand_hw_init(); -#elif CONFIG_SYS_USE_SPIFLASH +#elif CONFIG_SPI_BOOT at91_spi0_hw_init(1 << 4); #endif } diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c index 2452e63881..be6dd4a6d3 100644 --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c @@ -235,9 +235,9 @@ int dram_init(void) void at91_spl_board_init(void) { -#ifdef CONFIG_SYS_USE_MMC +#ifdef CONFIG_SD_BOOT at91_mci_hw_init(); -#elif CONFIG_SYS_USE_NANDFLASH +#elif CONFIG_NAND_BOOT at91sam9x5ek_nand_hw_init(); #endif } diff --git a/board/atmel/sama5d2_ptc/sama5d2_ptc.c b/board/atmel/sama5d2_ptc/sama5d2_ptc.c index 9e6544bc07..c441e69ee4 100644 --- a/board/atmel/sama5d2_ptc/sama5d2_ptc.c +++ b/board/atmel/sama5d2_ptc/sama5d2_ptc.c @@ -196,11 +196,11 @@ int board_eth_init(bd_t *bis) #ifdef CONFIG_SPL_BUILD void spl_board_init(void) { -#ifdef CONFIG_SYS_USE_SERIALFLASH +#ifdef CONFIG_SPI_BOOT board_spi0_hw_init(); #endif -#ifdef CONFIG_SYS_USE_NANDFLASH +#ifdef CONFIG_NAND_BOOT board_nand_hw_init(); #endif } diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c index ba7f9f2443..f32e86b0cb 100644 --- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c +++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c @@ -112,11 +112,11 @@ int dram_init(void) #ifdef CONFIG_SPL_BUILD void spl_board_init(void) { -#ifdef CONFIG_SYS_USE_MMC +#ifdef CONFIG_SD_BOOT #ifdef CONFIG_GENERIC_ATMEL_MCI sama5d3_xplained_mci0_hw_init(); #endif -#elif CONFIG_SYS_USE_NANDFLASH +#elif CONFIG_NAND_BOOT sama5d3_xplained_nand_hw_init(); #endif } diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c index 88bcd876c9..6d473fc06d 100644 --- a/board/atmel/sama5d3xek/sama5d3xek.c +++ b/board/atmel/sama5d3xek/sama5d3xek.c @@ -277,7 +277,7 @@ int board_late_init(void) #ifdef CONFIG_SPL_BUILD void spl_board_init(void) { -#if CONFIG_SYS_USE_NANDFLASH +#if CONFIG_NAND_BOOT sama5d3xek_nand_hw_init(); #endif } diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c index 248a31b8c4..9236a28549 100644 --- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c +++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c @@ -233,7 +233,7 @@ int dram_init(void) #ifdef CONFIG_SPL_BUILD void spl_board_init(void) { -#if CONFIG_SYS_USE_NANDFLASH +#if CONFIG_NAND_BOOT sama5d4_xplained_nand_hw_init(); #endif } diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c index ba7974643e..ee07038e2e 100644 --- a/board/atmel/sama5d4ek/sama5d4ek.c +++ b/board/atmel/sama5d4ek/sama5d4ek.c @@ -217,7 +217,7 @@ int dram_init(void) #ifdef CONFIG_SPL_BUILD void spl_board_init(void) { -#if CONFIG_SYS_USE_NANDFLASH +#if CONFIG_NAND_BOOT sama5d4ek_nand_hw_init(); #endif } |