diff mbox

[U-Boot,2/6] ARM: at91: sama5: move the common part of configurations to at91-sama5_common.h

Message ID 1416394985-10657-3-git-send-email-josh.wu@atmel.com
State Not Applicable, archived
Delegated to: Andreas Bießmann
Headers show

Commit Message

Josh Wu Nov. 19, 2014, 11:03 a.m. UTC 
Create a new configuration file: at91-sama5_common.h. Which include the
configurations that reused by all SAMA5 chips.

In the command header, we add the CMD_SETEXPR.

NOTE: NOR flash definition should be put before including the common header.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
 include/configs/at91-sama5_common.h | 87 +++++++++++++++++++++++++++++++++++++
 include/configs/sama5d3_xplained.h  | 77 ++------------------------------
 include/configs/sama5d3xek.h        | 83 +++--------------------------------
 include/configs/sama5d4_xplained.h  | 74 ++-----------------------------
 include/configs/sama5d4ek.h         | 75 ++------------------------------
 5 files changed, 103 insertions(+), 293 deletions(-)
 create mode 100644 include/configs/at91-sama5_common.h

Comments

Andreas Bießmann March 29, 2015, 8:52 p.m. UTC | #1 
Hi Josh,

sorry for beeing late. I'd like to apply this one but it does not
cleanly. Could you please rebase on current master?

Andreas

On 19.11.14 12:03, Josh Wu wrote:
> Create a new configuration file: at91-sama5_common.h. Which include the
> configurations that reused by all SAMA5 chips.
> 
> In the command header, we add the CMD_SETEXPR.
> 
> NOTE: NOR flash definition should be put before including the common header.
> 
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
> ---
>  include/configs/at91-sama5_common.h | 87 +++++++++++++++++++++++++++++++++++++
>  include/configs/sama5d3_xplained.h  | 77 ++------------------------------
>  include/configs/sama5d3xek.h        | 83 +++--------------------------------
>  include/configs/sama5d4_xplained.h  | 74 ++-----------------------------
>  include/configs/sama5d4ek.h         | 75 ++------------------------------
>  5 files changed, 103 insertions(+), 293 deletions(-)
>  create mode 100644 include/configs/at91-sama5_common.h
> 
> diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
> new file mode 100644
> index 0000000..4fab41d
> --- /dev/null
> +++ b/include/configs/at91-sama5_common.h
> @@ -0,0 +1,87 @@
> +/*
> + * Common part of configuration settings for the SAMA5 board.
> + *
> + * Copyright (C) 2014 Atmel Corporation
> + *		      Josh Wu <josh.wu@atmel.com>
> + *
> + * SPDX-License-Identifier:	GPL-2.0+
> + */
> +
> +#ifndef __CONFIG_AT91_SAMA5_H
> +#define __CONFIG_AT91_SAMA5_H
> +
> +#include <asm/hardware.h>
> +
> +#define CONFIG_SYS_TEXT_BASE		0x26f00000
> +
> +/* ARM asynchronous clock */
> +#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
> +#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
> +
> +#define CONFIG_ARCH_CPU_INIT
> +
> +#ifndef CONFIG_SPL_BUILD
> +#define CONFIG_SKIP_LOWLEVEL_INIT
> +#endif
> +
> +#define CONFIG_BOARD_EARLY_INIT_F
> +#define CONFIG_DISPLAY_CPUINFO
> +
> +#define CONFIG_CMD_BOOTZ
> +#define CONFIG_OF_LIBFDT		/* Device Tree support */
> +
> +#define CONFIG_SYS_GENERIC_BOARD
> +
> +/* general purpose I/O */
> +#define CONFIG_AT91_GPIO
> +
> +#define CONFIG_BOOTDELAY		3
> +
> +/*
> + * BOOTP options
> + */
> +#define CONFIG_BOOTP_BOOTFILESIZE
> +#define CONFIG_BOOTP_BOOTPATH
> +#define CONFIG_BOOTP_GATEWAY
> +#define CONFIG_BOOTP_HOSTNAME
> +
> +/*
> + * Command line configuration.
> + */
> +#include <config_cmd_default.h>
> +#undef CONFIG_CMD_FPGA
> +#undef CONFIG_CMD_IMI
> +#undef CONFIG_CMD_LOADS
> +#define CONFIG_CMD_PING
> +#define CONFIG_CMD_DHCP
> +#define CONFIG_CMD_SETEXPR
> +
> +#ifdef CONFIG_SYS_USE_MMC
> +#define CONFIG_BOOTARGS							\
> +	"console=ttyS0,115200 earlyprintk "				\
> +	"root=/dev/mmcblk0p2 rw rootwait"
> +#else
> +#define CONFIG_BOOTARGS							\
> +	"console=ttyS0,115200 earlyprintk "				\
> +	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\
> +	"256K(env),256k(evn_redundent),256k(spare),"			\
> +	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
> +	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
> +#endif
> +
> +#define CONFIG_BAUDRATE			115200
> +
> +#define CONFIG_SYS_PROMPT		"U-Boot> "
> +#define CONFIG_SYS_CBSIZE		256
> +#define CONFIG_SYS_MAXARGS		16
> +#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> +					sizeof(CONFIG_SYS_PROMPT) + 16)
> +#define CONFIG_SYS_LONGHELP
> +#define CONFIG_CMDLINE_EDITING
> +#define CONFIG_AUTO_COMPLETE
> +#define CONFIG_SYS_HUSH_PARSER
> +
> +/* Size of malloc() pool */
> +#define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
> +
> +#endif
> \ No newline at end of file
> diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
> index d24d600..75c3be6 100644
> --- a/include/configs/sama5d3_xplained.h
> +++ b/include/configs/sama5d3_xplained.h
> @@ -10,30 +10,10 @@
>  #ifndef __CONFIG_H
>  #define __CONFIG_H
>  
> -#include <asm/hardware.h>
> -
> -#define CONFIG_SYS_TEXT_BASE		0x26f00000
> -
> -/* ARM asynchronous clock */
> -#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
> -#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
> -
> -#define CONFIG_ARCH_CPU_INIT
> -
> -#ifndef CONFIG_SPL_BUILD
> -#define CONFIG_SKIP_LOWLEVEL_INIT
> -#endif
> -
> -#define CONFIG_BOARD_EARLY_INIT_F
> -#define CONFIG_DISPLAY_CPUINFO
> -
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_OF_LIBFDT		/* Device Tree support */
> -
> -#define CONFIG_SYS_GENERIC_BOARD
> +/* No NOR flash, this definition should put before common header */
> +#define CONFIG_SYS_NO_FLASH
>  
> -/* general purpose I/O */
> -#define CONFIG_AT91_GPIO
> +#include "at91-sama5_common.h"
>  
>  /* serial console */
>  #define CONFIG_ATMEL_USART
> @@ -51,29 +31,6 @@
>   */
>  #define ATMEL_PMC_UHP			AT91SAM926x_PMC_UHP
>  
> -#define CONFIG_BOOTDELAY		3
> -
> -/*
> - * BOOTP options
> - */
> -#define CONFIG_BOOTP_BOOTFILESIZE
> -#define CONFIG_BOOTP_BOOTPATH
> -#define CONFIG_BOOTP_GATEWAY
> -#define CONFIG_BOOTP_HOSTNAME
> -
> -/* No NOR flash */
> -#define CONFIG_SYS_NO_FLASH
> -
> -/*
> - * Command line configuration.
> - */
> -#include <config_cmd_default.h>
> -#undef CONFIG_CMD_FPGA
> -#undef CONFIG_CMD_IMI
> -#undef CONFIG_CMD_LOADS
> -#define CONFIG_CMD_PING
> -#define CONFIG_CMD_DHCP
> -
>  /* SDRAM */
>  #define CONFIG_NR_DRAM_BANKS		1
>  #define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_DDRCS
> @@ -180,34 +137,6 @@
>  #define CONFIG_ENV_IS_NOWHERE
>  #endif
>  
> -#ifdef CONFIG_SYS_USE_MMC
> -#define CONFIG_BOOTARGS							\
> -	"console=ttyS0,115200 earlyprintk "				\
> -	"root=/dev/mmcblk0p2 rw rootwait"
> -#else
> -#define CONFIG_BOOTARGS							\
> -	"console=ttyS0,115200 earlyprintk "				\
> -	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\
> -	"256K(env),256k(evn_redundent),256k(spare),"			\
> -	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
> -	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
> -#endif
> -
> -#define CONFIG_BAUDRATE			115200
> -
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
> -#define CONFIG_SYS_CBSIZE		256
> -#define CONFIG_SYS_MAXARGS		16
> -#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> -					sizeof(CONFIG_SYS_PROMPT) + 16)
> -#define CONFIG_SYS_LONGHELP
> -#define CONFIG_CMDLINE_EDITING
> -#define CONFIG_AUTO_COMPLETE
> -#define CONFIG_SYS_HUSH_PARSER
> -
> -/* Size of malloc() pool */
> -#define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
> -
>  /* SPL */
>  #define CONFIG_SPL_FRAMEWORK
>  #define CONFIG_SPL_TEXT_BASE		0x300000
> diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
> index dfbf3cb..ee0fddb 100644
> --- a/include/configs/sama5d3xek.h
> +++ b/include/configs/sama5d3xek.h
> @@ -13,30 +13,11 @@
>  #ifndef __CONFIG_H
>  #define __CONFIG_H
>  
> -#include <asm/hardware.h>
> -
> -#define CONFIG_SYS_TEXT_BASE		0x26f00000
> -
> -/* ARM asynchronous clock */
> -#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
> -#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
> -
> -#define CONFIG_ARCH_CPU_INIT
> -
> -#ifndef CONFIG_SPL_BUILD
> -#define CONFIG_SKIP_LOWLEVEL_INIT
> -#endif
> -
> -#define CONFIG_BOARD_EARLY_INIT_F
> -#define CONFIG_DISPLAY_CPUINFO
> -
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_OF_LIBFDT		/* Device Tree support */
> -
> -#define CONFIG_SYS_GENERIC_BOARD
> -
> -/* general purpose I/O */
> -#define CONFIG_AT91_GPIO
> +/*
> + * If has No NOR flash, please put the definition: CONFIG_SYS_NO_FLASH
> + * before the common header.
> + */
> +#include "at91-sama5_common.h"
>  
>  /* serial console */
>  #define CONFIG_ATMEL_USART
> @@ -69,40 +50,16 @@
>  /* board specific (not enough SRAM) */
>  #define CONFIG_SAMA5D3_LCD_BASE		0x23E00000
>  
> -#define CONFIG_BOOTDELAY		3
> -
> -/*
> - * BOOTP options
> - */
> -#define CONFIG_BOOTP_BOOTFILESIZE
> -#define CONFIG_BOOTP_BOOTPATH
> -#define CONFIG_BOOTP_GATEWAY
> -#define CONFIG_BOOTP_HOSTNAME
> -
>  /* NOR flash */
> -#define CONFIG_CMD_FLASH
> -
> -#ifdef CONFIG_CMD_FLASH
> +#ifndef CONFIG_SYS_NO_FLASH
>  #define CONFIG_FLASH_CFI_DRIVER
>  #define CONFIG_SYS_FLASH_CFI
>  #define CONFIG_SYS_FLASH_PROTECTION
>  #define CONFIG_SYS_FLASH_BASE		0x10000000
>  #define CONFIG_SYS_MAX_FLASH_SECT	131
>  #define CONFIG_SYS_MAX_FLASH_BANKS	1
> -#else
> -#define CONFIG_SYS_NO_FLASH
>  #endif
>  
> -/*
> - * Command line configuration.
> - */
> -#include <config_cmd_default.h>
> -#undef CONFIG_CMD_FPGA
> -#undef CONFIG_CMD_IMI
> -#undef CONFIG_CMD_LOADS
> -#define CONFIG_CMD_PING
> -#define CONFIG_CMD_DHCP
> -
>  /* SDRAM */
>  #define CONFIG_NR_DRAM_BANKS		1
>  #define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_DDRCS
> @@ -226,34 +183,6 @@
>  #define CONFIG_ENV_IS_NOWHERE
>  #endif
>  
> -#ifdef CONFIG_SYS_USE_MMC
> -#define CONFIG_BOOTARGS							\
> -	"console=ttyS0,115200 earlyprintk "				\
> -	"root=/dev/mmcblk0p2 rw rootwait"
> -#else
> -#define CONFIG_BOOTARGS							\
> -	"console=ttyS0,115200 earlyprintk "				\
> -	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\
> -	"256K(env),256k(evn_redundent),256k(spare),"			\
> -	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
> -	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
> -#endif
> -
> -#define CONFIG_BAUDRATE			115200
> -
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
> -#define CONFIG_SYS_CBSIZE		256
> -#define CONFIG_SYS_MAXARGS		16
> -#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> -					sizeof(CONFIG_SYS_PROMPT) + 16)
> -#define CONFIG_SYS_LONGHELP
> -#define CONFIG_CMDLINE_EDITING
> -#define CONFIG_AUTO_COMPLETE
> -#define CONFIG_SYS_HUSH_PARSER
> -
> -/* Size of malloc() pool */
> -#define CONFIG_SYS_MALLOC_LEN		(1024 * 1024)
> -
>  /* SPL */
>  #define CONFIG_SPL_FRAMEWORK
>  #define CONFIG_SPL_TEXT_BASE		0x300000
> diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
> index 104edef..26af695 100644
> --- a/include/configs/sama5d4_xplained.h
> +++ b/include/configs/sama5d4_xplained.h
> @@ -10,57 +10,16 @@
>  #ifndef __CONFIG_H
>  #define __CONFIG_H
>  
> -#include <asm/hardware.h>
> -
> -#define CONFIG_SYS_TEXT_BASE		0x26f00000
> -
> -/* ARM asynchronous clock */
> -#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
> -#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
> -
> -#define CONFIG_ARCH_CPU_INIT
> -
> -#define CONFIG_SKIP_LOWLEVEL_INIT
> -#define CONFIG_BOARD_EARLY_INIT_F
> -#define CONFIG_DISPLAY_CPUINFO
> -
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_OF_LIBFDT		/* Device Tree support */
> -
> -#define CONFIG_SYS_GENERIC_BOARD
> +/* No NOR flash, this definition should put before common header */
> +#define CONFIG_SYS_NO_FLASH
>  
> -/* general purpose I/O */
> -#define CONFIG_AT91_GPIO
> +#include "at91-sama5_common.h"
>  
>  /* serial console */
>  #define CONFIG_ATMEL_USART
>  #define CONFIG_USART_BASE		ATMEL_BASE_USART3
>  #define CONFIG_USART_ID			ATMEL_ID_USART3
>  
> -#define CONFIG_BOOTDELAY		3
> -
> -/*
> - * BOOTP options
> - */
> -#define CONFIG_BOOTP_BOOTFILESIZE
> -#define CONFIG_BOOTP_BOOTPATH
> -#define CONFIG_BOOTP_GATEWAY
> -#define CONFIG_BOOTP_HOSTNAME
> -
> -/* No NOR flash */
> -#define CONFIG_SYS_NO_FLASH
> -
> -/*
> - * Command line configuration.
> - */
> -#include <config_cmd_default.h>
> -#undef CONFIG_CMD_FPGA
> -#undef CONFIG_CMD_IMI
> -#undef CONFIG_CMD_LOADS
> -#define CONFIG_CMD_PING
> -#define CONFIG_CMD_DHCP
> -#define CONFIG_CMD_SETEXPR
> -
>  /* SDRAM */
>  #define CONFIG_NR_DRAM_BANKS		1
>  #define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_DDRCS
> @@ -185,32 +144,5 @@
>  				"bootz 0x22000000 - 0x21000000"
>  #endif
>  
> -#ifdef CONFIG_SYS_USE_MMC
> -#define CONFIG_BOOTARGS							\
> -	"console=ttyS0,115200 earlyprintk "				\
> -	"root=/dev/mmcblk0p2 rw rootwait"
> -#else
> -#define CONFIG_BOOTARGS							\
> -	"console=ttyS0,115200 earlyprintk "				\
> -	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\
> -	"256K(env),256k(evn_redundent),256k(spare),"			\
> -	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
> -	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
> -#endif
> -
> -#define CONFIG_BAUDRATE			115200
> -
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
> -#define CONFIG_SYS_CBSIZE		256
> -#define CONFIG_SYS_MAXARGS		16
> -#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> -					sizeof(CONFIG_SYS_PROMPT) + 16)
> -#define CONFIG_SYS_LONGHELP
> -#define CONFIG_CMDLINE_EDITING
> -#define CONFIG_AUTO_COMPLETE
> -#define CONFIG_SYS_HUSH_PARSER
> -
> -/* Size of malloc() pool */
> -#define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
>  
>  #endif
> diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
> index cbdb3a2..15a92af 100644
> --- a/include/configs/sama5d4ek.h
> +++ b/include/configs/sama5d4ek.h
> @@ -10,57 +10,16 @@
>  #ifndef __CONFIG_H
>  #define __CONFIG_H
>  
> -#include <asm/hardware.h>
> -
> -#define CONFIG_SYS_TEXT_BASE		0x26f00000
> -
> -/* ARM asynchronous clock */
> -#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
> -#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
> -
> -#define CONFIG_ARCH_CPU_INIT
> -
> -#define CONFIG_SKIP_LOWLEVEL_INIT
> -#define CONFIG_BOARD_EARLY_INIT_F
> -#define CONFIG_DISPLAY_CPUINFO
> -
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_OF_LIBFDT		/* Device Tree support */
> -
> -#define CONFIG_SYS_GENERIC_BOARD
> +/* No NOR flash, this definition should put before common header */
> +#define CONFIG_SYS_NO_FLASH
>  
> -/* general purpose I/O */
> -#define CONFIG_AT91_GPIO
> +#include "at91-sama5_common.h"
>  
>  /* serial console */
>  #define CONFIG_ATMEL_USART
>  #define CONFIG_USART_BASE		ATMEL_BASE_USART3
>  #define	CONFIG_USART_ID			ATMEL_ID_USART3
>  
> -#define CONFIG_BOOTDELAY		3
> -
> -/*
> - * BOOTP options
> - */
> -#define CONFIG_BOOTP_BOOTFILESIZE
> -#define CONFIG_BOOTP_BOOTPATH
> -#define CONFIG_BOOTP_GATEWAY
> -#define CONFIG_BOOTP_HOSTNAME
> -
> -/* No NOR flash */
> -#define CONFIG_SYS_NO_FLASH
> -
> -/*
> - * Command line configuration.
> - */
> -#include <config_cmd_default.h>
> -#undef CONFIG_CMD_FPGA
> -#undef CONFIG_CMD_IMI
> -#undef CONFIG_CMD_LOADS
> -#define CONFIG_CMD_PING
> -#define CONFIG_CMD_DHCP
> -#define CONFIG_CMD_SETEXPR
> -
>  /* SDRAM */
>  #define CONFIG_NR_DRAM_BANKS		1
>  #define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_DDRCS
> @@ -181,34 +140,8 @@
>  #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 sama5d4ek.dtb; " \
>  				"fatload mmc 0:1 0x22000000 zImage; " \
>  				"bootz 0x22000000 - 0x21000000"
> -#endif
> -
> -#ifdef CONFIG_SYS_USE_MMC
> -#define CONFIG_BOOTARGS							\
> -	"console=ttyS0,115200 earlyprintk "				\
> -	"root=/dev/mmcblk0p2 rw rootwait"
>  #else
> -#define CONFIG_BOOTARGS							\
> -	"console=ttyS0,115200 earlyprintk "				\
> -	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\
> -	"256K(env),256k(evn_redundent),256k(spare),"			\
> -	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
> -	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
> +#define CONFIG_ENV_IS_NOWHERE
>  #endif
>  
> -#define CONFIG_BAUDRATE			115200
> -
> -#define CONFIG_SYS_PROMPT		"U-Boot> "
> -#define CONFIG_SYS_CBSIZE		256
> -#define CONFIG_SYS_MAXARGS		16
> -#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
> -					sizeof(CONFIG_SYS_PROMPT) + 16)
> -#define CONFIG_SYS_LONGHELP
> -#define CONFIG_CMDLINE_EDITING
> -#define CONFIG_AUTO_COMPLETE
> -#define CONFIG_SYS_HUSH_PARSER
> -
> -/* Size of malloc() pool */
> -#define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
> -
>  #endif
>
Josh Wu March 30, 2015, 6:54 a.m. UTC | #2 
Hi, Andreas

On 3/30/2015 4:52 AM, Andreas Bießmann wrote:
> Hi Josh,
>
> sorry for beeing late. I'd like to apply this one but it does not
> cleanly. Could you please rebase on current master?
Thanks for the remind, I just sent out the v2 of the patch. now it's 
rebased and also add missed CONFIG_CMD_FLASH vs previous version.

>
> Andreas
Best Regards,
Josh Wu
diff mbox

Patch

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
new file mode 100644
index 0000000..4fab41d
--- /dev/null
+++ b/include/configs/at91-sama5_common.h
@@ -0,0 +1,87 @@ 
+/*
+ * Common part of configuration settings for the SAMA5 board.
+ *
+ * Copyright (C) 2014 Atmel Corporation
+ *		      Josh Wu <josh.wu@atmel.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_AT91_SAMA5_H
+#define __CONFIG_AT91_SAMA5_H
+
+#include <asm/hardware.h>
+
+#define CONFIG_SYS_TEXT_BASE		0x26f00000
+
+/* ARM asynchronous clock */
+#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
+#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
+
+#define CONFIG_ARCH_CPU_INIT
+
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#endif
+
+#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_DISPLAY_CPUINFO
+
+#define CONFIG_CMD_BOOTZ
+#define CONFIG_OF_LIBFDT		/* Device Tree support */
+
+#define CONFIG_SYS_GENERIC_BOARD
+
+/* general purpose I/O */
+#define CONFIG_AT91_GPIO
+
+#define CONFIG_BOOTDELAY		3
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_IMI
+#undef CONFIG_CMD_LOADS
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_SETEXPR
+
+#ifdef CONFIG_SYS_USE_MMC
+#define CONFIG_BOOTARGS							\
+	"console=ttyS0,115200 earlyprintk "				\
+	"root=/dev/mmcblk0p2 rw rootwait"
+#else
+#define CONFIG_BOOTARGS							\
+	"console=ttyS0,115200 earlyprintk "				\
+	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\
+	"256K(env),256k(evn_redundent),256k(spare),"			\
+	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
+	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
+#endif
+
+#define CONFIG_BAUDRATE			115200
+
+#define CONFIG_SYS_PROMPT		"U-Boot> "
+#define CONFIG_SYS_CBSIZE		256
+#define CONFIG_SYS_MAXARGS		16
+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
+					sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_SYS_HUSH_PARSER
+
+/* Size of malloc() pool */
+#define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
+
+#endif
\ No newline at end of file
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index d24d600..75c3be6 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -10,30 +10,10 @@ 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/hardware.h>
-
-#define CONFIG_SYS_TEXT_BASE		0x26f00000
-
-/* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
-
-#define CONFIG_ARCH_CPU_INIT
-
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_SKIP_LOWLEVEL_INIT
-#endif
-
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_DISPLAY_CPUINFO
-
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_OF_LIBFDT		/* Device Tree support */
-
-#define CONFIG_SYS_GENERIC_BOARD
+/* No NOR flash, this definition should put before common header */
+#define CONFIG_SYS_NO_FLASH
 
-/* general purpose I/O */
-#define CONFIG_AT91_GPIO
+#include "at91-sama5_common.h"
 
 /* serial console */
 #define CONFIG_ATMEL_USART
@@ -51,29 +31,6 @@ 
  */
 #define ATMEL_PMC_UHP			AT91SAM926x_PMC_UHP
 
-#define CONFIG_BOOTDELAY		3
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-/* No NOR flash */
-#define CONFIG_SYS_NO_FLASH
-
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_LOADS
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-
 /* SDRAM */
 #define CONFIG_NR_DRAM_BANKS		1
 #define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_DDRCS
@@ -180,34 +137,6 @@ 
 #define CONFIG_ENV_IS_NOWHERE
 #endif
 
-#ifdef CONFIG_SYS_USE_MMC
-#define CONFIG_BOOTARGS							\
-	"console=ttyS0,115200 earlyprintk "				\
-	"root=/dev/mmcblk0p2 rw rootwait"
-#else
-#define CONFIG_BOOTARGS							\
-	"console=ttyS0,115200 earlyprintk "				\
-	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\
-	"256K(env),256k(evn_redundent),256k(spare),"			\
-	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
-	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
-#endif
-
-#define CONFIG_BAUDRATE			115200
-
-#define CONFIG_SYS_PROMPT		"U-Boot> "
-#define CONFIG_SYS_CBSIZE		256
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
-					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
-
 /* SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x300000
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index dfbf3cb..ee0fddb 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -13,30 +13,11 @@ 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/hardware.h>
-
-#define CONFIG_SYS_TEXT_BASE		0x26f00000
-
-/* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
-
-#define CONFIG_ARCH_CPU_INIT
-
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_SKIP_LOWLEVEL_INIT
-#endif
-
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_DISPLAY_CPUINFO
-
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_OF_LIBFDT		/* Device Tree support */
-
-#define CONFIG_SYS_GENERIC_BOARD
-
-/* general purpose I/O */
-#define CONFIG_AT91_GPIO
+/*
+ * If has No NOR flash, please put the definition: CONFIG_SYS_NO_FLASH
+ * before the common header.
+ */
+#include "at91-sama5_common.h"
 
 /* serial console */
 #define CONFIG_ATMEL_USART
@@ -69,40 +50,16 @@ 
 /* board specific (not enough SRAM) */
 #define CONFIG_SAMA5D3_LCD_BASE		0x23E00000
 
-#define CONFIG_BOOTDELAY		3
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
 /* NOR flash */
-#define CONFIG_CMD_FLASH
-
-#ifdef CONFIG_CMD_FLASH
+#ifndef CONFIG_SYS_NO_FLASH
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 #define CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_SYS_FLASH_BASE		0x10000000
 #define CONFIG_SYS_MAX_FLASH_SECT	131
 #define CONFIG_SYS_MAX_FLASH_BANKS	1
-#else
-#define CONFIG_SYS_NO_FLASH
 #endif
 
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_LOADS
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-
 /* SDRAM */
 #define CONFIG_NR_DRAM_BANKS		1
 #define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_DDRCS
@@ -226,34 +183,6 @@ 
 #define CONFIG_ENV_IS_NOWHERE
 #endif
 
-#ifdef CONFIG_SYS_USE_MMC
-#define CONFIG_BOOTARGS							\
-	"console=ttyS0,115200 earlyprintk "				\
-	"root=/dev/mmcblk0p2 rw rootwait"
-#else
-#define CONFIG_BOOTARGS							\
-	"console=ttyS0,115200 earlyprintk "				\
-	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\
-	"256K(env),256k(evn_redundent),256k(spare),"			\
-	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
-	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
-#endif
-
-#define CONFIG_BAUDRATE			115200
-
-#define CONFIG_SYS_PROMPT		"U-Boot> "
-#define CONFIG_SYS_CBSIZE		256
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
-					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(1024 * 1024)
-
 /* SPL */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x300000
diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index 104edef..26af695 100644
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -10,57 +10,16 @@ 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/hardware.h>
-
-#define CONFIG_SYS_TEXT_BASE		0x26f00000
-
-/* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
-
-#define CONFIG_ARCH_CPU_INIT
-
-#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_DISPLAY_CPUINFO
-
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_OF_LIBFDT		/* Device Tree support */
-
-#define CONFIG_SYS_GENERIC_BOARD
+/* No NOR flash, this definition should put before common header */
+#define CONFIG_SYS_NO_FLASH
 
-/* general purpose I/O */
-#define CONFIG_AT91_GPIO
+#include "at91-sama5_common.h"
 
 /* serial console */
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE		ATMEL_BASE_USART3
 #define CONFIG_USART_ID			ATMEL_ID_USART3
 
-#define CONFIG_BOOTDELAY		3
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-/* No NOR flash */
-#define CONFIG_SYS_NO_FLASH
-
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_LOADS
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_SETEXPR
-
 /* SDRAM */
 #define CONFIG_NR_DRAM_BANKS		1
 #define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_DDRCS
@@ -185,32 +144,5 @@ 
 				"bootz 0x22000000 - 0x21000000"
 #endif
 
-#ifdef CONFIG_SYS_USE_MMC
-#define CONFIG_BOOTARGS							\
-	"console=ttyS0,115200 earlyprintk "				\
-	"root=/dev/mmcblk0p2 rw rootwait"
-#else
-#define CONFIG_BOOTARGS							\
-	"console=ttyS0,115200 earlyprintk "				\
-	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\
-	"256K(env),256k(evn_redundent),256k(spare),"			\
-	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
-	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
-#endif
-
-#define CONFIG_BAUDRATE			115200
-
-#define CONFIG_SYS_PROMPT		"U-Boot> "
-#define CONFIG_SYS_CBSIZE		256
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
-					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
 
 #endif
diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index cbdb3a2..15a92af 100644
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -10,57 +10,16 @@ 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/hardware.h>
-
-#define CONFIG_SYS_TEXT_BASE		0x26f00000
-
-/* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK      32768
-#define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
-
-#define CONFIG_ARCH_CPU_INIT
-
-#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_DISPLAY_CPUINFO
-
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_OF_LIBFDT		/* Device Tree support */
-
-#define CONFIG_SYS_GENERIC_BOARD
+/* No NOR flash, this definition should put before common header */
+#define CONFIG_SYS_NO_FLASH
 
-/* general purpose I/O */
-#define CONFIG_AT91_GPIO
+#include "at91-sama5_common.h"
 
 /* serial console */
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE		ATMEL_BASE_USART3
 #define	CONFIG_USART_ID			ATMEL_ID_USART3
 
-#define CONFIG_BOOTDELAY		3
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-/* No NOR flash */
-#define CONFIG_SYS_NO_FLASH
-
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_LOADS
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_SETEXPR
-
 /* SDRAM */
 #define CONFIG_NR_DRAM_BANKS		1
 #define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_DDRCS
@@ -181,34 +140,8 @@ 
 #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 sama5d4ek.dtb; " \
 				"fatload mmc 0:1 0x22000000 zImage; " \
 				"bootz 0x22000000 - 0x21000000"
-#endif
-
-#ifdef CONFIG_SYS_USE_MMC
-#define CONFIG_BOOTARGS							\
-	"console=ttyS0,115200 earlyprintk "				\
-	"root=/dev/mmcblk0p2 rw rootwait"
 #else
-#define CONFIG_BOOTARGS							\
-	"console=ttyS0,115200 earlyprintk "				\
-	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\
-	"256K(env),256k(evn_redundent),256k(spare),"			\
-	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
-	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
+#define CONFIG_ENV_IS_NOWHERE
 #endif
 
-#define CONFIG_BAUDRATE			115200
-
-#define CONFIG_SYS_PROMPT		"U-Boot> "
-#define CONFIG_SYS_CBSIZE		256
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
-					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)
-
 #endif