configs: at91: Remove value of CONFIG_SYS_EXTRA_OPTIONS option

PATCH Superseded Wenyou Yang 3 participants 10 messages Aug 4, 2017 – Sep 14, 2017

Subsystems (5)

Arm (32-bit) Arm sub-architectures Arm/Microchip (AT91) SoC support Pin control +1 more subsystems

lore

Share & tools

lore

Wenyou Yang

author

2017-08-04 01:20 UTC #0 lore raw

cover configs: at91: Remove value of CONFIG_SYS_EXTRA_OPTIONS option

The CONFIG_SYS_EXTRA_OPTIONS option is deprecated, remove the value of this option from the board default config files.

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                      | 111 ++++++++++++++++++------
 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          |   4 +-
 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                 |  29 +++----
 include/configs/at91sam9x5ek.h                  |  27 +++---
 include/configs/ma5d4evk.h                      |   9 +-
 include/configs/sama5d2_ptc.h                   |  16 ++--
 include/configs/sama5d2_xplained.h              |   8 +-
 include/configs/sama5d3_xplained.h              |  21 +++--
 include/configs/sama5d3xek.h                    |  29 +++----
 include/configs/sama5d4_xplained.h              |  24 ++---
 include/configs/sama5d4ek.h                     |  24 ++---
 include/configs/vinco.h                         |  13 +--
 65 files changed, 245 insertions(+), 237 deletions(-)

Signature · 1 line

2.13.0

Wenyou Yang

author

2017-08-04 01:20 UTC #1 lore raw

PATCH 1/5 ARM: at91: Move CONFIG_AT91FAMILY option to Kconfig

From: Wenyou Yang <[email protected]>

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

Signed-off-by Wenyou Yang <[email protected]>

---

 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(-)

arch/arm/mach-at91/Kconfig +3 -0

index 9f39e210b1..9863876090 100644
@@ -1,5 +1,8 @@
 if ARCH_AT91
 
+config AT91FAMILY
+	def_bool y
+
 choice
 	prompt "Atmel AT91 board select"
 	optional

arch/arm/mach-at91/include/mach/at91rm9200.h +0 -1

index d177bdcae5..d15fb7a292 100644
@@ -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 */

arch/arm/mach-at91/include/mach/at91sam9260.h +0 -5

index 1a4e84b050..24d5dbd68a 100644
@@ -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) */

arch/arm/mach-at91/include/mach/at91sam9261.h +0 -5

index 914a3b0460..06403ce225 100644
@@ -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) */

arch/arm/mach-at91/include/mach/at91sam9263.h +0 -5

index 71675abf82..be9a665db5 100644
@@ -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) */

arch/arm/mach-at91/include/mach/at91sam9g45.h +0 -5

index c3b3a8fdc8..60a401690d 100644
@@ -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) */

arch/arm/mach-at91/include/mach/at91sam9rl.h +0 -5

index 70bbf4edaa..8f9155c9ea 100644
@@ -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) */

arch/arm/mach-at91/include/mach/at91sam9x5.h +0 -2

index 8f460f016d..e9b25f0372 100644
@@ -12,8 +12,6 @@
 #ifndef __AT91SAM9X5_H__
 #define __AT91SAM9X5_H__
 
-#define CONFIG_AT91FAMILY	/* it's a member of AT91 family */
-
 /*
  * Peripheral identifiers/interrupts.
  */

arch/arm/mach-at91/include/mach/sama5d2.h +0 -5

index 9fe572621c..299d416200 100644
@@ -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 */

arch/arm/mach-at91/include/mach/sama5d3.h +0 -5

index eb9f7e5658..04bd30ad27 100644
@@ -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) */

arch/arm/mach-at91/include/mach/sama5d4.h +0 -5

index 90e7f01464..559146815b 100644
@@ -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 */

Signature · 1 line

2.13.0

Tom Rini

2017-09-13 12:25 UTC #2 lore raw

PATCH 1/5 ARM: at91: Move CONFIG_AT91FAMILY option to Kconfig

Quoted 6 lines · Wenyou Yang

From: Wenyou Yang <[email protected]>
Move the CONFIG_AT91FAMILY option from include/mach/<soc>.h header file to Kconfig.
Signed-off-by Wenyou Yang <[email protected]>

Can you please rebase this series on top of master? Thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170913/01534045/attachment.sig>

Yang

2017-09-14 01:07 UTC #3 lore raw

PATCH 1/5 ARM: at91: Move CONFIG_AT91FAMILY option to Kconfig

Hi Tom

Quoted 9 lines · Tom Rini

Quoted 6 lines · Wenyou Yang
From: Wenyou Yang <[email protected]>
Move the CONFIG_AT91FAMILY option from include/mach/<soc>.h header file to Kconfig.
Signed-off-by Wenyou Yang <[email protected]>
Can you please rebase this series on top of master? Thanks!

I will send new version to rebase.

Thank you for your mail.

Best Regards,
Wenyou Yang

Wenyou Yang

author

2017-08-04 01:20 UTC #4 lore raw

PATCH 2/5 ARM: at91: Add the SoC options to Kconfig

In reply to Wenyou Yang

From: Wenyou Yang <[email protected]>

To prepare to remove the SoCs options such as SAMA5D2, SAMA5D3 and SAMA5D4 from the CONFIG_SYS_EXTRA_OPTIONS option which is deprecated, add the SoC options to Kconfig.

Signed-off-by Wenyou Yang <[email protected]>

---

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

arch/arm/mach-at91/Kconfig +80 ~~-28~~

index 9863876090..347ec736f2 100644
@@ -3,6 +3,58 @@ if ARCH_AT91
 config AT91FAMILY
 	def_bool y
 
+config AT91SAM9260
+	bool
+	select CPU_ARM926EJS
+
+config AT91SAM9G20
+	bool
+	select CPU_ARM926EJS
+
+config AT91SAM9XE
+	bool
+	select CPU_ARM926EJS
+
+config AT91SAM9261
+	bool
+	select CPU_ARM926EJS
+
+config AT91SAM9263
+	bool
+	select CPU_ARM926EJS
+
+config AT91SAM9G45
+	bool
+	select CPU_ARM926EJS
+
+config AT91SAM9M10G45
+	bool
+	select CPU_ARM926EJS
+
+config AT91SAM9N12
+	bool
+	select CPU_ARM926EJS
+
+config AT91SAM9RL
+	bool
+	select CPU_ARM926EJS
+
+config AT91SAM9X5
+	bool
+	select CPU_ARM926EJS
+
+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

@@ -13,24 +65,24 @@ config TARGET_AT91RM9200EK
 
 config TARGET_AT91SAM9260EK
 	bool "Atmel at91sam9260 reference board"
-	select CPU_ARM926EJS
+	select AT91SAM9260
 	select BOARD_EARLY_INIT_F
 
 config TARGET_ETHERNUT5
 	bool "Ethernut5 board"
-	select CPU_ARM926EJS
+	select AT91SAM9XE
 
 config TARGET_SNAPPER9260
 	bool "Support snapper9260"
-	select CPU_ARM926EJS
+	select AT91SAM9260
 	select DM
 	select DM_SERIAL
 	select DM_GPIO
 
 config TARGET_GURNARD
 	bool "Support gurnard"
+	select AT91SAM9G45
 	select BOARD_LATE_INIT
-	select CPU_ARM926EJS
 	select DM
 	select DM_SERIAL
 	select DM_GPIO

@@ -38,110 +90,110 @@ config TARGET_GURNARD
 
 config TARGET_AT91SAM9261EK
 	bool "Atmel at91sam9261 reference board"
-	select CPU_ARM926EJS
+	select AT91SAM9261
 
 config TARGET_PM9261
 	bool "Ronetix pm9261 board"
-	select CPU_ARM926EJS
+	select AT91SAM9261
 
 config TARGET_AT91SAM9263EK
 	bool "Atmel at91sam9263 reference board"
-	select CPU_ARM926EJS
+	select AT91SAM9263
 	select BOARD_EARLY_INIT_F
 
 config TARGET_USB_A9263
 	bool "Caloa USB A9260 board"
-	select CPU_ARM926EJS
+	select AT91SAM9263
 
 config TARGET_PM9263
 	bool "Ronetix pm9263 board"
-	select CPU_ARM926EJS
+	select AT91SAM9263
 
 config TARGET_AT91SAM9M10G45EK
 	bool "Atmel AT91SAM9M10G45-EK board"
-	select CPU_ARM926EJS
+	select AT91SAM9M10G45
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 
 config TARGET_PM9G45
 	bool "Ronetix pm9g45 board"
-	select CPU_ARM926EJS
+	select AT91SAM9G45
 
 config TARGET_PICOSAM9G45
 	bool "Mini-box picosam9g45 board"
-	select CPU_ARM926EJS
+	select AT91SAM9M10G45
 	select SUPPORT_SPL
 
 config TARGET_AT91SAM9N12EK
 	bool "Atmel AT91SAM9N12-EK board"
-	select CPU_ARM926EJS
+	select AT91SAM9N12
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 
 config TARGET_AT91SAM9RLEK
 	bool "Atmel at91sam9rl reference board"
-	select CPU_ARM926EJS
+	select AT91SAM9RL
 	select BOARD_EARLY_INIT_F
 
 config TARGET_AT91SAM9X5EK
 	bool "Atmel AT91SAM9X5-EK board"
-	select CPU_ARM926EJS
+	select AT91SAM9X5
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 
 config TARGET_SAMA5D2_PTC
 	bool "SAMA5D2 PTC board"
-	select CPU_V7
+	select SAMA5D2
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 
 config TARGET_SAMA5D2_XPLAINED
 	bool "SAMA5D2 Xplained board"
-	select CPU_V7
+	select SAMA5D2
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 
 config TARGET_SAMA5D3_XPLAINED
 	bool "SAMA5D3 Xplained board"
-	select CPU_V7
+	select SAMA5D3
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 
 config TARGET_SAMA5D3XEK
 	bool "SAMA5D3X-EK board"
-	select BOARD_LATE_INIT
-	select CPU_V7
+	select SAMA5D3
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
+	select BOARD_LATE_INIT
 
 config TARGET_SAMA5D4_XPLAINED
 	bool "SAMA5D4 Xplained board"
-	select CPU_V7
+	select SAMA5D4
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 
 config TARGET_SAMA5D4EK
 	bool "SAMA5D4 Evaluation Kit"
-	select CPU_V7
+	select SAMA5D4
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 
 config TARGET_MA5D4EVK
 	bool "Aries MA5D4EVK Evaluation Kit"
-	select CPU_V7
+	select SAMA5D4
 	select SUPPORT_SPL
 
 config TARGET_MEESC
 	bool "Support meesc"
-	select CPU_ARM926EJS
+	select AT91SAM9263
 
 config TARGET_CORVUS
 	bool "Support corvus"
-	select CPU_ARM926EJS
+	select AT91SAM9M10G45
 	select SUPPORT_SPL
 	select DM
 	select DM_SERIAL

@@ -150,7 +202,7 @@ config TARGET_CORVUS
 
 config TARGET_TAURUS
 	bool "Support taurus"
-	select CPU_ARM926EJS
+	select AT91SAM9G20
 	select SUPPORT_SPL
 	select DM
 	select DM_SERIAL

@@ -159,7 +211,7 @@ config TARGET_TAURUS
 
 config TARGET_SMARTWEB
 	bool "Support smartweb"
-	select CPU_ARM926EJS
+	select AT91SAM9260
 	select SUPPORT_SPL
 	select DM
 	select DM_SERIAL

@@ -168,7 +220,7 @@ config TARGET_SMARTWEB
 
 config TARGET_VINCO
 	bool "Support VINCO"
-	select CPU_V7
+	select SAMA5D4
 	select SUPPORT_SPL
 
 endchoice

Signature · 1 line

2.13.0

Wenyou Yang

author

2017-08-04 01:20 UTC #5 lore raw

PATCH 3/5 ARM: at91: Remove hardware.h included in configs

In reply to Wenyou Yang

From: Wenyou Yang <[email protected]>

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/*.h.

#include <asm/hardware.h>

Signed-off-by Wenyou Yang <[email protected]>

---

 arch/arm/mach-at91/atmel_sfr.c      |  1 +
 arch/arm/mach-at91/matrix.c         |  1 +
 arch/arm/mach-at91/phy.c            |  1 +
 drivers/pinctrl/pinctrl-at91.c      |  1 +
 include/configs/at91-sama5_common.h |  2 --
 include/configs/at91sam9m10g45ek.h  |  4 +---
 include/configs/at91sam9n12ek.h     |  8 +-------
 include/configs/at91sam9x5ek.h      |  2 --
 include/configs/ma5d4evk.h          |  9 ++++++---
 include/configs/sama5d2_ptc.h       |  8 ++++----
 include/configs/sama5d2_xplained.h  |  2 +-
 include/configs/sama5d3_xplained.h  | 10 +++++-----
 include/configs/sama5d3xek.h        |  8 ++++----
 include/configs/sama5d4_xplained.h  |  4 ++--
 include/configs/sama5d4ek.h         |  4 ++--
 include/configs/vinco.h             | 11 +++++++----
 16 files changed, 37 insertions(+), 39 deletions(-)

arch/arm/mach-at91/atmel_sfr.c +1 -0

index adf44c6a94..d595ba8836 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/sama5_sfr.h>

arch/arm/mach-at91/matrix.c +1 -0

index 57d72700d3..08659c87d4 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/sama5_matrix.h>

arch/arm/mach-at91/phy.c +1 -0

index ddd70f5ff0..adb761e1ac 100644
@@ -13,6 +13,7 @@
  */
 
 #include <common.h>
+#include <asm/hardware.h>
 #include <asm/io.h>
 #include <linux/sizes.h>
 #include <asm/arch/at91_rstc.h>

drivers/pinctrl/pinctrl-at91.c +1 -0

index 38c435e37a..81f30eabe9 100644
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <asm/hardware.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <mach/at91_pio.h>

include/configs/at91-sama5_common.h +0 -2

index b4135235d4..6da9d8eb3e 100644
@@ -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 */

include/configs/at91sam9m10g45ek.h +1 -3

index 8b00370cdd..dbdc70a960 100644
@@ -11,8 +11,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/hardware.h>
-
 #define CONFIG_SYS_TEXT_BASE		0x73f00000
 
 #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */

@@ -58,7 +56,7 @@
 
 /* SDRAM */
 #define CONFIG_NR_DRAM_BANKS		1
-#define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_CS6
+#define CONFIG_SYS_SDRAM_BASE           0x70000000
 #define CONFIG_SYS_SDRAM_SIZE		0x08000000
 
 #define CONFIG_SYS_INIT_SP_ADDR \

include/configs/at91sam9n12ek.h +1 -7

index e4ff019967..ba68138f21 100644
@@ -10,12 +10,6 @@
 #ifndef __AT91SAM9N12_CONFIG_H_
 #define __AT91SAM9N12_CONFIG_H_
 
-/*
- * SoC must be defined first, before hardware.h is included.
- * In this case SoC is defined in boards.cfg.
- */
-#include <asm/hardware.h>
-
 #define CONFIG_SYS_TEXT_BASE		0x26f00000
 
 /* ARM asynchronous clock */

@@ -60,7 +54,7 @@
  * that address while providing maximum stack area below.
  */
 # define CONFIG_SYS_INIT_SP_ADDR \
-	(ATMEL_BASE_SRAM + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
+	(0x00300000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
 
 /* DataFlash */
 #ifdef CONFIG_CMD_SF

include/configs/at91sam9x5ek.h +0 -2

index 7887791c37..5f53bcc4d0 100644
@@ -9,8 +9,6 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
-#include <asm/hardware.h>
-
 #define CONFIG_SYS_TEXT_BASE		0x26f00000
 
 /* ARM asynchronous clock */

include/configs/ma5d4evk.h +6 -3

index 7c28a94d92..542f96a0dc 100644
@@ -15,11 +15,14 @@
 #define CONFIG_SYS_USE_SERIALFLASH	1
 #define CONFIG_BOARD_LATE_INIT
 
+/* 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

@@ -46,8 +49,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

include/configs/sama5d2_ptc.h +4 -4

index bff9f8eb48..4bd7c04e24 100644
@@ -14,10 +14,10 @@
 
 /* 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
+#define CONFIG_SYS_SDRAM_BASE		0x20000000
 #define CONFIG_SYS_SDRAM_SIZE		0x20000000
 
 #ifdef CONFIG_SPL_BUILD

@@ -53,7 +53,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 */

include/configs/sama5d2_xplained.h +1 -1

index fdfc1d1bc0..b4d996d455 100644
@@ -16,7 +16,7 @@
 
 /* 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

include/configs/sama5d3_xplained.h +5 -5

index 76533e3954..017c3862ad 100644
@@ -16,16 +16,16 @@
  * 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)
 
 /* 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

@@ -41,7 +41,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 */

@@ -65,7 +65,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
 #endif

include/configs/sama5d3xek.h +4 -4

index 49cb237236..77b1e7ec2f 100644
@@ -21,12 +21,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)
 
 /* NOR flash */
 #ifdef CONFIG_MTD_NOR_FLASH

@@ -40,7 +40,7 @@
 
 /* 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

@@ -62,7 +62,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 */

include/configs/sama5d4_xplained.h +2 -2

index ddb48c335a..36b2c01969 100644
@@ -16,7 +16,7 @@
 
 /* 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

@@ -38,7 +38,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 */

include/configs/sama5d4ek.h +2 -2

index ab0147738c..d9bca3db63 100644
@@ -14,7 +14,7 @@
 
 /* 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

@@ -36,7 +36,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 */

include/configs/vinco.h +7 -4

index adff1b6d7f..ad0a9fefba 100644
@@ -23,12 +23,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 \

@@ -55,7 +58,7 @@
 #ifdef CONFIG_CMD_MMC
 #define CONFIG_SUPPORT_EMMC_BOOT
 #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 */

Signature · 1 line

2.13.0

Wenyou Yang

author

2017-08-04 01:20 UTC #6 lore raw

PATCH 4/5 ARM: at91: spl: Add macro CONFIG_XXXX_BOOT support

In reply to Wenyou Yang

Use the CONFIG_XXXX_BOOT to indicate the boot media, instead of the CONFIG_SYS_USE_XXXX option, which is declared by CONFIG_SYS_EXTRA_OPTIONS option.

Signed-off-by Wenyou Yang <[email protected]>

---

 arch/arm/mach-at91/spl.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

arch/arm/mach-at91/spl.c +10 -6

index e113336b7b..c2e2d90a89 100644
@@ -37,7 +37,7 @@ u32 spl_boot_device(void)
 	u32 off = (bootrom_stash.r4 >> ATMEL_SAMA5_BOOT_DEV_ID_OFF) &
 		  ATMEL_SAMA5_BOOT_DEV_ID_MASK;
 
-#if defined(CONFIG_SYS_USE_MMC)
+#if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT)
 	if (dev == ATMEL_SAMA5_BOOT_FROM_MCI) {
 #if defined(CONFIG_SPL_OF_CONTROL)
 		return BOOT_DEVICE_MMC1;

@@ -52,7 +52,9 @@ u32 spl_boot_device(void)
 	}
 #endif
 
-#if defined(CONFIG_SYS_USE_SERIALFLASH) || defined(CONFIG_SYS_USE_SPIFLASH)
+#if defined(CONFIG_SYS_USE_SERIALFLASH) || \
+	defined(CONFIG_SYS_USE_SPIFLASH) || \
+	defined(CONFIG_SPI_BOOT)
 	if (dev == ATMEL_SAMA5_BOOT_FROM_SPI)
 		return BOOT_DEVICE_SPI;
 #endif

@@ -71,11 +73,13 @@ u32 spl_boot_device(void)
 #else
 u32 spl_boot_device(void)
 {
-#ifdef CONFIG_SYS_USE_MMC
+#if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT)
 	return BOOT_DEVICE_MMC1;
-#elif CONFIG_SYS_USE_NANDFLASH
+#elif defined(CONFIG_SYS_USE_NANDFLASH) || defined(CONFIG_NAND_BOOT)
 	return BOOT_DEVICE_NAND;
-#elif CONFIG_SYS_USE_SERIALFLASH || CONFIG_SYS_USE_SPIFLASH
+#elif defined(CONFIG_SYS_USE_SERIALFLASH) || \
+	defined(CONFIG_SYS_USE_SPIFLASH) || \
+	defined(CONFIG_SPI_BOOT)
 	return BOOT_DEVICE_SPI;
 #endif
 	return BOOT_DEVICE_NONE;

@@ -85,7 +89,7 @@ u32 spl_boot_device(void)
 u32 spl_boot_mode(const u32 boot_device)
 {
 	switch (boot_device) {
-#ifdef CONFIG_SYS_USE_MMC
+#if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT)
 	case BOOT_DEVICE_MMC1:
 	case BOOT_DEVICE_MMC2:
 		return MMCSD_MODE_FS;

Signature · 1 line

2.13.0

Wenyou Yang

author

2017-08-04 01:20 UTC #7 lore raw

PATCH 5/5 configs: at91: Remove CONFIG_SYS_EXTRA_OPTIONS assignment

In reply to Wenyou Yang

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 <[email protected]>

---

 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          |  4 ++--
 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 +-
 include/configs/at91-sama5_common.h             |  6 +++---
 include/configs/at91sam9m10g45ek.h              |  8 ++++----
 include/configs/at91sam9n12ek.h                 | 21 ++++++++++-----------
 include/configs/at91sam9x5ek.h                  | 25 +++++++++++--------------
 include/configs/sama5d2_ptc.h                   |  8 ++++----
 include/configs/sama5d2_xplained.h              |  6 +++---
 include/configs/sama5d3_xplained.h              | 11 +++++------
 include/configs/sama5d3xek.h                    | 21 ++++++++++-----------
 include/configs/sama5d4_xplained.h              | 20 ++++++++++----------
 include/configs/sama5d4ek.h                     | 20 ++++++++++----------
 include/configs/vinco.h                         |  2 +-
 48 files changed, 115 insertions(+), 121 deletions(-)

board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +2 -2

index 903732b23b..98430c4246 100644
@@ -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
 }

board/atmel/at91sam9n12ek/at91sam9n12ek.c +3 -3

index fec93165c1..540adf55b6 100644
@@ -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
 }

board/atmel/at91sam9x5ek/at91sam9x5ek.c +2 -2

index 3d1763b1e2..d69831ad15 100644
@@ -138,9 +138,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
 }

board/atmel/sama5d2_ptc/sama5d2_ptc.c +2 -2

index 9e6544bc07..c441e69ee4 100644
@@ -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
 }

board/atmel/sama5d3_xplained/sama5d3_xplained.c +2 -2

index ba7f9f2443..f32e86b0cb 100644
@@ -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
 }

board/atmel/sama5d3xek/sama5d3xek.c +1 -1

index 2b7a6d4ecb..6afbf287c1 100644
@@ -188,7 +188,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
 }

board/atmel/sama5d4_xplained/sama5d4_xplained.c +1 -1

index 8fa84670f1..78eddb8beb 100644
@@ -143,7 +143,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
 }

board/atmel/sama5d4ek/sama5d4ek.c +1 -1

index 3e104f7167..48c43f0163 100644
@@ -132,7 +132,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
 }

configs/at91sam9m10g45ek_mmc_defconfig +1 -1

index e4f8e0c516..01aeef7fa9 100644
@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9M10G45EK=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek"
 CONFIG_DEBUG_UART=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
+CONFIG_SD_BOOT=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/at91sam9m10g45ek_nandflash_defconfig +1 -1

index 6f7a533c1d..aa4f16021e 100644
@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9M10G45EK=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek"
 CONFIG_DEBUG_UART=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH"
+CONFIG_NAND_BOOT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/at91sam9n12ek_mmc_defconfig +1 -1

index c2d2639b16..a558a0725e 100644
@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek"
 CONFIG_DEBUG_UART=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC"
+CONFIG_SD_BOOT=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/at91sam9n12ek_nandflash_defconfig +1 -1

index 86cca59d96..918d35e613 100644
@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek"
 CONFIG_DEBUG_UART=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH"
+CONFIG_NAND_BOOT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/at91sam9n12ek_spiflash_defconfig +1 -1

index d960e0c6b8..0c53e2c612 100644
@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9n12ek"
 CONFIG_DEBUG_UART=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH"
+CONFIG_SPI_BOOT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/at91sam9x5ek_dataflash_defconfig +1 -1

index a60aeba7fa..448a1083ba 100644
@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek"
 CONFIG_DEBUG_UART=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/at91sam9x5ek_mmc_defconfig +1 -1

index 69f7efc33e..55c4d8cfb6 100644
@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek"
 CONFIG_DEBUG_UART=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
+CONFIG_SD_BOOT=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/at91sam9x5ek_nandflash_defconfig +1 -1

index 644b31ea82..4520bde6dd 100644
@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek"
 CONFIG_DEBUG_UART=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
+CONFIG_NAND_BOOT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/at91sam9x5ek_spiflash_defconfig +1 -1

index be57e9751b..e33d0a49e7 100644
@@ -4,7 +4,7 @@ CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek"
 CONFIG_DEBUG_UART=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
+CONFIG_SPI_BOOT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/ma5d4evk_defconfig +1 -1

index c18f759ce3..df7f7d2a62 100644
@@ -8,7 +8,7 @@ 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_SYS_EXTRA_OPTIONS=""
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y

configs/sama5d2_ptc_nandflash_defconfig +1 -1

index cb690224e5..968e503fe1 100644
@@ -6,7 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_NANDFLASH"
+CONFIG_NAND_BOOT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

configs/sama5d2_ptc_spiflash_defconfig +1 -1

index c588e6bfb9..363649686f 100644
@@ -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_SPI_BOOT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

configs/sama5d2_xplained_mmc_defconfig +2 -2

index d84a16f1db..0ae10ed7d0 100644
@@ -13,7 +13,7 @@ CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC"
+CONFIG_SD_BOOT=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

@@ -79,6 +79,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
-CONFIG_FAT_WRITE=y
 CONFIG_DM_VIDEO=y
 CONFIG_ATMEL_HLCD=y
+CONFIG_FAT_WRITE=y

configs/sama5d2_xplained_spiflash_defconfig +1 -1

index c7778fc580..9ce63079cd 100644
@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH"
+CONFIG_SPI_BOOT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

configs/sama5d36ek_cmp_mmc_defconfig +1 -1

index 5037533c92..ec10fc8267 100644
@@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
+CONFIG_SD_BOOT=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/sama5d36ek_cmp_nandflash_defconfig +1 -1

index 01619d569a..eabbe7269f 100644
@@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
+CONFIG_NAND_BOOT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/sama5d36ek_cmp_spiflash_defconfig +1 -1

index 99d08b8183..b1d25ae621 100644
@@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek_cmp"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH"
+CONFIG_SPI_BOOT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/sama5d3_xplained_mmc_defconfig +1 -1

index 5fd23da054..a69d4dd7da 100644
@@ -13,7 +13,7 @@ CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d3_xplained"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
+CONFIG_SD_BOOT=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

configs/sama5d3_xplained_nandflash_defconfig +1 -1

index be6ec8dd3c..b6fd809ee6 100644
@@ -11,7 +11,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d3_xplained"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
+CONFIG_NAND_BOOT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

configs/sama5d3xek_mmc_defconfig +1 -1

index 94be286a65..cdb048c49f 100644
@@ -13,7 +13,7 @@ CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
+CONFIG_SD_BOOT=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/sama5d3xek_nandflash_defconfig +1 -1

index ee0ca0cebe..31143650a0 100644
@@ -11,7 +11,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
+CONFIG_NAND_BOOT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/sama5d3xek_spiflash_defconfig +1 -1

index e81f52c86e..1f6ae1031f 100644
@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="sama5d36ek"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH"
+CONFIG_SPI_BOOT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

configs/sama5d4_xplained_mmc_defconfig +1 -1

index a29b269dfb..5aed229122 100644
@@ -13,7 +13,7 @@ CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
+CONFIG_SD_BOOT=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

configs/sama5d4_xplained_nandflash_defconfig +1 -1

index 4b2e8334d0..83e836b131 100644
@@ -11,7 +11,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
+CONFIG_NAND_BOOT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

configs/sama5d4_xplained_spiflash_defconfig +1 -1

index e01c1cc8d0..e75d853b62 100644
@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
+CONFIG_SPI_BOOT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

configs/sama5d4ek_mmc_defconfig +1 -1

index 5bd20d1155..ea2f24d9b5 100644
@@ -13,7 +13,7 @@ CONFIG_SPL_FAT_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4ek"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
+CONFIG_SD_BOOT=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/sama5d4ek_nandflash_defconfig +1 -1

index cb4fd0214d..fcb5db4cc7 100644
@@ -11,7 +11,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4ek"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
+CONFIG_NAND_BOOT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set

configs/sama5d4ek_spiflash_defconfig +1 -1

index ccc09a539a..ecf0dd6281 100644
@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4ek"
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
+CONFIG_SPI_BOOT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

configs/vinco_defconfig +1 -1

index cb2040e50f..f0c7277211 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_VINCO=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
+CONFIG_SPI_BOOT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set

include/configs/at91-sama5_common.h +3 -3

index 6da9d8eb3e..9997a4b378 100644
@@ -42,7 +42,7 @@
  * Command line configuration.
  */
 
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
 
 #ifdef CONFIG_ENV_IS_IN_MMC
 /* Use raw reserved sectors to save environment */

@@ -74,7 +74,7 @@
 	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
 	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
 
-#ifdef CONFIG_SYS_USE_NANDFLASH
+#ifdef CONFIG_NAND_BOOT
 /* u-boot env in nand flash */
 #define CONFIG_ENV_OFFSET		0xc0000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000

@@ -82,7 +82,7 @@
 #define CONFIG_BOOTCOMMAND		"nand read 0x21000000 0x180000 0x80000;"	\
 					"nand read 0x22000000 0x200000 0x600000;"	\
 					"bootz 0x22000000 - 0x21000000"
-#elif CONFIG_SYS_USE_SERIALFLASH
+#elif CONFIG_SPI_BOOT
 /* u-boot env in serial flash, by default is bus 0 and cs 0 */
 #define CONFIG_ENV_OFFSET		0x6000
 #define CONFIG_ENV_SIZE			0x2000

include/configs/at91sam9m10g45ek.h +4 -4

index dbdc70a960..1396187d73 100644
@@ -86,7 +86,7 @@
 #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		0x23e00000
 
-#ifdef CONFIG_SYS_USE_NANDFLASH
+#ifdef CONFIG_NAND_BOOT
 /* bootstrap + u-boot + env in nandflash */
 #define CONFIG_ENV_OFFSET		0x120000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000

@@ -101,7 +101,7 @@
 	"256k(env),256k(env_redundant),256k(spare),"			\
 	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
 	"root=/dev/mtdblock7 rw rootfstype=jffs2"
-#elif CONFIG_SYS_USE_MMC
+#elif CONFIG_SD_BOOT
 /* bootstrap + u-boot + env + linux in mmc */
 #define FAT_ENV_INTERFACE	"mmc"
 /*

@@ -141,7 +141,7 @@
 
 #define CONFIG_SYS_MONITOR_LEN		0x80000
 
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
 
 #define CONFIG_SPL_BSS_START_ADDR	0x70000000
 #define CONFIG_SPL_BSS_MAX_SIZE		0x00080000

@@ -152,7 +152,7 @@
 #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_NAND_BOOT
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_ECC

include/configs/at91sam9n12ek.h +10 ~~-11~~

index ba68138f21..88271a2b26 100644
@@ -116,7 +116,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

@@ -127,7 +127,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

@@ -139,7 +139,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 */

@@ -193,14 +193,19 @@
 #define CONFIG_SYS_MCKR			0x1301
 #define CONFIG_SYS_MCKR_CSS		0x1302
 
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
 #define CONFIG_SPL_LDSCRIPT		arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
 #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

@@ -210,10 +215,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

include/configs/at91sam9x5ek.h +11 ~~-14~~

index 5f53bcc4d0..16eeeb134a 100644
@@ -15,8 +15,6 @@
 #define CONFIG_SYS_AT91_SLOW_CLOCK	32768
 #define CONFIG_SYS_AT91_MAIN_CLOCK	12000000	/* 12 MHz crystal */
 
-#define CONFIG_AT91SAM9X5EK
-
 #define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs */
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG

@@ -99,7 +97,7 @@
 #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		0x26e00000
 
-#ifdef CONFIG_SYS_USE_NANDFLASH
+#ifdef CONFIG_NAND_BOOT
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_OFFSET		0x120000
 #define CONFIG_ENV_OFFSET_REDUND	0x100000

@@ -107,7 +105,7 @@
 #define CONFIG_BOOTCOMMAND	"nand read " \
 				"0x22000000 0x200000 0x300000; " \
 				"bootm 0x22000000"
-#elif defined(CONFIG_SYS_USE_SPIFLASH)
+#elif defined(CONFIG_SPI_BOOT)
 /* bootstrap + u-boot + env + linux in spi flash */
 #define CONFIG_ENV_OFFSET	0x5000
 #define CONFIG_ENV_SIZE		0x3000

@@ -125,7 +123,7 @@
 #define CONFIG_BOOTCOMMAND	"sf probe 0; " \
 				"sf read 0x22000000 0x84000 0x294000; " \
 				"bootm 0x22000000"
-#else /* CONFIG_SYS_USE_MMC */
+#else /* CONFIG_SD_BOOT */
 /* bootstrap + u-boot + env + linux in mmc */
 #define FAT_ENV_INTERFACE	"mmc"
 #define FAT_ENV_FILE		"uboot.env"

@@ -133,7 +131,7 @@
 #define CONFIG_ENV_SIZE		0x4000
 #endif
 
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
 #define CONFIG_BOOTARGS		"mem=128M console=ttyS0,115200 " \
 				"mtdparts=atmel_nand:" \
 				"8M(bootstrap/uboot/kernel)ro,-(rootfs) " \

@@ -177,14 +175,19 @@
 #define CONFIG_SYS_MCKR			0x1301
 #define CONFIG_SYS_MCKR_CSS		0x1302
 
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
 #define CONFIG_SPL_LDSCRIPT		arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
 #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

@@ -194,10 +197,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

include/configs/sama5d2_ptc.h +4 -4

index 4bd7c04e24..fbf34ecbf1 100644
@@ -82,7 +82,7 @@
 #define CONFIG_NET_RETRY_COUNT		20
 #define CONFIG_MACB_SEARCH_PHY
 
-#ifdef CONFIG_SYS_USE_NANDFLASH
+#ifdef CONFIG_NAND_BOOT
 #undef CONFIG_ENV_OFFSET
 #undef CONFIG_ENV_OFFSET_REDUND
 #undef CONFIG_BOOTCOMMAND

@@ -111,13 +111,14 @@
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
 
-#ifdef CONFIG_SYS_USE_SERIALFLASH
+#ifdef CONFIG_SPI_BOOT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x8000
 
-#elif CONFIG_SYS_USE_NANDFLASH
+#elif CONFIG_NAND_BOOT
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_BASE
+#endif
 #define CONFIG_PMECC_CAP		8
 #define CONFIG_PMECC_SECTOR_SIZE	512
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x40000

@@ -128,6 +129,5 @@
 #define CONFIG_SYS_NAND_BLOCK_SIZE	0x40000
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0x0
 #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
-#endif
 
 #endif

include/configs/sama5d2_xplained.h +3 -3

index b4d996d455..4fda0d15c8 100644
@@ -38,7 +38,7 @@
 /* NAND flash */
 #undef CONFIG_CMD_NAND
 
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
 
 /* bootstrap + u-boot + env in sd card */
 #undef FAT_ENV_DEVICE_AND_PART

@@ -65,12 +65,12 @@
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
 
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
 #define CONFIG_SPL_LDSCRIPT		arch/arm/mach-at91/armv7/u-boot-spl.lds
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION	1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME		"u-boot.img"
 
-#elif CONFIG_SYS_USE_SERIALFLASH
+#elif CONFIG_SPI_BOOT
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS	0x10000

include/configs/sama5d3_xplained.h +5 -6

index 017c3862ad..3ced802634 100644
@@ -72,9 +72,9 @@
 
 #define CONFIG_SYS_LOAD_ADDR			0x22000000 /* load address */
 
-#if CONFIG_SYS_USE_NANDFLASH
+#ifdef CONFIG_NAND_BOOT
 /* override the bootcmd, bootargs and other configuration for nandflash env */
-#elif CONFIG_SYS_USE_MMC
+#elif CONFIG_SD_BOOT
 /* override the bootcmd, bootargs and other configuration for sd/mmc env */
 #endif

@@ -89,14 +89,15 @@
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
 
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
 #define CONFIG_SPL_LDSCRIPT		arch/arm/mach-at91/armv7/u-boot-spl.lds
 #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_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

@@ -107,5 +108,3 @@
 #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
 
 #endif
-
-#endif

include/configs/sama5d3xek.h +10 ~~-11~~

index 77b1e7ec2f..efccaea006 100644
@@ -91,11 +91,11 @@
 
 #define CONFIG_SYS_LOAD_ADDR			0x22000000 /* load address */
 
-#ifdef CONFIG_SYS_USE_SERIALFLASH
+#ifdef CONFIG_SPI_BOOT
 /* override the bootcmd, bootargs and other configuration for spi flash env*/
-#elif CONFIG_SYS_USE_NANDFLASH
+#elif CONFIG_NAND_BOOT
 /* override the bootcmd, bootargs and other configuration nandflash env */
-#elif CONFIG_SYS_USE_MMC
+#elif CONFIG_SD_BOOT
 /* override the bootcmd, bootargs and other configuration for sd/mmc env */
 #endif

@@ -110,14 +110,19 @@
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
 
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
 #define CONFIG_SPL_LDSCRIPT		arch/arm/mach-at91/armv7/u-boot-spl.lds
 #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	0x10000
+
+#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

@@ -127,10 +132,4 @@
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0x0
 #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
 
-#elif CONFIG_SYS_USE_SERIALFLASH
-#define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SYS_SPI_U_BOOT_OFFS	0x10000
-
-#endif
-
 #endif

include/configs/sama5d4_xplained.h +10 ~~-10~~

index 36b2c01969..0e7facb2d8 100644
@@ -49,11 +49,11 @@
 #define CONFIG_ATMEL_NAND_HW_PMECC
 #endif
 
-#ifdef CONFIG_SYS_USE_SERIALFLASH
+#ifdef CONFIG_SPI_BOOT
 /* override the bootcmd, bootargs and other configuration for spi flash env */
-#elif CONFIG_SYS_USE_NANDFLASH
+#elif CONFIG_NAND_BOOT
 /* override the bootcmd, bootargs and other configuration for nandflash env */
-#elif CONFIG_SYS_USE_MMC
+#elif CONFIG_SD_BOOT
 /* override the bootcmd, bootargs and other configuration for sd/mmc env */
 #endif

@@ -68,14 +68,19 @@
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
 
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
 #define CONFIG_SPL_LDSCRIPT		arch/arm/mach-at91/armv7/u-boot-spl.lds
 #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	0x10000
+
+#elif CONFIG_NAND_BOOT
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_BASE
+#endif
 #define CONFIG_PMECC_CAP		8
 #define CONFIG_PMECC_SECTOR_SIZE	512
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x40000

@@ -87,9 +92,4 @@
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0x0
 #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
 
-#elif CONFIG_SYS_USE_SERIALFLASH
-#define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SYS_SPI_U_BOOT_OFFS	0x10000
-
-#endif
 #endif

include/configs/sama5d4ek.h +10 ~~-10~~

index d9bca3db63..1172505cef 100644
@@ -47,11 +47,11 @@
 #define CONFIG_ATMEL_NAND_HW_PMECC
 #endif
 
-#ifdef CONFIG_SYS_USE_SERIALFLASH
+#ifdef CONFIG_SPI_BOOT
 /* override the bootcmd, bootargs and other configuration for spi flash env*/
-#elif CONFIG_SYS_USE_NANDFLASH
+#elif CONFIG_NAND_BOOT
 /* override the bootcmd, bootargs and other configuration for nandflash env*/
-#elif CONFIG_SYS_USE_MMC
+#elif CONFIG_SD_BOOT
 /* override the bootcmd, bootargs and other configuration for sd/mmc env */
 #endif

@@ -66,14 +66,19 @@
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
 
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
 #define CONFIG_SPL_LDSCRIPT		arch/arm/mach-at91/armv7/u-boot-spl.lds
 #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	0x10000
+
+#elif CONFIG_NAND_BOOT
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_BASE
+#endif
 #define CONFIG_PMECC_CAP		8
 #define CONFIG_PMECC_SECTOR_SIZE	512
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x40000

@@ -85,9 +90,4 @@
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0x0
 #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
 
-#elif CONFIG_SYS_USE_SERIALFLASH
-#define CONFIG_SPL_SPI_LOAD
-#define CONFIG_SYS_SPI_U_BOOT_OFFS	0x10000
-
-#endif
 #endif

include/configs/vinco.h +1 -1

index ad0a9fefba..6c775fc0fb 100644
@@ -82,7 +82,7 @@
 #define CONFIG_USB_ETHER_SMSC95XX
 #define CONFIG_USB_ETHER_RNDIS
 
-#ifdef CONFIG_SYS_USE_SERIALFLASH
+#ifdef CONFIG_SPI_BOOT
 /* bootstrap + u-boot + env + linux in serial flash */
 #define CONFIG_ENV_SPI_BUS	CONFIG_SF_DEFAULT_BUS
 #define CONFIG_ENV_SPI_CS	CONFIG_SF_DEFAULT_CS

Signature · 1 line

2.13.0

Yang

2017-08-18 00:55 UTC #8 lore raw

cover configs: at91: Remove value of CONFIG_SYS_EXTRA_OPTIONS option

In reply to Wenyou Yang

Hi All,

Do you have any comments on this patch set?

Best Regards,
Wenyou Yang

Quoted 78 lines · Wenyou Yang

The CONFIG_SYS_EXTRA_OPTIONS option is deprecated, remove the value of this option from the board default config files.

  arch/arm/mach-at91/Kconfig                      | 111 ++++++++++++++++++------
  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          |   4 +-
  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                 |  29 +++----
  include/configs/at91sam9x5ek.h                  |  27 +++---
  include/configs/ma5d4evk.h                      |   9 +-
  include/configs/sama5d2_ptc.h                   |  16 ++--
  include/configs/sama5d2_xplained.h              |   8 +-
  include/configs/sama5d3_xplained.h              |  21 +++--
  include/configs/sama5d3xek.h                    |  29 +++----
  include/configs/sama5d4_xplained.h              |  24 ++---
  include/configs/sama5d4ek.h                     |  24 ++---
  include/configs/vinco.h                         |  13 +--
  65 files changed, 245 insertions(+), 237 deletions(-)

Yang

2017-08-23 00:24 UTC #9 lore raw

cover configs: at91: Remove value of CONFIG_SYS_EXTRA_OPTIONS option

In reply to Wenyou Yang

Please comment this patch series.

Quoted 69 lines · Wenyou Yang

The CONFIG_SYS_EXTRA_OPTIONS option is deprecated, remove the value of this option from the board default config files.

  arch/arm/mach-at91/Kconfig                      | 111 ++++++++++++++++++------
  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          |   4 +-
  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                 |  29 +++----
  include/configs/at91sam9x5ek.h                  |  27 +++---
  include/configs/ma5d4evk.h                      |   9 +-

Quoted 9 lines

  include/configs/sama5d2_ptc.h                   |  16 ++--
  include/configs/sama5d2_xplained.h              |   8 +-
  include/configs/sama5d3_xplained.h              |  21 +++--
  include/configs/sama5d3xek.h                    |  29 +++----
  include/configs/sama5d4_xplained.h              |  24 ++---
  include/configs/sama5d4ek.h                     |  24 ++---
  include/configs/vinco.h                         |  13 +--
  65 files changed, 245 insertions(+), 237 deletions(-)

Best Regards,
Wenyou Yang