[U-Boot] [PATCH 0/4] ARM: sama5: remove SoCs from CONFIG_SYS_EXTRA_OPTIONS

Wenyou Yang

6 Jan 2017 6 Jan '17

5:56 a.m.

The CONFIG_SYS_EXTRA_OPTIONS is deprecated, remove the SoC options such as SAMA5D2, SAMA5D3 and SAMA5D4 from CONFIG_SYS_EXTRA_OPTIONS.

Wenyou Yang (4): ARM: at91: move CONFIG_AT91FAMILY option to Kconfig ARM: at91: sama5: remove hardware.h included in board config ARM: at91: sama5: add SoC configs to Kconfig defconfig: sama5: remove SoCs from CONFIG_SYS_EXTRA_OPTIONS

arch/arm/mach-at91/Kconfig | 31 ++++++++++++++++++++------- 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 + configs/ma5d4evk_defconfig | 1 - configs/sama5d2_ptc_nandflash_defconfig | 2 +- configs/sama5d2_ptc_spiflash_defconfig | 2 +- configs/sama5d2_xplained_mmc_defconfig | 10 ++++----- configs/sama5d2_xplained_spiflash_defconfig | 8 +++---- 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 | 3 +-- configs/sama5d4ek_nandflash_defconfig | 3 +-- configs/sama5d4ek_spiflash_defconfig | 3 +-- configs/vinco_defconfig | 2 +- drivers/pinctrl/pinctrl-at91.c | 1 + include/configs/at91-sama5_common.h | 2 -- include/configs/ma5d4evk.h | 9 +++++--- include/configs/sama5d2_ptc.h | 11 ++++++---- include/configs/sama5d2_xplained.h | 5 ++++- include/configs/sama5d3_xplained.h | 13 ++++++----- include/configs/sama5d3xek.h | 11 ++++++---- include/configs/sama5d4_xplained.h | 7 ++++-- include/configs/sama5d4ek.h | 7 ++++-- include/configs/vinco.h | 11 ++++++---- 43 files changed, 99 insertions(+), 110 deletions(-)

-- 2.11.0

Show replies by date

Wenyou Yang

6 Jan 6 Jan

5:56 a.m.

New subject: [U-Boot] [PATCH 1/4] ARM: at91: move CONFIG_AT91FAMILY option to Kconfig

Move CONFIG_AT91FAMILY option from include/mach/<soc>.h to Kconfig.

Signed-off-by: Wenyou Yang wenyou.yang@atmel.com ---

arch/arm/mach-at91/Kconfig | 3 +++ 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 ----- 11 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 13e19ba2fe..5cefeb429b 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -1,5 +1,8 @@ if ARCH_AT91

+config AT91FAMILY + def_bool y + choice prompt "Atmel AT91 board select" optional diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h index d177bdcae5..d15fb7a292 100644 --- a/arch/arm/mach-at91/include/mach/at91rm9200.h +++ b/arch/arm/mach-at91/include/mach/at91rm9200.h @@ -6,7 +6,6 @@ #ifndef __AT91RM9200_H__ #define __AT91RM9200_H__

-#define CONFIG_AT91FAMILY /* it's a member of AT91 family */ #define CONFIG_ARCH_CPU_INIT /* we need arch_cpu_init() for hw timers */ #define CONFIG_AT91_GPIO /* and require always gpio features */

diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h index 1a4e84b050..24d5dbd68a 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9260.h +++ b/arch/arm/mach-at91/include/mach/at91sam9260.h @@ -19,11 +19,6 @@ #define AT91SAM9260_H

/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h index 914a3b0460..06403ce225 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9261.h +++ b/arch/arm/mach-at91/include/mach/at91sam9261.h @@ -19,11 +19,6 @@ #define AT91SAM9261_H

/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h index 71675abf82..be9a665db5 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9263.h +++ b/arch/arm/mach-at91/include/mach/at91sam9263.h @@ -15,11 +15,6 @@ #define AT91SAM9263_H

/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h index 5c32e24ed0..96922c4e6b 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9g45.h +++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h @@ -13,11 +13,6 @@ #define AT91SAM9G45_H

/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h index 70bbf4edaa..8f9155c9ea 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9rl.h +++ b/arch/arm/mach-at91/include/mach/at91sam9rl.h @@ -15,11 +15,6 @@ #define AT91SAM9RL_H

/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9x5.h b/arch/arm/mach-at91/include/mach/at91sam9x5.h index e7224e432d..f9710a172f 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9x5.h +++ b/arch/arm/mach-at91/include/mach/at91sam9x5.h @@ -12,8 +12,6 @@ #ifndef __AT91SAM9X5_H__ #define __AT91SAM9X5_H__

-#define CONFIG_AT91FAMILY /* it's a member of AT91 family */ - /* * Peripheral identifiers/interrupts. */ diff --git a/arch/arm/mach-at91/include/mach/sama5d2.h b/arch/arm/mach-at91/include/mach/sama5d2.h index 25c85411e5..2ee3d68db3 100644 --- a/arch/arm/mach-at91/include/mach/sama5d2.h +++ b/arch/arm/mach-at91/include/mach/sama5d2.h @@ -11,11 +11,6 @@ #define __SAMA5D2_H

/* - * definitions to be used in other places - */ -#define CONFIG_AT91FAMILY /* It's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* FIQ Interrupt ID */ diff --git a/arch/arm/mach-at91/include/mach/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h index d558f95141..0d32e3900f 100644 --- a/arch/arm/mach-at91/include/mach/sama5d3.h +++ b/arch/arm/mach-at91/include/mach/sama5d3.h @@ -14,11 +14,6 @@ #define SAMA5D3_H

/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/sama5d4.h b/arch/arm/mach-at91/include/mach/sama5d4.h index 78cc2a7a0a..7e2657faeb 100644 --- a/arch/arm/mach-at91/include/mach/sama5d4.h +++ b/arch/arm/mach-at91/include/mach/sama5d4.h @@ -11,11 +11,6 @@ #define __SAMA5D4_H

/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* It's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* FIQ Interrupt */

-- 2.11.0

Wenyou Yang

5:56 a.m.

New subject: [U-Boot] [PATCH 2/4] ARM: at91: sama5: remove hardware.h included in board config

As said in READRE.kconfig, include/configs/*.h will be removed after all options are switched to Kconfig. As the first step, remove the follow line from include/configs/at91-sama5_common.h.

#include <asm/hardware.h>

Signed-off-by: Wenyou Yang wenyou.yang@atmel.com ---

diff --git a/arch/arm/mach-at91/atmel_sfr.c b/arch/arm/mach-at91/atmel_sfr.c index adf44c6a94..d595ba8836 100644 --- a/arch/arm/mach-at91/atmel_sfr.c +++ b/arch/arm/mach-at91/atmel_sfr.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <asm/hardware.h> #include <asm/io.h> #include <asm/arch/sama5_sfr.h>

diff --git a/arch/arm/mach-at91/matrix.c b/arch/arm/mach-at91/matrix.c index 57d72700d3..08659c87d4 100644 --- a/arch/arm/mach-at91/matrix.c +++ b/arch/arm/mach-at91/matrix.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <asm/hardware.h> #include <asm/io.h> #include <asm/arch/sama5_matrix.h>

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index 904e1bdc68..4879edf528 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <asm/hardware.h> #include <dm/device.h> #include <dm/pinctrl.h> #include <linux/io.h> diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index e7ecc3f2ca..36bf0bba2a 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -10,8 +10,6 @@ #ifndef __AT91_SAMA5_COMMON_H #define __AT91_SAMA5_COMMON_H

-#include <asm/hardware.h> - #define CONFIG_SYS_TEXT_BASE 0x26f00000

/* ARM asynchronous clock */ diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index 91037d6cb5..4b72f9570f 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -22,11 +22,14 @@ #define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE

+/* Timer */ +#define CONFIG_SYS_TIMER_COUNTER 0xfc06863c + /* * Memory configurations */ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS +#define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x10000000

#ifdef CONFIG_SPL_BUILD @@ -55,8 +58,8 @@ * Serial Driver */ #define CONFIG_ATMEL_USART -#define CONFIG_USART_BASE ATMEL_BASE_USART0 -#define CONFIG_USART_ID ATMEL_ID_USART0 +#define CONFIG_USART_BASE 0xf802c000 +#define CONFIG_USART_ID 6

/* * Ethernet diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index 7a049d4580..74badff97d 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -17,10 +17,13 @@

/* serial console */ #define CONFIG_ATMEL_USART -#define CONFIG_USART_BASE ATMEL_BASE_UART0 -#define CONFIG_USART_ID ATMEL_ID_UART0 +#define CONFIG_USART_BASE 0xf801c000 +#define CONFIG_USART_ID 24

-#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS +/* Timer */ +#define CONFIG_SYS_TIMER_COUNTER 0xf804803c + +#define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000

#ifdef CONFIG_SPL_BUILD @@ -53,7 +56,7 @@ #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 +#define CONFIG_SYS_NAND_BASE 0x80000000 /* our ALE is AD21 */ #define CONFIG_SYS_NAND_MASK_ALE (1 << 21) /* our CLE is AD22 */ diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 61e337617c..39d686ffee 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -19,9 +19,12 @@

#define CONFIG_MISC_INIT_R

+/* Timer */ +#define CONFIG_SYS_TIMER_COUNTER 0xf804803c + /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS +#define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000

#ifdef CONFIG_SPL_BUILD diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 39c8883bad..eae60216bd 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -18,16 +18,19 @@ * This needs to be defined for the OHCI code to work but it is defined as * ATMEL_ID_UHPHS in the CPU specific header files. */ -#define ATMEL_ID_UHP ATMEL_ID_UHPHS +#define ATMEL_ID_UHP 32

/* * Specify the clock enable bit in the PMC_SCER register. */ -#define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP +#define ATMEL_PMC_UHP (1 << 6) + +/* Timer */ +#define CONFIG_SYS_TIMER_COUNTER 0xfffffe3c

/* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS +#define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x10000000

#ifdef CONFIG_SPL_BUILD @@ -43,7 +46,7 @@ #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 +#define CONFIG_SYS_NAND_BASE 0x60000000 /* our ALE is AD21 */ #define CONFIG_SYS_NAND_MASK_ALE (1 << 21) /* our CLE is AD22 */ @@ -86,7 +89,7 @@ #define CONFIG_USB_ATMEL_CLK_SEL_UPLL #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_USB_OHCI_CPU_INIT -#define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_BASE_OHCI +#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00600000 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "SAMA5D3 Xplained" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 #define CONFIG_DOS_PARTITION diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 89cdd1bb13..31be9e8a31 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -27,12 +27,12 @@ * This needs to be defined for the OHCI code to work but it is defined as * ATMEL_ID_UHPHS in the CPU specific header files. */ -#define ATMEL_ID_UHP ATMEL_ID_UHPHS +#define ATMEL_ID_UHP 32

/* * Specify the clock enable bit in the PMC_SCER register. */ -#define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP +#define ATMEL_PMC_UHP (1 << 6)

/* LCD */ #define LCD_BPP LCD_COLOR16 @@ -57,9 +57,12 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #endif

+/* Timer */ +#define CONFIG_SYS_TIMER_COUNTER 0xfffffe3c + /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS +#define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000

#ifdef CONFIG_SPL_BUILD @@ -75,7 +78,7 @@ #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 +#define CONFIG_SYS_NAND_BASE 0x60000000 /* our ALE is AD21 */ #define CONFIG_SYS_NAND_MASK_ALE (1 << 21) /* our CLE is AD22 */ diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 962eaf8db0..2e6d7a662d 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -14,9 +14,12 @@

#define CONFIG_BOARD_EARLY_INIT_F

+/* Timer */ +#define CONFIG_SYS_TIMER_COUNTER 0xfc06863c + /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS +#define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000

#ifdef CONFIG_SPL_BUILD @@ -34,7 +37,7 @@ #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 +#define CONFIG_SYS_NAND_BASE 0x80000000 /* our ALE is AD21 */ #define CONFIG_SYS_NAND_MASK_ALE (1 << 21) /* our CLE is AD22 */ diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 5ec785344a..f9a165eee8 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -14,9 +14,12 @@

#define CONFIG_BOARD_EARLY_INIT_F

#ifdef CONFIG_SPL_BUILD @@ -34,7 +37,7 @@ #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 +#define CONFIG_SYS_NAND_BASE 0x80000000 /* our ALE is AD21 */ #define CONFIG_SYS_NAND_MASK_ALE (1 << 21) /* our CLE is AD22 */ diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 0f3fc8f7d5..edb06b3258 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -26,12 +26,15 @@

/* serial console */ #define CONFIG_ATMEL_USART -#define CONFIG_USART_BASE ATMEL_BASE_USART3 -#define CONFIG_USART_ID ATMEL_ID_USART3 +#define CONFIG_USART_BASE 0xfc00c000 +#define CONFIG_USART_ID 30 + +/* Timer */ +#define CONFIG_SYS_TIMER_COUNTER 0xfc06863c

/* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS +#define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x4000000

#define CONFIG_SYS_INIT_SP_ADDR \ @@ -60,7 +63,7 @@ #define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI -#define ATMEL_BASE_MMCI ATMEL_BASE_MCI1 +#define ATMEL_BASE_MMCI 0xfc000000 #define CONFIG_SYS_MMC_CLK_OD 500000

/* For generating MMC partitions */

-- 2.11.0

Wenyou Yang

5:56 a.m.

New subject: [U-Boot] [PATCH 3/4] ARM: at91: sama5: add SoC configs to Kconfig

To remove the SoCs options such as SAMA5D2, SAMA5D3 and SAMA5D4 from CONFIG_SYS_EXTRA_OPTIONS which is deprecated. Add these SoC configs to Kconfig.

Signed-off-by: Wenyou Yang wenyou.yang@atmel.com ---

arch/arm/mach-at91/Kconfig | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 5cefeb429b..631566ec1b 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -3,6 +3,18 @@ if ARCH_AT91 config AT91FAMILY def_bool y

+config SAMA5D2 + bool + select CPU_V7 + +config SAMA5D3 + bool + select CPU_V7 + +config SAMA5D4 + bool + select CPU_V7 + choice prompt "Atmel AT91 board select" optional @@ -84,37 +96,37 @@ config TARGET_AT91SAM9X5EK

config TARGET_SAMA5D2_PTC bool "SAMA5D2 PTC board" - select CPU_V7 + select SAMA5D2 select SUPPORT_SPL

config TARGET_SAMA5D2_XPLAINED bool "SAMA5D2 Xplained board" - select CPU_V7 + select SAMA5D2 select SUPPORT_SPL

config TARGET_SAMA5D3_XPLAINED bool "SAMA5D3 Xplained board" - select CPU_V7 + select SAMA5D3 select SUPPORT_SPL

config TARGET_SAMA5D3XEK bool "SAMA5D3X-EK board" - select CPU_V7 + select SAMA5D3 select SUPPORT_SPL

config TARGET_SAMA5D4_XPLAINED bool "SAMA5D4 Xplained board" - select CPU_V7 + select SAMA5D4 select SUPPORT_SPL

config TARGET_SAMA5D4EK bool "SAMA5D4 Evaluation Kit" - select CPU_V7 + select SAMA5D4 select SUPPORT_SPL

config TARGET_MA5D4EVK bool "DENX MA5D4EVK Evaluation Kit" - select CPU_V7 + select SAMA5D4 select SUPPORT_SPL

config TARGET_MEESC @@ -150,7 +162,7 @@ config TARGET_SMARTWEB

config TARGET_VINCO bool "Support VINCO" - select CPU_V7 + select SAMA5D4 select SUPPORT_SPL

endchoice

-- 2.11.0

Wenyou Yang

5:56 a.m.

New subject: [U-Boot] [PATCH 4/4] defconfig: sama5: remove SoCs from CONFIG_SYS_EXTRA_OPTIONS

The CONFIG_SYS_EXTRA_OPTIONS is deprecated, and the SoC options such as SAMA5D2, SAMA5D3 and SAMA5D4 are defined as config in Kconfig, update the defconfig file, remove these options.

Signed-off-by: Wenyou Yang wenyou.yang@atmel.com ---

configs/ma5d4evk_defconfig | 1 - configs/sama5d2_ptc_nandflash_defconfig | 2 +- configs/sama5d2_ptc_spiflash_defconfig | 2 +- configs/sama5d2_xplained_mmc_defconfig | 10 ++++------ configs/sama5d2_xplained_spiflash_defconfig | 8 +++----- 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 | 3 +-- configs/sama5d4ek_nandflash_defconfig | 3 +-- configs/sama5d4ek_spiflash_defconfig | 3 +-- configs/vinco_defconfig | 2 +- 20 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig index e2a68fb160..cf2e87a247 100644 --- a/configs/ma5d4evk_defconfig +++ b/configs/ma5d4evk_defconfig @@ -8,7 +8,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4" CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d2_ptc_nandflash_defconfig b/configs/sama5d2_ptc_nandflash_defconfig index 04bd12b3ad..4d4c71fbd5 100644 --- a/configs/sama5d2_ptc_nandflash_defconfig +++ b/configs/sama5d2_ptc_nandflash_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y diff --git a/configs/sama5d2_ptc_spiflash_defconfig b/configs/sama5d2_ptc_spiflash_defconfig index 1e8825e535..6e0f27165f 100644 --- a/configs/sama5d2_ptc_spiflash_defconfig +++ b/configs/sama5d2_ptc_spiflash_defconfig @@ -7,7 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_SERIALFLASH" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index 8a786f1a06..15429639e6 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -8,11 +8,9 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_DM_GPIO=y -CONFIG_DM_SERIAL=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y @@ -34,24 +32,24 @@ CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DM=y CONFIG_SPL_DM=y -CONFIG_BLK=y CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_CLK_AT91=y CONFIG_AT91_UTMI=y CONFIG_AT91_H32MX=y CONFIG_AT91_GENERIC_CLK=y +CONFIG_DM_GPIO=y CONFIG_ATMEL_PIO4=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_AT91=y CONFIG_DM_MMC=y -CONFIG_DM_MMC_OPS=y CONFIG_ATMEL_SDHCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91PIO4=y +CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART_ATMEL=y CONFIG_DEBUG_UART_BASE=0xf8020000 @@ -62,8 +60,8 @@ CONFIG_ATMEL_USART=y CONFIG_DM_SPI=y CONFIG_ATMEL_SPI=y CONFIG_USB=y -CONFIG_USB_STORAGE=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig index 51594e71f7..d1367585fa 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -7,11 +7,9 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_DM_GPIO=y -CONFIG_DM_SERIAL=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_SERIALFLASH" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y @@ -33,24 +31,24 @@ CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DM=y CONFIG_SPL_DM=y -CONFIG_BLK=y CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_CLK_AT91=y CONFIG_AT91_UTMI=y CONFIG_AT91_H32MX=y CONFIG_AT91_GENERIC_CLK=y +CONFIG_DM_GPIO=y CONFIG_ATMEL_PIO4=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_AT91=y CONFIG_DM_MMC=y -CONFIG_DM_MMC_OPS=y CONFIG_ATMEL_SDHCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91PIO4=y +CONFIG_DM_SERIAL=y CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART_ATMEL=y CONFIG_DEBUG_UART_BASE=0xf8020000 diff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig index ee72c59afe..47c7897a46 100644 --- a/configs/sama5d36ek_cmp_mmc_defconfig +++ b/configs/sama5d36ek_cmp_mmc_defconfig @@ -10,7 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig index aabbf4a4da..a202e9aa1c 100644 --- a/configs/sama5d36ek_cmp_nandflash_defconfig +++ b/configs/sama5d36ek_cmp_nandflash_defconfig @@ -8,7 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig index e4131d9d2a..5b13161b76 100644 --- a/configs/sama5d36ek_cmp_spiflash_defconfig +++ b/configs/sama5d36ek_cmp_spiflash_defconfig @@ -9,7 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_SERIALFLASH" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig index 49089664de..e74594595c 100644 --- a/configs/sama5d3_xplained_mmc_defconfig +++ b/configs/sama5d3_xplained_mmc_defconfig @@ -10,7 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d3_xplained" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_BOOTDELAY=3 CONFIG_SYS_NO_FLASH=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index 5f427c4bbd..053a9da92f 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -8,7 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d3_xplained" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_SYS_NO_FLASH=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig index a8345520be..7545701f71 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -10,7 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index 2e53ee947f..f7ee7cfc65 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -8,7 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index 6f26b4b5cc..153b52c1c8 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -9,7 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_SERIALFLASH" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig index dfd607070d..9f581cd37b 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -10,7 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_BOOTDELAY=3 CONFIG_SYS_NO_FLASH=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index 3ac745c01e..08a65c1690 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -8,7 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_SYS_NO_FLASH=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig index bd3353b5a0..348610690b 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -9,7 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_SERIALFLASH" CONFIG_BOOTDELAY=3 CONFIG_SYS_NO_FLASH=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index 799fbbc689..59299417e5 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -10,7 +10,7 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4ek" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y @@ -65,4 +65,3 @@ CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y CONFIG_LCD=y -CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index cf2d71483f..4842467f85 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -8,7 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4ek" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y @@ -63,4 +63,3 @@ CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y CONFIG_LCD=y -CONFIG_OF_LIBFDT=y diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index 67e2fab3d8..f589109049 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -9,7 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4ek" CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_SERIALFLASH" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y @@ -64,4 +64,3 @@ CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y CONFIG_LCD=y -CONFIG_OF_LIBFDT=y diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig index 34a02bdfbe..45c888e50a 100644 --- a/configs/vinco_defconfig +++ b/configs/vinco_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_VINCO=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_SERIALFLASH" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y

-- 2.11.0

3045

Age (days ago)

3045

Last active (days ago)

List overview

Download

4 comments

1 participants

tags (0)

participants (1)

Wenyou Yang