summaryrefslogtreecommitdiff
path: root/board/atmel
diff options
context:
space:
mode:
Diffstat (limited to 'board/atmel')
-rw-r--r--board/atmel/at91rm9200ek/Kconfig5
-rw-r--r--board/atmel/at91sam9260ek/Kconfig5
-rw-r--r--board/atmel/at91sam9261ek/Kconfig5
-rw-r--r--board/atmel/at91sam9263ek/Kconfig5
-rw-r--r--board/atmel/at91sam9m10g45ek/Kconfig5
-rw-r--r--board/atmel/at91sam9n12ek/Kconfig5
-rw-r--r--board/atmel/at91sam9rlek/Kconfig5
-rw-r--r--board/atmel/at91sam9x5ek/Kconfig5
-rw-r--r--board/atmel/atngw100/Kconfig4
-rw-r--r--board/atmel/atngw100mkii/Kconfig4
-rw-r--r--board/atmel/atstk1000/Kconfig16
-rw-r--r--board/atmel/sama5d3_xplained/Kconfig5
-rw-r--r--board/atmel/sama5d3xek/Kconfig5
-rw-r--r--board/atmel/sama5d3xek/sama5d3xek.c58
14 files changed, 58 insertions, 74 deletions
diff --git a/board/atmel/at91rm9200ek/Kconfig b/board/atmel/at91rm9200ek/Kconfig
index d7ee4f4..61db2e2 100644
--- a/board/atmel/at91rm9200ek/Kconfig
+++ b/board/atmel/at91rm9200ek/Kconfig
@@ -1,23 +1,18 @@
if TARGET_AT91RM9200EK
config SYS_CPU
- string
default "arm920t"
config SYS_BOARD
- string
default "at91rm9200ek"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at91"
config SYS_CONFIG_NAME
- string
default "at91rm9200ek"
endif
diff --git a/board/atmel/at91sam9260ek/Kconfig b/board/atmel/at91sam9260ek/Kconfig
index 14af5bc..24a645b 100644
--- a/board/atmel/at91sam9260ek/Kconfig
+++ b/board/atmel/at91sam9260ek/Kconfig
@@ -1,23 +1,18 @@
if TARGET_AT91SAM9260EK
config SYS_CPU
- string
default "arm926ejs"
config SYS_BOARD
- string
default "at91sam9260ek"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at91"
config SYS_CONFIG_NAME
- string
default "at91sam9260ek"
endif
diff --git a/board/atmel/at91sam9261ek/Kconfig b/board/atmel/at91sam9261ek/Kconfig
index 63dcdd8..301bf1a 100644
--- a/board/atmel/at91sam9261ek/Kconfig
+++ b/board/atmel/at91sam9261ek/Kconfig
@@ -1,23 +1,18 @@
if TARGET_AT91SAM9261EK
config SYS_CPU
- string
default "arm926ejs"
config SYS_BOARD
- string
default "at91sam9261ek"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at91"
config SYS_CONFIG_NAME
- string
default "at91sam9261ek"
endif
diff --git a/board/atmel/at91sam9263ek/Kconfig b/board/atmel/at91sam9263ek/Kconfig
index fa0a58a..f8e2b48 100644
--- a/board/atmel/at91sam9263ek/Kconfig
+++ b/board/atmel/at91sam9263ek/Kconfig
@@ -1,23 +1,18 @@
if TARGET_AT91SAM9263EK
config SYS_CPU
- string
default "arm926ejs"
config SYS_BOARD
- string
default "at91sam9263ek"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at91"
config SYS_CONFIG_NAME
- string
default "at91sam9263ek"
endif
diff --git a/board/atmel/at91sam9m10g45ek/Kconfig b/board/atmel/at91sam9m10g45ek/Kconfig
index 8567f95..d2e191c 100644
--- a/board/atmel/at91sam9m10g45ek/Kconfig
+++ b/board/atmel/at91sam9m10g45ek/Kconfig
@@ -1,23 +1,18 @@
if TARGET_AT91SAM9M10G45EK
config SYS_CPU
- string
default "arm926ejs"
config SYS_BOARD
- string
default "at91sam9m10g45ek"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at91"
config SYS_CONFIG_NAME
- string
default "at91sam9m10g45ek"
endif
diff --git a/board/atmel/at91sam9n12ek/Kconfig b/board/atmel/at91sam9n12ek/Kconfig
index 4fc714b..845cd36 100644
--- a/board/atmel/at91sam9n12ek/Kconfig
+++ b/board/atmel/at91sam9n12ek/Kconfig
@@ -1,23 +1,18 @@
if TARGET_AT91SAM9N12EK
config SYS_CPU
- string
default "arm926ejs"
config SYS_BOARD
- string
default "at91sam9n12ek"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at91"
config SYS_CONFIG_NAME
- string
default "at91sam9n12ek"
endif
diff --git a/board/atmel/at91sam9rlek/Kconfig b/board/atmel/at91sam9rlek/Kconfig
index 178f80d..517f22a 100644
--- a/board/atmel/at91sam9rlek/Kconfig
+++ b/board/atmel/at91sam9rlek/Kconfig
@@ -1,23 +1,18 @@
if TARGET_AT91SAM9RLEK
config SYS_CPU
- string
default "arm926ejs"
config SYS_BOARD
- string
default "at91sam9rlek"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at91"
config SYS_CONFIG_NAME
- string
default "at91sam9rlek"
endif
diff --git a/board/atmel/at91sam9x5ek/Kconfig b/board/atmel/at91sam9x5ek/Kconfig
index 0a0b132..d236b1a 100644
--- a/board/atmel/at91sam9x5ek/Kconfig
+++ b/board/atmel/at91sam9x5ek/Kconfig
@@ -1,23 +1,18 @@
if TARGET_AT91SAM9X5EK
config SYS_CPU
- string
default "arm926ejs"
config SYS_BOARD
- string
default "at91sam9x5ek"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at91"
config SYS_CONFIG_NAME
- string
default "at91sam9x5ek"
endif
diff --git a/board/atmel/atngw100/Kconfig b/board/atmel/atngw100/Kconfig
index a966b31..28037b6 100644
--- a/board/atmel/atngw100/Kconfig
+++ b/board/atmel/atngw100/Kconfig
@@ -1,19 +1,15 @@
if TARGET_ATNGW100
config SYS_BOARD
- string
default "atngw100"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at32ap700x"
config SYS_CONFIG_NAME
- string
default "atngw100"
endif
diff --git a/board/atmel/atngw100mkii/Kconfig b/board/atmel/atngw100mkii/Kconfig
index dcea07e..ca04269 100644
--- a/board/atmel/atngw100mkii/Kconfig
+++ b/board/atmel/atngw100mkii/Kconfig
@@ -1,19 +1,15 @@
if TARGET_ATNGW100MKII
config SYS_BOARD
- string
default "atngw100mkii"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at32ap700x"
config SYS_CONFIG_NAME
- string
default "atngw100mkii"
endif
diff --git a/board/atmel/atstk1000/Kconfig b/board/atmel/atstk1000/Kconfig
index 1a24409..6d41514 100644
--- a/board/atmel/atstk1000/Kconfig
+++ b/board/atmel/atstk1000/Kconfig
@@ -1,19 +1,15 @@
if TARGET_ATSTK1002
config SYS_BOARD
- string
default "atstk1000"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at32ap700x"
config SYS_CONFIG_NAME
- string
default "atstk1002"
endif
@@ -21,19 +17,15 @@ endif
if TARGET_ATSTK1003
config SYS_BOARD
- string
default "atstk1000"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at32ap700x"
config SYS_CONFIG_NAME
- string
default "atstk1003"
endif
@@ -41,19 +33,15 @@ endif
if TARGET_ATSTK1004
config SYS_BOARD
- string
default "atstk1000"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at32ap700x"
config SYS_CONFIG_NAME
- string
default "atstk1004"
endif
@@ -61,19 +49,15 @@ endif
if TARGET_ATSTK1006
config SYS_BOARD
- string
default "atstk1000"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at32ap700x"
config SYS_CONFIG_NAME
- string
default "atstk1006"
endif
diff --git a/board/atmel/sama5d3_xplained/Kconfig b/board/atmel/sama5d3_xplained/Kconfig
index 603b241..0ca1ec0 100644
--- a/board/atmel/sama5d3_xplained/Kconfig
+++ b/board/atmel/sama5d3_xplained/Kconfig
@@ -1,23 +1,18 @@
if TARGET_SAMA5D3_XPLAINED
config SYS_CPU
- string
default "armv7"
config SYS_BOARD
- string
default "sama5d3_xplained"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at91"
config SYS_CONFIG_NAME
- string
default "sama5d3_xplained"
endif
diff --git a/board/atmel/sama5d3xek/Kconfig b/board/atmel/sama5d3xek/Kconfig
index 5b4eb6f..f0dd04a 100644
--- a/board/atmel/sama5d3xek/Kconfig
+++ b/board/atmel/sama5d3xek/Kconfig
@@ -1,23 +1,18 @@
if TARGET_SAMA5D3XEK
config SYS_CPU
- string
default "armv7"
config SYS_BOARD
- string
default "sama5d3xek"
config SYS_VENDOR
- string
default "atmel"
config SYS_SOC
- string
default "at91"
config SYS_CONFIG_NAME
- string
default "sama5d3xek"
endif
diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
index c835c12..f53754b 100644
--- a/board/atmel/sama5d3xek/sama5d3xek.c
+++ b/board/atmel/sama5d3xek/sama5d3xek.c
@@ -67,6 +67,61 @@ void sama5d3xek_nand_hw_init(void)
}
#endif
+#ifndef CONFIG_SYS_NO_FLASH
+static void sama5d3xek_nor_hw_init(void)
+{
+ struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC;
+
+ at91_periph_clk_enable(ATMEL_ID_SMC);
+
+ /* Configure SMC CS0 for NOR flash */
+ writel(AT91_SMC_SETUP_NWE(1) | AT91_SMC_SETUP_NCS_WR(0) |
+ AT91_SMC_SETUP_NRD(2) | AT91_SMC_SETUP_NCS_RD(0),
+ &smc->cs[0].setup);
+ writel(AT91_SMC_PULSE_NWE(10) | AT91_SMC_PULSE_NCS_WR(11) |
+ AT91_SMC_PULSE_NRD(10) | AT91_SMC_PULSE_NCS_RD(11),
+ &smc->cs[0].pulse);
+ writel(AT91_SMC_CYCLE_NWE(11) | AT91_SMC_CYCLE_NRD(14),
+ &smc->cs[0].cycle);
+ writel(AT91_SMC_TIMINGS_TCLR(0) | AT91_SMC_TIMINGS_TADL(0) |
+ AT91_SMC_TIMINGS_TAR(0) | AT91_SMC_TIMINGS_TRR(0) |
+ AT91_SMC_TIMINGS_TWB(0) | AT91_SMC_TIMINGS_RBNSEL(0)|
+ AT91_SMC_TIMINGS_NFSEL(0), &smc->cs[0].timings);
+ writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
+ AT91_SMC_MODE_EXNW_DISABLE |
+ AT91_SMC_MODE_DBW_16 |
+ AT91_SMC_MODE_TDF_CYCLE(1),
+ &smc->cs[0].mode);
+
+ /* Address pin (A1 ~ A23) configuration */
+ at91_set_a_periph(AT91_PIO_PORTE, 1, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 2, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 3, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 4, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 5, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 6, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 7, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 8, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 9, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 10, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 11, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 12, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 13, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 14, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 15, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 16, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 17, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 18, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 19, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 20, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 21, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 22, 0);
+ at91_set_a_periph(AT91_PIO_PORTE, 23, 0);
+ /* CS0 pin configuration */
+ at91_set_a_periph(AT91_PIO_PORTE, 26, 0);
+}
+#endif
+
#ifdef CONFIG_CMD_USB
static void sama5d3xek_usb_hw_init(void)
{
@@ -181,6 +236,9 @@ int board_init(void)
#ifdef CONFIG_NAND_ATMEL
sama5d3xek_nand_hw_init();
#endif
+#ifndef CONFIG_SYS_NO_FLASH
+ sama5d3xek_nor_hw_init();
+#endif
#ifdef CONFIG_CMD_USB
sama5d3xek_usb_hw_init();
#endif