Skip to contentSkip to conversation

ARM: atmel: enable spl for sama5d4 related boards

PATCH New Bo Shen 2 participants 27 messages Dec 15, 2014 – Feb 7, 2015

Subsystems (2)
lore
Share & tools
lore

Bo Shen

author
#0 lore raw

v2 cover ARM: atmel: enable spl for sama5d4 related boards

This patch enable SPL support for both sama5d4ek and sama5d4 xplained board which are based on SAMA5D4 SoC.
These two boards both support boot up from NAND flash, SD/MMC card and also serial flash.

This patch series based on the "ARM: atmel: enable usb ethernet gadget"

Changes in v2:
- change CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION to CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
- change CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION to CONFIG_SYS_MMCSD_FS_BOOT_PARTITION

Bo Shen (13):
ARM: atmel: clock: make it possible to configure HMX32
ARM: atmel: sama5: add bus matrix header file
ARM: atmel: sama5: add sfr register header file
ARM: atmel: spl: add weak bus matrix init function
ARM: atmel: spl: add saic to aic redirect function
ARM: atmel: spl: can not disable osc for sama5d4
ARM: atmel: sama5d4: add matrix1 base addr definition
ARM: atmel: sama5d4: add bus matrix init function
ARM: atmel: sama5d4: add interrupt redirec function
ARM: atmel: sama5d4: can access DDR in interleave mode
ARM: atmel: sama5d4: build related file when enable SPL
ARM: atmel: sama5d4ek: enable SPL support
ARM: atmel: sama5d4_xplained: enable spl support

 arch/arm/Kconfig                                |  2 +
 arch/arm/cpu/armv7/at91/clock.c                 |  8 +++
 arch/arm/cpu/armv7/at91/sama5d4_devices.c       | 47 ++++++++++++++
 arch/arm/cpu/at91-common/Makefile               |  1 +
 arch/arm/cpu/at91-common/mpddrc.c               |  2 +-
 arch/arm/cpu/at91-common/spl_atmel.c            | 16 +++++
 arch/arm/include/asm/arch-at91/at91_common.h    |  1 +
 arch/arm/include/asm/arch-at91/sama5_matrix.h   | 37 +++++++++++
 arch/arm/include/asm/arch-at91/sama5_sfr.h      | 38 +++++++++++
 arch/arm/include/asm/arch-at91/sama5d4.h        |  2 +
 board/atmel/sama5d4_xplained/sama5d4_xplained.c | 85 +++++++++++++++++++++++++
 board/atmel/sama5d4ek/sama5d4ek.c               | 85 +++++++++++++++++++++++++
 configs/sama5d4_xplained_mmc_defconfig          |  1 +
 configs/sama5d4_xplained_nandflash_defconfig    |  1 +
 configs/sama5d4_xplained_spiflash_defconfig     |  1 +
 configs/sama5d4ek_mmc_defconfig                 |  1 +
 configs/sama5d4ek_nandflash_defconfig           |  1 +
 configs/sama5d4ek_spiflash_defconfig            |  1 +
 include/configs/sama5d4_xplained.h              | 56 ++++++++++++++++
 include/configs/sama5d4ek.h                     | 56 ++++++++++++++++
 20 files changed, 441 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/include/asm/arch-at91/sama5_matrix.h
 create mode 100644 arch/arm/include/asm/arch-at91/sama5_sfr.h
Signature · 1 line
2.1.0.24.g4109c28
author
#1 lore raw

PATCH v2 1/13 ARM: atmel: clock: make it possible to configure HMX32

---

Changes in v2: None

 arch/arm/cpu/armv7/at91/clock.c | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/cpu/armv7/at91/clock.c +8 -0
index 2cdddb2..0bf453e 100644
@@ -130,10 +130,18 @@ void at91_mck_init(u32 mckr)
 		 AT91_PMC_MCKR_PRES_MASK |
 		 AT91_PMC_MCKR_MDIV_MASK |
 		 AT91_PMC_MCKR_PLLADIV_2);
+#ifdef CPU_HAS_H32MXDIV
+	tmp &= ~AT91_PMC_MCKR_H32MXDIV;
+#endif
+
 	tmp |= mckr & (AT91_PMC_MCKR_CSS_MASK  |
 		       AT91_PMC_MCKR_PRES_MASK |
 		       AT91_PMC_MCKR_MDIV_MASK |
 		       AT91_PMC_MCKR_PLLADIV_2);
+#ifdef CPU_HAS_H32MXDIV
+	tmp |= mckr & AT91_PMC_MCKR_H32MXDIV;
+#endif
+
 	writel(tmp, &pmc->mckr);
 
 	while (!(readl(&pmc->sr) & AT91_PMC_MCKRDY))
Signature · 1 line
2.1.0.24.g4109c28
#2 lore raw

PATCH v2 1/13 ARM: atmel: clock: make it possible to configure HMX32

Dear Bo Shen,

Quoted 7 lines · Bo Shen

---

Changes in v2: None

arch/arm/cpu/armv7/at91/clock.c | 8 ++++++++

1 file changed, 8 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#3 lore raw

PATCH v2 2/13 ARM: atmel: sama5: add bus matrix header file

In reply to Bo Shen

This matrix header file can be shared between sama5d3 and sama5d4 soc.

---

Changes in v2: None

 arch/arm/include/asm/arch-at91/sama5_matrix.h | 37 +++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-at91/sama5_matrix.h
arch/arm/include/asm/arch-at91/sama5_matrix.h new file +37 -0
new file mode 100644
index 0000000..f58dc97
@@ -0,0 +1,37 @@
+/*
+ * Bus Matrix header file for the SAMA5 family
+ *
+ * Copyright (C) 2014 Atmel
+ *		      Bo Shen <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __SAMA5_MATRIX_H
+#define __SAMA5_MATRIX_H
+
+struct atmel_matrix {
+	u32	mcfg[16];	/* 0x00 ~ 0x3c: Master Configuration Register */
+	u32	scfg[16];	/* 0x40 ~ 0x7c: Slave Configuration Register */
+	u32	pras[16][2];	/* 0x80 ~ 0xfc: Priority Register A/B */
+	u32	reserved1[20];	/* 0x100 ~ 0x14c */
+	u32	meier;		/* 0x150: Master Error Interrupt Enable Register */
+	u32	meidr;		/* 0x154: Master Error Interrupt Disable Register */
+	u32	meimr;		/* 0x158: Master Error Interrupt Mask Register */
+	u32	mesr;		/* 0x15c: Master Error Status Register */
+	u32	mear[16];	/* 0x160 ~ 0x19c: Master Error Address Register */
+	u32	reserved2[17];	/* 0x1A0 ~ 0x1E0 */
+	u32	wpmr;		/* 0x1E4: Write Protection Mode Register */
+	u32	wpsr;		/* 0x1E8: Write Protection Status Register */
+	u32	reserved3[5];	/* 0x1EC ~ 0x1FC */
+	u32	ssr[16];	/* 0x200 ~ 0x23c: Security Slave Register */
+	u32	sassr[16];	/* 0x240 ~ 0x27c: Security Areas Split Slave Register */
+	u32	srtsr[16];	/* 0x280 ~ 0x2bc: Security Region Top Slave */
+	u32	spselr[3];	/* 0x2c0 ~ 0x2c8: Security Peripheral Select Register */
+};
+
+/* Bit field in WPMR */
+#define ATMEL_MATRIX_WPMR_WPKEY	0x4D415400
+#define ATMEL_MATRIX_WPMR_WPEN	0x00000001
+
+#endif
Signature · 1 line
2.1.0.24.g4109c28
#4 lore raw

PATCH v2 2/13 ARM: atmel: sama5: add bus matrix header file

Dear Bo Shen,

Quoted 5 lines · Bo Shen

This matrix header file can be shared between sama5d3 and sama5d4 soc.

[whitespace adaptions for 80 char compliance]
Quoted 7 lines

---

Changes in v2: None

arch/arm/include/asm/arch-at91/sama5_matrix.h | 37 +++++++++++++++++++++++++++

1 file changed, 37 insertions(+)

create mode 100644 arch/arm/include/asm/arch-at91/sama5_matrix.h

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#5 lore raw

PATCH v2 3/13 ARM: atmel: sama5: add sfr register header file

In reply to Bo Shen

The SFR (special function registers) can be shared bwteen sama5d3 and sama5d4 soc.

---

Changes in v2: None

 arch/arm/include/asm/arch-at91/sama5_sfr.h | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-at91/sama5_sfr.h
arch/arm/include/asm/arch-at91/sama5_sfr.h new file +38 -0
new file mode 100644
index 0000000..d3d2439
@@ -0,0 +1,38 @@
+/*
+ * Special Function Register (SFR)
+ *
+ * Copyright (C) 2014 Atmel
+ *		      Bo Shen <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __SAMA5_SFR_H
+#define __SAMA5_SFR_H
+
+struct atmel_sfr {
+	u32	reserved1;	/* 0x00 */
+	u32	ddrcfg;		/* 0x04: DDR Configuration Register */
+	u32	reserved2;	/* 0x08 */
+	u32	reserved3;	/* 0x0c */
+	u32	ohciicr;	/* 0x10: OHCI Interrupt Configuration Register */
+	u32	ohciisr;	/* 0x14: OHCI Interrupt Status Register */
+	u32	reserved4[4];	/* 0x18 ~ 0x24 */
+	u32	secure;		/* 0x28: Security Configuration Register */
+	u32	reserved5[5];	/* 0x2c ~ 0x3c */
+	u32	ebicfg;		/* 0x40: EBI Configuration Register */
+	u32	reserved6[2];	/* 0x44 ~ 0x48 */
+	u32	sn0;		/* 0x4c */
+	u32	sn1;		/* 0x50 */
+	u32	aicredir;	/* 0x54 */
+};
+
+/* Bit field in DDRCFG */
+#define ATMEL_SFR_DDRCFG_FDQIEN		0x00010000
+#define ATMEL_SFR_DDRCFG_FDQSIEN	0x00020000
+
+/* Bit field in AICREDIR */
+#define ATMEL_SFR_AICREDIR_KEY		0x5F67B102
+#define ATMEL_SFR_AICREDIR_NSAIC	0x00000001
+
+#endif
Signature · 1 line
2.1.0.24.g4109c28
#6 lore raw

PATCH v2 3/13 ARM: atmel: sama5: add sfr register header file

Dear Bo Shen,

Quoted 6 lines · Bo Shen

The SFR (special function registers) can be shared bwteen sama5d3 and sama5d4 soc.

[whitespace adoptions for 80 char compliance]
Quoted 7 lines

---

Changes in v2: None

arch/arm/include/asm/arch-at91/sama5_sfr.h | 38 ++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

create mode 100644 arch/arm/include/asm/arch-at91/sama5_sfr.h

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#7 lore raw

PATCH v2 4/13 ARM: atmel: spl: add weak bus matrix init function

In reply to Bo Shen

Some SoC need to configure the bus matrix, add an weak function to be replace by real function.

---

Changes in v2: None

 arch/arm/cpu/at91-common/spl_atmel.c | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/cpu/at91-common/spl_atmel.c +7 -0
index 7297530..9cb5770 100644
@@ -58,6 +58,11 @@ static void switch_to_main_crystal_osc(void)
 	writel(tmp, &pmc->mor);
 }
 
+__weak void matrix_init(void)
+{
+	/* This only be used for sama5d4 soc now */
+}
+
 void s_init(void)
 {
 	switch_to_main_crystal_osc();
@@ -70,6 +75,8 @@ void s_init(void)
 
 	at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
 
+	matrix_init();
+
 	timer_init();
 
 	board_early_init_f();
Signature · 1 line
2.1.0.24.g4109c28
#8 lore raw

PATCH v2 4/13 ARM: atmel: spl: add weak bus matrix init function

Dear Bo Shen,

Quoted 10 lines · Bo Shen

Some SoC need to configure the bus matrix, add an weak function to be replace by real function.

---

Changes in v2: None

arch/arm/cpu/at91-common/spl_atmel.c | 7 +++++++

1 file changed, 7 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#9 lore raw

PATCH v2 5/13 ARM: atmel: spl: add saic to aic redirect function

In reply to Bo Shen

Some SoC need to redirect the saic to aic to make the interrupt to work, here add a weak function to be replaced by real function.

---

Changes in v2: None

 arch/arm/cpu/at91-common/spl_atmel.c         | 7 +++++++
 arch/arm/include/asm/arch-at91/at91_common.h | 1 +
 2 files changed, 8 insertions(+)
arch/arm/cpu/at91-common/spl_atmel.c +7 -0
index 9cb5770..fdea466 100644
@@ -63,6 +63,11 @@ __weak void matrix_init(void)
 	/* This only be used for sama5d4 soc now */
 }
 
+__weak void redirect_int_from_saic_to_aic(void)
+{
+	/* This only be used for sama5d4 soc now */
+}
+
 void s_init(void)
 {
 	switch_to_main_crystal_osc();
@@ -77,6 +82,8 @@ void s_init(void)
 
 	matrix_init();
 
+	redirect_int_from_saic_to_aic();
+
 	timer_init();
 
 	board_early_init_f();
arch/arm/include/asm/arch-at91/at91_common.h +1 -0
index 912e55c..efcd74e 100644
@@ -33,5 +33,6 @@ void at91_mck_init(u32 mckr);
 void at91_spl_board_init(void);
 void at91_disable_wdt(void);
 void matrix_init(void);
+void redirect_int_from_saic_to_aic(void);
 
 #endif /* AT91_COMMON_H */
Signature · 1 line
2.1.0.24.g4109c28
#10 lore raw

PATCH v2 5/13 ARM: atmel: spl: add saic to aic redirect function

Dear Bo Shen,

Quoted 11 lines · Bo Shen

Some SoC need to redirect the saic to aic to make the interrupt to work, here add a weak function to be replaced by real function.

---

Changes in v2: None

arch/arm/cpu/at91-common/spl_atmel.c | 7 +++++++
arch/arm/include/asm/arch-at91/at91_common.h | 1 +

2 files changed, 8 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#11 lore raw

PATCH v2 6/13 ARM: atmel: spl: can not disable osc for sama5d4

In reply to Bo Shen

The SAMA5D4 SoC on chip rc oscillator can not be disabled.

---

Changes in v2: None

 arch/arm/cpu/at91-common/spl_atmel.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/cpu/at91-common/spl_atmel.c +2 -0
index fdea466..9cc1111 100644
@@ -51,11 +51,13 @@ static void switch_to_main_crystal_osc(void)
 	while (!(readl(&pmc->mcfr) & AT91_PMC_MAINRDY))
 		;
 
+#ifndef CONFIG_SAMA5D4
 	tmp = readl(&pmc->mor);
 	tmp &= ~AT91_PMC_MOR_MOSCRCEN;
 	tmp &= ~AT91_PMC_MOR_KEY(0xff);
 	tmp |= AT91_PMC_MOR_KEY(0x37);
 	writel(tmp, &pmc->mor);
+#endif
 }
 
 __weak void matrix_init(void)
Signature · 1 line
2.1.0.24.g4109c28
#12 lore raw

PATCH v2 6/13 ARM: atmel: spl: can not disable osc for sama5d4

Dear Bo Shen,

Quoted 9 lines · Bo Shen

The SAMA5D4 SoC on chip rc oscillator can not be disabled.

---

Changes in v2: None

arch/arm/cpu/at91-common/spl_atmel.c | 2 ++

1 file changed, 2 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#13 lore raw

PATCH v2 7/13 ARM: atmel: sama5d4: add matrix1 base addr definition

In reply to Bo Shen

---

Changes in v2: None

 arch/arm/include/asm/arch-at91/sama5d4.h | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/include/asm/arch-at91/sama5d4.h +2 -0
index d851568..f30cb5f 100644
@@ -126,6 +126,8 @@
 #define ATMEL_BASE_ADC		0xfc034000
 #define ATMEL_BASE_TWI3		0xfc038000
 
+#define ATMEL_BASE_MATRIX1	0xfc054000
+
 #define ATMEL_BASE_SMC		0xfc05c000
 #define ATMEL_BASE_PMECC	(ATMEL_BASE_SMC + 0x070)
 #define ATMEL_BASE_PMERRLOC	(ATMEL_BASE_SMC + 0x500)
Signature · 1 line
2.1.0.24.g4109c28
#14 lore raw

PATCH v2 7/13 ARM: atmel: sama5d4: add matrix1 base addr definition

Dear Bo Shen,

Quoted 7 lines · Bo Shen

---

Changes in v2: None

arch/arm/include/asm/arch-at91/sama5d4.h | 2 ++

1 file changed, 2 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#15 lore raw

PATCH v2 8/13 ARM: atmel: sama5d4: add bus matrix init function

In reply to Bo Shen

---

Changes in v2: None

 arch/arm/cpu/armv7/at91/sama5d4_devices.c | 35 +++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
arch/arm/cpu/armv7/at91/sama5d4_devices.c +35 -0
index 7469825..9c63e99 100644
@@ -10,6 +10,7 @@
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/clk.h>
+#include <asm/arch/sama5_matrix.h>
 #include <asm/arch/sama5d4.h>
 
 char *get_cpu_name()
@@ -44,3 +45,37 @@ void at91_udp_hw_init(void)
 	at91_periph_clk_enable(ATMEL_ID_UDPHS);
 }
 #endif
+
+#ifdef CONFIG_SPL_BUILD
+void matrix_init(void)
+{
+	struct atmel_matrix *h64mx = (struct atmel_matrix *)ATMEL_BASE_MATRIX0;
+	struct atmel_matrix *h32mx = (struct atmel_matrix *)ATMEL_BASE_MATRIX1;
+	int i;
+
+	/* Disable the write protect */
+	writel(ATMEL_MATRIX_WPMR_WPKEY & ~ATMEL_MATRIX_WPMR_WPEN, &h64mx->wpmr);
+	writel(ATMEL_MATRIX_WPMR_WPKEY & ~ATMEL_MATRIX_WPMR_WPEN, &h32mx->wpmr);
+
+	/* DDR port 1 ~ poart 7, slave number is: 4 ~ 10 */
+	for (i = 4; i <= 10; i++) {
+		writel(0x000f0f0f, &h64mx->ssr[i]);
+		writel(0x0000ffff, &h64mx->sassr[i]);
+		writel(0x0000000f, &h64mx->srtsr[i]);
+	}
+
+	/* CS3 */
+	writel(0x00c0c0c0, &h32mx->ssr[3]);
+	writel(0xff000000, &h32mx->sassr[3]);
+	writel(0xff000000, &h32mx->srtsr[3]);
+
+	/* NFC SRAM */
+	writel(0x00010101, &h32mx->ssr[4]);
+	writel(0x00000001, &h32mx->sassr[4]);
+	writel(0x00000001, &h32mx->srtsr[4]);
+
+	/* Enable the write protect */
+	writel(ATMEL_MATRIX_WPMR_WPKEY | ATMEL_MATRIX_WPMR_WPEN, &h64mx->wpmr);
+	writel(ATMEL_MATRIX_WPMR_WPKEY | ATMEL_MATRIX_WPMR_WPEN, &h32mx->wpmr);
+}
+#endif
Signature · 1 line
2.1.0.24.g4109c28
#16 lore raw

PATCH v2 8/13 ARM: atmel: sama5d4: add bus matrix init function

Dear Bo Shen,

Quoted 7 lines · Bo Shen

---

Changes in v2: None

arch/arm/cpu/armv7/at91/sama5d4_devices.c | 35 +++++++++++++++++++++++++++++++

1 file changed, 35 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#17 lore raw

PATCH v2 9/13 ARM: atmel: sama5d4: add interrupt redirec function

In reply to Bo Shen

---

Changes in v2: None

 arch/arm/cpu/armv7/at91/sama5d4_devices.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/arm/cpu/armv7/at91/sama5d4_devices.c +12 -0
index 9c63e99..ef39cb7 100644
@@ -11,6 +11,7 @@
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/sama5_matrix.h>
+#include <asm/arch/sama5_sfr.h>
 #include <asm/arch/sama5d4.h>
 
 char *get_cpu_name()
@@ -78,4 +79,15 @@ void matrix_init(void)
 	writel(ATMEL_MATRIX_WPMR_WPKEY | ATMEL_MATRIX_WPMR_WPEN, &h64mx->wpmr);
 	writel(ATMEL_MATRIX_WPMR_WPKEY | ATMEL_MATRIX_WPMR_WPEN, &h32mx->wpmr);
 }
+
+void redirect_int_from_saic_to_aic(void)
+{
+	struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR;
+	u32 key32;
+
+	if (!(readl(&sfr->aicredir) & ATMEL_SFR_AICREDIR_NSAIC)) {
+		key32 = readl(&sfr->sn1) ^ ATMEL_SFR_AICREDIR_KEY;
+		writel((key32 | ATMEL_SFR_AICREDIR_NSAIC), &sfr->aicredir);
+	}
+}
 #endif
Signature · 1 line
2.1.0.24.g4109c28
author
#19 lore raw

PATCH v2 10/13 ARM: atmel: sama5d4: can access DDR in interleave mode

In reply to Bo Shen

The SAMAA5D4 SoC can access DDR in interleave mode.

---

Changes in v2: None

 arch/arm/cpu/at91-common/mpddrc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/at91-common/mpddrc.c +1 -1
index 44798e6..beec13d 100644
@@ -19,7 +19,7 @@ static inline void atmel_mpddr_op(int mode, u32 ram_address)
 
 static int ddr2_decodtype_is_seq(u32 cr)
 {
-#if defined(CONFIG_SAMA5D3)
+#if defined(CONFIG_SAMA5D3) || defined(CONFIG_SAMA5D4)
 	if (cr & ATMEL_MPDDRC_CR_DECOD_INTERLEAVED)
 		return 0;
 #endif
Signature · 1 line
2.1.0.24.g4109c28
#20 lore raw

PATCH v2 10/13 ARM: atmel: sama5d4: can access DDR in interleave mode

Dear Bo Shen,

Quoted 9 lines · Bo Shen

The SAMAA5D4 SoC can access DDR in interleave mode.

---

Changes in v2: None

arch/arm/cpu/at91-common/mpddrc.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#21 lore raw

PATCH v2 11/13 ARM: atmel: sama5d4: build related file when enable SPL

In reply to Bo Shen

---

Changes in v2: None

 arch/arm/cpu/at91-common/Makefile | 1 +
 1 file changed, 1 insertion(+)
arch/arm/cpu/at91-common/Makefile +1 -0
index 89e1577..03614d4 100644
@@ -13,5 +13,6 @@ ifneq ($(CONFIG_SPL_BUILD),)
 obj-$(CONFIG_AT91SAM9G20) += sdram.o spl_at91.o
 obj-$(CONFIG_AT91SAM9M10G45) += mpddrc.o spl_at91.o
 obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o
+obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o
 obj-y += spl.o
 endif
Signature · 1 line
2.1.0.24.g4109c28
#22 lore raw

PATCH v2 11/13 ARM: atmel: sama5d4: build related file when enable SPL

Dear Bo Shen,

Quoted 7 lines · Bo Shen

---

Changes in v2: None

arch/arm/cpu/at91-common/Makefile | 1 +

1 file changed, 1 insertion(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#23 lore raw

PATCH v2 12/13 ARM: atmel: sama5d4ek: enable SPL support

In reply to Bo Shen

The sama5d4ek support boot up from NAND flash, SD/MMC card and also the SPI flash.

---

Changes in v2:
- change CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION to CONFIG_SYS_MMCSD_FS_BOOT_PARTITION

 arch/arm/Kconfig                      |  1 +
 board/atmel/sama5d4ek/sama5d4ek.c     | 85 +++++++++++++++++++++++++++++++++++
 configs/sama5d4ek_mmc_defconfig       |  1 +
 configs/sama5d4ek_nandflash_defconfig |  1 +
 configs/sama5d4ek_spiflash_defconfig  |  1 +
 include/configs/sama5d4ek.h           | 56 +++++++++++++++++++++++
 6 files changed, 145 insertions(+)
arch/arm/Kconfig +1 -0
index 2b0d2c9..9a39e09 100644
@@ -522,6 +522,7 @@ config TARGET_SAMA5D4_XPLAINED
 config TARGET_SAMA5D4EK
 	bool "Support sama5d4ek"
 	select CPU_V7
+	select SUPPORT_SPL
 
 config TARGET_BCM28155_AP
 	bool "Support bcm28155_ap"
board/atmel/sama5d4ek/sama5d4ek.c +85 -0

94 lines not on this page · raw message

configs/sama5d4ek_mmc_defconfig +1 -0
index 16a5ed7..aafb4c2 100644
@@ -1,3 +1,4 @@
+CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SAMA5D4EK=y
configs/sama5d4ek_nandflash_defconfig +1 -0
index 8b7fbc3..d430fa7 100644
@@ -1,3 +1,4 @@
+CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SAMA5D4EK=y
configs/sama5d4ek_spiflash_defconfig +1 -0
index 63e9b6c..796fa4b 100644
@@ -1,3 +1,4 @@
+CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SAMA5D4EK=y
include/configs/sama5d4ek.h +56 -0

75 lines not on this page · raw message

Signature · 1 line
2.1.0.24.g4109c28
#24 lore raw

PATCH v2 12/13 ARM: atmel: sama5d4ek: enable SPL support

Dear Bo Shen,

Quoted 9 lines · Bo Shen

The sama5d4ek support boot up from NAND flash, SD/MMC card and also the SPI flash.

---

Changes in v2:
- change CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION to CONFIG_SYS_MMCSD_FS_BOOT_PARTITION

Quoted 7 lines
arch/arm/Kconfig                      |  1 +
board/atmel/sama5d4ek/sama5d4ek.c     | 85 +++++++++++++++++++++++++++++++++++
configs/sama5d4ek_mmc_defconfig       |  1 +
configs/sama5d4ek_nandflash_defconfig |  1 +
configs/sama5d4ek_spiflash_defconfig  |  1 +
include/configs/sama5d4ek.h           | 56 +++++++++++++++++++++++
6 files changed, 145 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#25 lore raw

PATCH v2 13/13 ARM: atmel: sama5d4_xplained: enable spl support

In reply to Bo Shen

---

Changes in v2:
- change CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION to CONFIG_SYS_MMCSD_FS_BOOT_PARTITION

 arch/arm/Kconfig                                |  1 +
 board/atmel/sama5d4_xplained/sama5d4_xplained.c | 85 +++++++++++++++++++++++++
 configs/sama5d4_xplained_mmc_defconfig          |  1 +
 configs/sama5d4_xplained_nandflash_defconfig    |  1 +
 configs/sama5d4_xplained_spiflash_defconfig     |  1 +
 include/configs/sama5d4_xplained.h              | 56 ++++++++++++++++
 6 files changed, 145 insertions(+)
arch/arm/Kconfig +1 -0
index 9a39e09..a2aaebf 100644
@@ -518,6 +518,7 @@ config TARGET_SAMA5D3XEK
 config TARGET_SAMA5D4_XPLAINED
 	bool "Support sama5d4_xplained"
 	select CPU_V7
+	select SUPPORT_SPL
 
 config TARGET_SAMA5D4EK
 	bool "Support sama5d4ek"
board/atmel/sama5d4_xplained/sama5d4_xplained.c +85 -0

94 lines not on this page · raw message

configs/sama5d4_xplained_mmc_defconfig +1 -0
index 3720f3c..73df28c 100644
@@ -1,3 +1,4 @@
+CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SAMA5D4_XPLAINED=y
configs/sama5d4_xplained_nandflash_defconfig +1 -0
index 5e13da7..046fe06 100644
@@ -1,3 +1,4 @@
+CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SAMA5D4_XPLAINED=y
configs/sama5d4_xplained_spiflash_defconfig +1 -0
index 3a4607c..755dd8b 100644
@@ -1,3 +1,4 @@
+CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SAMA5D4_XPLAINED=y
include/configs/sama5d4_xplained.h +56 -0

75 lines not on this page · raw message

Signature · 1 line
2.1.0.24.g4109c28
#26 lore raw

PATCH v2 13/13 ARM: atmel: sama5d4_xplained: enable spl support

Dear Bo Shen,

Quoted 6 lines · Bo Shen

---

Changes in v2:
- change CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION to CONFIG_SYS_MMCSD_FS_BOOT_PARTITION

Quoted 7 lines
arch/arm/Kconfig                                |  1 +
board/atmel/sama5d4_xplained/sama5d4_xplained.c | 85 +++++++++++++++++++++++++
configs/sama5d4_xplained_mmc_defconfig          |  1 +
configs/sama5d4_xplained_nandflash_defconfig    |  1 +
configs/sama5d4_xplained_spiflash_defconfig     |  1 +
include/configs/sama5d4_xplained.h              | 56 ++++++++++++++++
6 files changed, 145 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann