The CONFIG_SYS_EXTRA_OPTIONS option is deprecated, remove the value of this option from the board default config files.
Changes in v2: - Rebase the uboot/master (84a42069f253). Wenyou Yang (5): ARM: at91: Move CONFIG_AT91FAMILY option to Kconfig ARM: at91: Add the SoC options to Kconfig ARM: at91: Remove hardware.h included in configs ARM: at91: spl: Add macro CONFIG_XXXX_BOOT support configs: at91: Remove CONFIG_SYS_EXTRA_OPTIONS assignment arch/arm/mach-at91/Kconfig | 109 ++++++++++++++++++------ arch/arm/mach-at91/atmel_sfr.c | 1 + arch/arm/mach-at91/include/mach/at91rm9200.h | 1 - arch/arm/mach-at91/include/mach/at91sam9260.h | 5 -- arch/arm/mach-at91/include/mach/at91sam9261.h | 5 -- arch/arm/mach-at91/include/mach/at91sam9263.h | 5 -- arch/arm/mach-at91/include/mach/at91sam9g45.h | 5 -- arch/arm/mach-at91/include/mach/at91sam9rl.h | 5 -- arch/arm/mach-at91/include/mach/at91sam9x5.h | 2 - arch/arm/mach-at91/include/mach/sama5d2.h | 5 -- arch/arm/mach-at91/include/mach/sama5d3.h | 5 -- arch/arm/mach-at91/include/mach/sama5d4.h | 5 -- arch/arm/mach-at91/matrix.c | 1 + arch/arm/mach-at91/phy.c | 1 + arch/arm/mach-at91/spl.c | 16 ++-- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 4 +- board/atmel/at91sam9n12ek/at91sam9n12ek.c | 6 +- board/atmel/at91sam9x5ek/at91sam9x5ek.c | 4 +- board/atmel/sama5d2_ptc/sama5d2_ptc.c | 4 +- board/atmel/sama5d3_xplained/sama5d3_xplained.c | 4 +- board/atmel/sama5d3xek/sama5d3xek.c | 2 +- board/atmel/sama5d4_xplained/sama5d4_xplained.c | 2 +- board/atmel/sama5d4ek/sama5d4ek.c | 2 +- configs/at91sam9m10g45ek_mmc_defconfig | 2 +- configs/at91sam9m10g45ek_nandflash_defconfig | 2 +- configs/at91sam9n12ek_mmc_defconfig | 2 +- configs/at91sam9n12ek_nandflash_defconfig | 2 +- configs/at91sam9n12ek_spiflash_defconfig | 2 +- configs/at91sam9x5ek_dataflash_defconfig | 2 +- configs/at91sam9x5ek_mmc_defconfig | 2 +- configs/at91sam9x5ek_nandflash_defconfig | 2 +- configs/at91sam9x5ek_spiflash_defconfig | 2 +- configs/ma5d4evk_defconfig | 2 +- configs/sama5d2_ptc_nandflash_defconfig | 2 +- configs/sama5d2_ptc_spiflash_defconfig | 2 +- configs/sama5d2_xplained_mmc_defconfig | 1 + configs/sama5d2_xplained_spiflash_defconfig | 2 +- configs/sama5d36ek_cmp_mmc_defconfig | 2 +- configs/sama5d36ek_cmp_nandflash_defconfig | 2 +- configs/sama5d36ek_cmp_spiflash_defconfig | 2 +- configs/sama5d3_xplained_mmc_defconfig | 2 +- configs/sama5d3_xplained_nandflash_defconfig | 2 +- configs/sama5d3xek_mmc_defconfig | 2 +- configs/sama5d3xek_nandflash_defconfig | 2 +- configs/sama5d3xek_spiflash_defconfig | 2 +- configs/sama5d4_xplained_mmc_defconfig | 2 +- configs/sama5d4_xplained_nandflash_defconfig | 2 +- configs/sama5d4_xplained_spiflash_defconfig | 2 +- configs/sama5d4ek_mmc_defconfig | 2 +- configs/sama5d4ek_nandflash_defconfig | 2 +- configs/sama5d4ek_spiflash_defconfig | 2 +- configs/vinco_defconfig | 2 +- drivers/pinctrl/pinctrl-at91.c | 1 + include/configs/at91-sama5_common.h | 8 +- include/configs/at91sam9m10g45ek.h | 12 ++- include/configs/at91sam9n12ek.h | 28 +++--- include/configs/at91sam9x5ek.h | 25 +++--- include/configs/ma5d4evk.h | 9 +- include/configs/sama5d2_ptc.h | 18 ++-- include/configs/sama5d2_xplained.h | 8 +- include/configs/sama5d3_xplained.h | 23 ++--- include/configs/sama5d3xek.h | 31 +++---- include/configs/sama5d4_xplained.h | 25 ++---- include/configs/sama5d4ek.h | 26 ++---- include/configs/vinco.h | 13 +-- 65 files changed, 233 insertions(+), 250 deletions(-) -- 2.13.0 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot