* [PATCH 01/24] arm: at91: refactor lowlevel_init selection
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 02/24] arm: at91: drop unused at91sam9x5_lowlevel_init.c Sam Ravnborg
` (22 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
The aim with this conversion is to drop the dependency
where the mach-at91/ code call code in the boards file.
This dependency must be dropepd to enable multi-image builds.
The selection of lowlevel_init functions are pushed to
the individual boards.
Use AT91SAM926X_BOARD_INIT for the boards that share the
at91sam926x_board_init file, and push this to the
individual boards.
bootstrap is likewise pushed out to the individual boards.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/at91sam9261ek/Makefile | 2 +-
arch/arm/boards/at91sam9263ek/Makefile | 2 +-
arch/arm/boards/mmccpu/Makefile | 3 +-
arch/arm/boards/pm9261/Makefile | 2 +-
arch/arm/boards/pm9263/Makefile | 2 +-
arch/arm/boards/tny-a926x/Makefile | 7 +-
arch/arm/boards/usb-a926x/Makefile | 6 +-
arch/arm/mach-at91/Kconfig | 85 ++++++++++++++++++----
arch/arm/mach-at91/Makefile | 26 +++----
.../mach-at91/include/mach/at91_lowlevel_init.h | 2 +-
10 files changed, 97 insertions(+), 40 deletions(-)
diff --git a/arch/arm/boards/at91sam9261ek/Makefile b/arch/arm/boards/at91sam9261ek/Makefile
index 1764da93f..667095ae4 100644
--- a/arch/arm/boards/at91sam9261ek/Makefile
+++ b/arch/arm/boards/at91sam9261ek/Makefile
@@ -1,4 +1,4 @@
obj-y += init.o
-lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
+lwl-$(CONFIG_AT91SAM926X_LWL) += lowlevel_init.o
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-at91sam9261ek
diff --git a/arch/arm/boards/at91sam9263ek/Makefile b/arch/arm/boards/at91sam9263ek/Makefile
index 2072cd416..de4d75690 100644
--- a/arch/arm/boards/at91sam9263ek/Makefile
+++ b/arch/arm/boards/at91sam9263ek/Makefile
@@ -1,4 +1,4 @@
obj-y += init.o
-lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
+lwl-y += lowlevel_init.o
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-at91sam9263ek
diff --git a/arch/arm/boards/mmccpu/Makefile b/arch/arm/boards/mmccpu/Makefile
index 1398c26a0..d8289a341 100644
--- a/arch/arm/boards/mmccpu/Makefile
+++ b/arch/arm/boards/mmccpu/Makefile
@@ -1,3 +1,4 @@
obj-y += init.o
-lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
+# Not used, documented by a lwl-n assignment
+lwl-n += lowlevel_init.o
diff --git a/arch/arm/boards/pm9261/Makefile b/arch/arm/boards/pm9261/Makefile
index bff467b1d..e9bf1212f 100644
--- a/arch/arm/boards/pm9261/Makefile
+++ b/arch/arm/boards/pm9261/Makefile
@@ -1,4 +1,4 @@
obj-y += init.o
-lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
+lwl-y += lowlevel_init.o
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-pm9261
diff --git a/arch/arm/boards/pm9263/Makefile b/arch/arm/boards/pm9263/Makefile
index 1398c26a0..68bfbfa92 100644
--- a/arch/arm/boards/pm9263/Makefile
+++ b/arch/arm/boards/pm9263/Makefile
@@ -1,3 +1,3 @@
obj-y += init.o
-lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
+lwl-y += lowlevel_init.o
diff --git a/arch/arm/boards/tny-a926x/Makefile b/arch/arm/boards/tny-a926x/Makefile
index dba2f8cfc..24bbf2356 100644
--- a/arch/arm/boards/tny-a926x/Makefile
+++ b/arch/arm/boards/tny-a926x/Makefile
@@ -1,9 +1,8 @@
obj-y += init.o
-bootstrap-$(CONFIG_MACH_TNY_A9263) = tny_a9263_bootstrap.o
-obj-$(CONFIG_AT91_BOOTSTRAP) += $(bootstrap-y)
+obj-$(CONFIG_AT91_BOOTSTRAP) += tny_a9263_bootstrap.o
-lowlevel_init-$(CONFIG_MACH_TNY_A9263) = tny_a9263_lowlevel_init.o
+# Not used, documented with a lwl-n assignment
+lwl-n += tny_a9263_lowlevel_init.o
-lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-tny-a926x
diff --git a/arch/arm/boards/usb-a926x/Makefile b/arch/arm/boards/usb-a926x/Makefile
index 4f09581e3..a4eae1844 100644
--- a/arch/arm/boards/usb-a926x/Makefile
+++ b/arch/arm/boards/usb-a926x/Makefile
@@ -1,9 +1,7 @@
obj-y += init.o
-bootstrap-$(CONFIG_MACH_USB_A9263) = usb_a9263_bootstrap.o
-obj-$(CONFIG_AT91_BOOTSTRAP) += $(bootstrap-y)
+obj-$(CONFIG_AT91_BOOTSTRAP) += usb_a9263_bootstrap.o
-lowlevel_init-$(CONFIG_MACH_USB_A9263) = usb_a9263_lowlevel_init.o
+lwl-$(CONFIG_AT91SAM926X_LWL) += usb_a9263_lowlevel_init.o
-lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-usb-a926x
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 3b572ebdf..e94c5b0a8 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -29,7 +29,37 @@ config HAVE_AT91_H32MX
config HAVE_AT91_GENERATED_CLK
bool
-config HAVE_AT91_LOWLEVEL_INIT
+# Select if board support bootstrap
+config HAVE_AT91_BOOTSTRAP
+ bool
+
+# Select if board uses the common at91sam926x_board_init
+config AT91SAM926X_BOARD_INIT
+ bool
+
+# Select if board uses the common at91sam926x_lowlevel_init
+config AT91SAM926X_LWL
+ bool
+
+# Select if board uses barebox reset vector from mach-at91
+# as implemented in the *lowlevel_init.c files
+config AT91SAM9260_LWL
+ bool
+config AT91SAM9261_LWL
+ bool
+config AT91SAM9263_LWL
+ bool
+config AT91SAM9G45_LWL
+ bool
+config AT91SAM9X5_LWL
+ bool
+config AT91SAM9N12_LWL
+ bool
+config AT91RM9200_LWL
+ bool
+config SAMA5D3_LWL
+ bool
+config SAMA5D4_LWL
bool
config AT91SAM9_SMC
@@ -71,9 +101,6 @@ config AT91SAM9G45_RESET
config HAVE_AT91_LOAD_BAREBOX_SRAM
bool
-config AT91SAM9_LOWLEVEL_INIT
- bool
-
comment "Atmel AT91 System-on-Chip"
config SOC_AT91RM9200
@@ -88,7 +115,6 @@ config SOC_AT91SAM9260
select HAVE_AT91_DBGU0
select HAS_MACB
select AT91SAM9_RESET
- select AT91SAM9_LOWLEVEL_INIT
help
Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE
or AT91SAM9G20 SoC.
@@ -98,7 +124,6 @@ config SOC_AT91SAM9261
select SOC_AT91SAM9
select HAVE_AT91_DBGU0
select AT91SAM9_RESET
- select AT91SAM9_LOWLEVEL_INIT
help
Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.
@@ -108,7 +133,6 @@ config SOC_AT91SAM9263
select HAVE_AT91_DBGU1
select HAS_MACB
select AT91SAM9_RESET
- select AT91SAM9_LOWLEVEL_INIT
select HAVE_AT91_LOAD_BAREBOX_SRAM
config SOC_AT91SAM9G45
@@ -239,6 +263,7 @@ choice
config MACH_AT91RM9200EK
bool "Atmel AT91RM9200-EK Evaluation Kit"
select HAVE_AT91_DATAFLASH_CARD
+ select AT91RM9200_LWL
help
Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit.
<http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507>
@@ -256,16 +281,19 @@ choice
config MACH_ANIMEO_IP
bool "Somfy Animeo IP"
+ select AT91SAM9260_LWL
depends on !CONSOLE_NONE
config MACH_AT91SAM9260EK
bool "Atmel AT91SAM9260-EK"
+ select AT91SAM9260_LWL
select HAVE_NAND_ATMEL_BUSWIDTH_16
help
Say y here if you are using Atmel's AT91SAM9260-EK Evaluation board
config MACH_QIL_A9260
bool "CALAO QIL-A9260 board"
+ select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems QIL-A9260 Board.
<http://www.calao-systems.com>
@@ -273,6 +301,7 @@ config MACH_QIL_A9260
config MACH_TNY_A9260
bool "CALAO TNY-A9260"
select SUPPORT_CALAO_MOB_TNY_MD2
+ select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems TNY-A9260.
<http://www.calao-systems.com>
@@ -280,12 +309,14 @@ config MACH_TNY_A9260
config MACH_USB_A9260
bool "CALAO USB-A9260"
select SUPPORT_CALAO_DAB_MMX
+ select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems USB-A9260.
<http://www.calao-systems.com>
config MACH_GE863
bool "Telit EVK-PRO3"
+ select AT91SAM9260_LWL
help
Say y here if you are using Telit EVK-PRO3 with GE863-PRO3
<http://www.telit.com>
@@ -306,7 +337,9 @@ config MACH_AT91SAM9261EK
select HAS_DM9000
select HAVE_AT91_DATAFLASH_CARD
select HAVE_NAND_ATMEL_BUSWIDTH_16
- select HAVE_AT91_LOWLEVEL_INIT
+ select HAVE_AT91_BOOTSTRAP
+ select AT91SAM9261_LWL
+ select AT91SAM926X_LWL
help
Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.
<http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
@@ -314,7 +347,9 @@ config MACH_AT91SAM9261EK
config MACH_PM9261
bool "Ronetix PM9261"
select HAS_DM9000
- select HAVE_AT91_LOWLEVEL_INIT
+ select HAVE_AT91_BOOTSTRAP
+ select AT91SAM9261_LWL
+ select AT91SAM926X_LWL
help
Say y here if you are using the Ronetix PM9261 Board
@@ -333,6 +368,7 @@ config MACH_AT91SAM9G10EK
bool "Atmel AT91SAM9G10-EK Evaluation Kit"
select HAVE_NAND_ATMEL_BUSWIDTH_16
select HAS_DM9000
+ select AT91SAM9261_LWL
help
Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit.
<http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588>
@@ -351,6 +387,7 @@ choice
config MACH_AT91SAM9G20EK
bool "Atmel AT91SAM9G20-EK Evaluation Kit"
select HAVE_NAND_ATMEL_BUSWIDTH_16
+ select AT91SAM9260_LWL
help
Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit
that embeds only one SD/MMC slot.
@@ -358,6 +395,7 @@ config MACH_AT91SAM9G20EK
config MACH_TNY_A9G20
select SUPPORT_CALAO_MOB_TNY_MD2
bool "CALAO TNY-A9G20"
+ select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems TNY-A9G20.
<http://www.calao-systems.com>
@@ -365,6 +403,7 @@ config MACH_TNY_A9G20
config MACH_USB_A9G20
bool "CALAO USB-A9G20"
select SUPPORT_CALAO_DAB_MMX
+ select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems USB-A9G20.
<http://www.calao-systems.com>
@@ -372,18 +411,21 @@ config MACH_USB_A9G20
config MACH_DSS11
bool "aizo dSS11"
select HAVE_NAND_ATMEL_BUSWIDTH_16
+ select AT91SAM9260_LWL
help
Select this if you are using aizo dSS11
that embeds only one SD/MMC slot.
config MACH_QIL_A9G20
bool "CALAO QIL-A9G20 board"
+ select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems QIL-A9G20 Board.
<http://www.calao-systems.com>
config MACH_HABA_KNX_LITE
bool "CALAO HABA-KNX-LITE"
+ select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems HABA-KNX-LITE.
<http://www.calao-systems.com>
@@ -400,32 +442,41 @@ choice
config MACH_AT91SAM9263EK
bool "Atmel AT91SAM9263-EK"
- select HAVE_AT91_LOWLEVEL_INIT
select HAVE_NAND_ATMEL_BUSWIDTH_16
+ select HAVE_AT91_BOOTSTRAP
+ select AT91SAM9263_LWL
+ select AT91SAM926X_LWL
help
Say y here if you are using Atmel's AT91SAM9263-EK Evaluation board
config MACH_MMCCPU
bool "Bucyrus MMC-CPU"
+ select AT91SAM9263_LWL
help
Say y here if you are using the Bucyrus MMC-CPU
config MACH_PM9263
bool "Ronetix PM9263"
- select HAVE_AT91_LOWLEVEL_INIT
+ select HAVE_AT91_BOOTSTRAP
+ select AT91SAM9263_LWL
+ select AT91SAM926X_LWL
help
Say y here if you are using the Ronetix PM9263 Board
config MACH_TNY_A9263
bool "CALAO TNY-A9263"
select SUPPORT_CALAO_MOB_TNY_MD2
+ select HAVE_AT91_BOOTSTRAP
+ select AT91SAM9263_LWL
help
Select this if you are using a Calao Systems TNY-A9263.
<http://www.calao-systems.com>
config MACH_USB_A9263
bool "CALAO USB-A9263"
- select HAVE_AT91_LOWLEVEL_INIT
+ select HAVE_AT91_BOOTSTRAP
+ select AT91SAM9263_LWL
+ select AT91SAM926X_LWL
help
Select this if you are using a Calao Systems USB-A9263.
<http://www.calao-systems.com>
@@ -441,12 +492,14 @@ choice
config MACH_AT91SAM9M10IHD
bool "Atmel AT91SAM9M10IDH Tablet"
+ select AT91SAM9G45_LWL
help
Select this if you are using Atmel's AT91SAM9M10IHD Tablet
config MACH_AT91SAM9M10G45EK
bool "Atmel AT91SAM9M10G45-EK Evaluation Kit"
select HAVE_NAND_ATMEL_BUSWIDTH_16
+ select AT91SAM9G45_LWL
help
Select this if you are using Atmel's AT91SAM9M10G45-EK Evaluation Kit
or AT91SAM9G45-EKES or AT91SAM9M10-EKES (for those 2 select the LG LCD)
@@ -454,6 +507,7 @@ config MACH_AT91SAM9M10G45EK
config MACH_PM9G45
bool "Ronetix PM9G45"
+ select AT91SAM9G45_LWL
help
Say y here if you are using the Ronetix PM9G45 Board
@@ -470,6 +524,7 @@ choice
config MACH_AT91SAM9N12EK
bool "Atmel AT91SAM9N12 Evaluation Kit"
+ select AT91SAM9N12_LWL
help
Select this if you are using Atmel's AT91SAM9N12-EK Evaluation Kit.
@@ -486,11 +541,13 @@ choice
config MACH_SAMA5D3XEK
bool "Atmel SAMA5D3X Evaluation Kit"
+ select SAMA5D3_LWL
help
Select this if you are using Atmel's SAMA5D3X-EK Evaluation Kit.
config MACH_SAMA5D3_XPLAINED
bool "Atmel SAMA5D3_XPLAINED Evaluation Kit"
+ select SAMA5D3_LWL
help
Select this if you are using Atmel's SAMA5D3_XPLAINED Evaluation Kit.
@@ -507,11 +564,13 @@ choice
config MACH_SAMA5D4EK
bool "Atmel SAMA5D4 Evaluation Kit"
+ select SAMA5D4_LWL
help
Select this if you are using Atmel's SAMA5D4-EK Evaluation Kit.
config MACH_SAMA5D4_XPLAINED
bool "Atmel SAMA5D4 XPLAINED ULTRA Evaluation Kit"
+ select SAMA5D4_LWL
help
Select this if you are using Atmel's SAMA5D4_XPLAINED ULTRA Evaluation Kit.
@@ -596,7 +655,7 @@ config CALAO_MB_QIL_A9260
config AT91_BOOTSTRAP
bool "at91 bootstrap"
- depends on HAVE_AT91_LOWLEVEL_INIT
+ depends on HAVE_AT91_BOOTSTRAP
select BOOTSTRAP
config AT91_LOAD_BAREBOX_SRAM
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 0892fb4b5..71851d26c 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -6,19 +6,19 @@ endif
obj-$(CONFIG_CMD_AT91_BOOT_TEST) += boot_test_cmd.o
-obj-$(CONFIG_AT91_BOOTSTRAP) += bootstrap.o
-sam926x_lowlevel_init-$(CONFIG_AT91SAM9_LOWLEVEL_INIT) = at91sam926x_lowlevel_init.o
-lowlevel_init-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) = $(sam926x_lowlevel_init-y)
-lowlevel_init-$(CONFIG_SOC_AT91SAM9260) += at91sam9260_lowlevel_init.o
-lowlevel_init-$(CONFIG_SOC_AT91SAM9261) += at91sam9261_lowlevel_init.o
-lowlevel_init-$(CONFIG_SOC_AT91SAM9263) += at91sam9263_lowlevel_init.o
-lowlevel_init-$(CONFIG_SOC_AT91SAM9G45) += at91sam9g45_lowlevel_init.o
-lowlevel_init-$(CONFIG_SOC_AT91SAM9X5) += at91sam9x5_lowlevel_init.o
-lowlevel_init-$(CONFIG_SOC_AT91SAM9N12) += at91sam9n12_lowlevel_init.o
-lowlevel_init-$(CONFIG_ARCH_AT91RM9200) = at91rm9200_lowlevel_init.o
-lowlevel_init-$(CONFIG_ARCH_SAMA5D3) += sama5d3_lowlevel_init.o
-lowlevel_init-$(CONFIG_ARCH_SAMA5D4) += sama5d3_lowlevel_init.o
-lwl-y += $(lowlevel_init-y)
+obj-$(CONFIG_AT91_BOOTSTRAP) += bootstrap.o
+
+lwl-$(CONFIG_AT91SAM926X_LWL) += at91sam926x_lowlevel_init.o
+
+lwl-$(CONFIG_AT91RM9200_LWL) += at91rm9200_lowlevel_init.o
+lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o
+lwl-$(CONFIG_AT91SAM9261_LWL) += at91sam9261_lowlevel_init.o
+lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o
+lwl-$(CONFIG_AT91SAM9G45_LWL) += at91sam9g45_lowlevel_init.o
+lwl-$(CONFIG_AT91SAM9X5_LWL) += at91sam9x5_lowlevel_init.o
+lwl-$(CONFIG_AT91SAM9N12_LWL) += at91sam9n12_lowlevel_init.o
+lwl-$(CONFIG_SAMA5D3_LWL) += sama5d3_lowlevel_init.o
+lwl-$(CONFIG_SAMA5D4_LWL) += sama5d3_lowlevel_init.o
obj-$(CONFIG_AT91SAM9_RESET) += at91sam9_reset.o
obj-$(CONFIG_AT91SAM9G45_RESET) += at91sam9g45_reset.o
diff --git a/arch/arm/mach-at91/include/mach/at91_lowlevel_init.h b/arch/arm/mach-at91/include/mach/at91_lowlevel_init.h
index 6b37e49e9..d72dfff38 100644
--- a/arch/arm/mach-at91/include/mach/at91_lowlevel_init.h
+++ b/arch/arm/mach-at91/include/mach/at91_lowlevel_init.h
@@ -35,7 +35,7 @@ struct at91sam926x_lowlevel_cfg {
u32 rstc_rmr;
};
-#ifdef CONFIG_HAVE_AT91_LOWLEVEL_INIT
+#ifdef CONFIG_AT91SAM926X_LWL
void at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg);
void at91sam926x_lowlevel_init(struct at91sam926x_lowlevel_cfg *cfg);
#else
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 02/24] arm: at91: drop unused at91sam9x5_lowlevel_init.c
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
2017-12-27 20:50 ` [PATCH 01/24] arm: at91: refactor lowlevel_init selection Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-30 2:31 ` Andrey Smirnov
2017-12-27 20:50 ` [PATCH 03/24] arm: at91: add at91sam926x_board_init.h Sam Ravnborg
` (21 subsequent siblings)
23 siblings, 1 reply; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
After refactoring of how we select lowlevel_init
it was appearant that at91sam9x5_lowlevel_init.c was no
longer used.
Delete the file and the now unused CONFIG symbol and it uses
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/mach-at91/Kconfig | 2 --
arch/arm/mach-at91/Makefile | 1 -
arch/arm/mach-at91/at91sam9x5_lowlevel_init.c | 26 --------------------------
3 files changed, 29 deletions(-)
delete mode 100644 arch/arm/mach-at91/at91sam9x5_lowlevel_init.c
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index e94c5b0a8..670ef1a39 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -51,8 +51,6 @@ config AT91SAM9263_LWL
bool
config AT91SAM9G45_LWL
bool
-config AT91SAM9X5_LWL
- bool
config AT91SAM9N12_LWL
bool
config AT91RM9200_LWL
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 71851d26c..66b83000a 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -15,7 +15,6 @@ lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9261_LWL) += at91sam9261_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9G45_LWL) += at91sam9g45_lowlevel_init.o
-lwl-$(CONFIG_AT91SAM9X5_LWL) += at91sam9x5_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9N12_LWL) += at91sam9n12_lowlevel_init.o
lwl-$(CONFIG_SAMA5D3_LWL) += sama5d3_lowlevel_init.o
lwl-$(CONFIG_SAMA5D4_LWL) += sama5d3_lowlevel_init.o
diff --git a/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c b/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c
deleted file mode 100644
index 48e69f947..000000000
--- a/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
- */
-
-#define __LOWLEVEL_INIT__
-
-#include <common.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
-#include <asm/barebox-arm-head.h>
-#include <mach/hardware.h>
-#include <mach/io.h>
-#include <mach/at91sam9_ddrsdr.h>
-#include <init.h>
-#include <linux/sizes.h>
-
-void __naked __bare_init barebox_arm_reset_vector(void)
-{
- arm_cpu_lowlevel_init();
-
- arm_setup_stack(AT91SAM9X5_SRAM_BASE + AT91SAM9X5_SRAM_SIZE - 16);
-
- barebox_arm_entry(AT91_CHIPSELECT_1, at91sam9x5_get_ddram_size(), NULL);
-}
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH 02/24] arm: at91: drop unused at91sam9x5_lowlevel_init.c
2017-12-27 20:50 ` [PATCH 02/24] arm: at91: drop unused at91sam9x5_lowlevel_init.c Sam Ravnborg
@ 2017-12-30 2:31 ` Andrey Smirnov
0 siblings, 0 replies; 28+ messages in thread
From: Andrey Smirnov @ 2017-12-30 2:31 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: Barebox List
On Wed, Dec 27, 2017 at 12:50 PM, Sam Ravnborg <sam@ravnborg.org> wrote:
> After refactoring of how we select lowlevel_init
> it was appearant that at91sam9x5_lowlevel_init.c was no
Nit: s/appearant/apparent/
> longer used.
> Delete the file and the now unused CONFIG symbol and it uses
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> ---
> arch/arm/mach-at91/Kconfig | 2 --
> arch/arm/mach-at91/Makefile | 1 -
> arch/arm/mach-at91/at91sam9x5_lowlevel_init.c | 26 --------------------------
> 3 files changed, 29 deletions(-)
> delete mode 100644 arch/arm/mach-at91/at91sam9x5_lowlevel_init.c
>
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index e94c5b0a8..670ef1a39 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -51,8 +51,6 @@ config AT91SAM9263_LWL
> bool
> config AT91SAM9G45_LWL
> bool
> -config AT91SAM9X5_LWL
> - bool
> config AT91SAM9N12_LWL
> bool
> config AT91RM9200_LWL
> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
> index 71851d26c..66b83000a 100644
> --- a/arch/arm/mach-at91/Makefile
> +++ b/arch/arm/mach-at91/Makefile
> @@ -15,7 +15,6 @@ lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o
> lwl-$(CONFIG_AT91SAM9261_LWL) += at91sam9261_lowlevel_init.o
> lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o
> lwl-$(CONFIG_AT91SAM9G45_LWL) += at91sam9g45_lowlevel_init.o
> -lwl-$(CONFIG_AT91SAM9X5_LWL) += at91sam9x5_lowlevel_init.o
> lwl-$(CONFIG_AT91SAM9N12_LWL) += at91sam9n12_lowlevel_init.o
> lwl-$(CONFIG_SAMA5D3_LWL) += sama5d3_lowlevel_init.o
> lwl-$(CONFIG_SAMA5D4_LWL) += sama5d3_lowlevel_init.o
> diff --git a/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c b/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c
> deleted file mode 100644
> index 48e69f947..000000000
> --- a/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -/*
> - * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> - *
> - * Under GPLv2
> - */
> -
> -#define __LOWLEVEL_INIT__
> -
> -#include <common.h>
> -#include <asm/system.h>
> -#include <asm/barebox-arm.h>
> -#include <asm/barebox-arm-head.h>
> -#include <mach/hardware.h>
> -#include <mach/io.h>
> -#include <mach/at91sam9_ddrsdr.h>
> -#include <init.h>
> -#include <linux/sizes.h>
> -
> -void __naked __bare_init barebox_arm_reset_vector(void)
> -{
> - arm_cpu_lowlevel_init();
> -
> - arm_setup_stack(AT91SAM9X5_SRAM_BASE + AT91SAM9X5_SRAM_SIZE - 16);
> -
> - barebox_arm_entry(AT91_CHIPSELECT_1, at91sam9x5_get_ddram_size(), NULL);
> -}
> --
> 2.12.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 03/24] arm: at91: add at91sam926x_board_init.h
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
2017-12-27 20:50 ` [PATCH 01/24] arm: at91: refactor lowlevel_init selection Sam Ravnborg
2017-12-27 20:50 ` [PATCH 02/24] arm: at91: drop unused at91sam9x5_lowlevel_init.c Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-30 2:56 ` Andrey Smirnov
2017-12-27 20:50 ` [PATCH 04/24] at91sam9263ek: move reset vector to board code Sam Ravnborg
` (20 subsequent siblings)
23 siblings, 1 reply; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
To prepare moving reset code to board code create at91sam926x_board_init.h.
at91sam926x_board_init.h is a copy of at91sam926x_lowlevel_init.c
with a few changes:
- We no longer call board code from this function
- The struct is renamed to avoid name clashes
- Function renamed to better match the prurpose
This file allows board code to include at91sam926x_board_init.h
and use the init functions in their init code.
Users must select AT91SAM926X_BOARD_INIT
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
.../include/mach/at91sam926x_board_init.h | 231 +++++++++++++++++++++
1 file changed, 231 insertions(+)
create mode 100644 arch/arm/mach-at91/include/mach/at91sam926x_board_init.h
diff --git a/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h b/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h
new file mode 100644
index 000000000..1c58d2f25
--- /dev/null
+++ b/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h
@@ -0,0 +1,231 @@
+#ifndef __AT91SAM926X_BOARD_INIT_H__
+#define __AT91SAM926X_BOARD_INIT_H__
+/*
+ * Copyright (C) 2008 Ronetix Ilko Iliev (www.ronetix.at)
+ * Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9_smc.h>
+#include <mach/at91_rstc.h>
+#include <mach/at91_pio.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_wdt.h>
+#include <mach/hardware.h>
+#include <mach/gpio.h>
+
+struct at91sam926x_board_cfg {
+ /* SoC specific */
+ void __iomem *pio;
+ void __iomem *sdramc;
+ u32 ebi_pio_is_peripha;
+ u32 matrix_csa;
+
+ /* board specific */
+ u32 wdt_mr;
+ u32 ebi_pio_pdr;
+ u32 ebi_pio_ppudr;
+ u32 ebi_csa;
+ u32 smc_cs;
+ u32 smc_mode;
+ u32 smc_cycle;
+ u32 smc_pulse;
+ u32 smc_setup;
+ u32 pmc_mor;
+ u32 pmc_pllar;
+ u32 pmc_mckr1;
+ u32 pmc_mckr2;
+ u32 sdrc_cr;
+ u32 sdrc_tr1;
+ u32 sdrc_mdr;
+ u32 sdrc_tr2;
+ u32 rstc_rmr;
+};
+
+
+static void __always_inline access_sdram(void)
+{
+ writel(0x00000000, AT91_SDRAM_BASE);
+}
+
+static void __always_inline pmc_check_mckrdy(void)
+{
+ u32 r;
+
+ do {
+ r = at91_pmc_read(AT91_PMC_SR);
+ } while (!(r & AT91_PMC_MCKRDY));
+}
+
+static int __always_inline running_in_sram(void)
+{
+ u32 addr = get_pc();
+
+ addr >>= 28;
+ return addr == 0;
+}
+
+#define at91_sdramc_read(field) \
+ __raw_readl(cfg->sdramc + field)
+
+#define at91_sdramc_write(field, value) \
+ __raw_writel(value, cfg->sdramc + field)
+
+static void __always_inline __bare_init at91sam926x_sdramc_init(struct at91sam926x_board_cfg *cfg)
+{
+ u32 r;
+ int i;
+ int in_sram = running_in_sram();
+
+ /*
+ * SDRAMC Check if Refresh Timer Counter is already initialized
+ */
+ r = at91_sdramc_read(AT91_SDRAMC_TR);
+ if (r && !in_sram)
+ return;
+
+ /* SDRAMC_MR : Normal Mode */
+ at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_NORMAL);
+
+ /* SDRAMC_TR - Refresh Timer register */
+ at91_sdramc_write(AT91_SDRAMC_TR, cfg->sdrc_tr1);
+
+ /* SDRAMC_CR - Configuration register*/
+ at91_sdramc_write(AT91_SDRAMC_CR, cfg->sdrc_cr);
+
+ /* Memory Device Type */
+ at91_sdramc_write(AT91_SDRAMC_MDR, cfg->sdrc_mdr);
+
+ /* SDRAMC_MR : Precharge All */
+ at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_PRECHARGE);
+
+ /* access SDRAM */
+ access_sdram();
+
+ /* SDRAMC_MR : refresh */
+ at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_REFRESH);
+
+ /* access SDRAM 8 times */
+ for (i = 0; i < 8; i++)
+ access_sdram();
+
+ /* SDRAMC_MR : Load Mode Register */
+ at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_LMR);
+
+ /* access SDRAM */
+ access_sdram();
+
+ /* SDRAMC_MR : Normal Mode */
+ at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_NORMAL);
+
+ /* access SDRAM */
+ access_sdram();
+
+ /* SDRAMC_TR : Refresh Timer Counter */
+ at91_sdramc_write(AT91_SDRAMC_TR, cfg->sdrc_tr2);
+
+ /* access SDRAM */
+ access_sdram();
+}
+
+#if !defined(CONFIG_AT91SAM926X_BOARD_INIT)
+/*
+ * Empty function if the board do not use this.
+ * Board code can call this, and let Kconfig select decide if
+ * the board uses at91sam926x_board_init()
+ */
+static void __always_inline __bare_init at91sam926x_board_init(struct at91sam926x_board_cfg *cfg)
+{
+}
+#else
+static void __always_inline __bare_init at91sam926x_board_init(struct at91sam926x_board_cfg *cfg)
+{
+ u32 r;
+ int in_sram = running_in_sram();
+
+ __raw_writel(cfg->wdt_mr, AT91_BASE_WDT + AT91_WDT_MR);
+
+ /* configure PIOx as EBI0 D[16-31] */
+ at91_mux_gpio_disable(cfg->pio, cfg->ebi_pio_pdr);
+ at91_mux_set_pullup(cfg->pio, cfg->ebi_pio_ppudr, true);
+ if (cfg->ebi_pio_is_peripha)
+ at91_mux_set_A_periph(cfg->pio, cfg->ebi_pio_ppudr);
+
+ at91_sys_write(cfg->matrix_csa, cfg->ebi_csa);
+
+ /* flash */
+ at91_smc_write(cfg->smc_cs, AT91_SAM9_SMC_MODE, cfg->smc_mode);
+
+ at91_smc_write(cfg->smc_cs, AT91_SMC_CYCLE, cfg->smc_cycle);
+
+ at91_smc_write(cfg->smc_cs, AT91_SMC_PULSE, cfg->smc_pulse);
+
+ at91_smc_write(cfg->smc_cs, AT91_SMC_SETUP, cfg->smc_setup);
+
+ /*
+ * PMC Check if the PLL is already initialized
+ */
+ r = at91_pmc_read(AT91_PMC_MCKR);
+ if (r & AT91_PMC_CSS && !in_sram)
+ return;
+
+ /*
+ * Enable the Main Oscillator
+ */
+ at91_pmc_write(AT91_CKGR_MOR, cfg->pmc_mor);
+
+ do {
+ r = at91_pmc_read(AT91_PMC_SR);
+ } while (!(r & AT91_PMC_MOSCS));
+
+ /*
+ * PLLAR: x MHz for PCK
+ */
+ at91_pmc_write(AT91_CKGR_PLLAR, cfg->pmc_pllar);
+
+ do {
+ r = at91_pmc_read(AT91_PMC_SR);
+ } while (!(r & AT91_PMC_LOCKA));
+
+ /*
+ * PCK/x = MCK Master Clock from SLOW
+ */
+ at91_pmc_write(AT91_PMC_MCKR, cfg->pmc_mckr1);
+
+ pmc_check_mckrdy();
+
+ /*
+ * PCK/x = MCK Master Clock from PLLA
+ */
+ at91_pmc_write(AT91_PMC_MCKR, cfg->pmc_mckr2);
+
+ pmc_check_mckrdy();
+
+ /*
+ * Init SDRAM
+ */
+ at91sam926x_sdramc_init(cfg);
+
+ /* User reset enable*/
+ at91_sys_write(AT91_RSTC_MR, cfg->rstc_rmr);
+
+#ifdef CONFIG_SYS_MATRIX_MCFG_REMAP
+ /* MATRIX_MCFG - REMAP all masters */
+ at91_sys_write(AT91_MATRIX_MCFG0, 0x1FF);
+#endif
+ /*
+ * When boot from external boot
+ * we need to enable mck and ohter clock
+ * so enable all of them
+ * We will shutdown what we don't need later
+ */
+ at91_pmc_write(AT91_PMC_PCER, 0xffffffff);
+}
+#endif /* CONFIG_AT91SAM926X_BOARD_INIT */
+
+#endif /* __AT91SAM926X_BOARD_INIT_H__ */
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH 03/24] arm: at91: add at91sam926x_board_init.h
2017-12-27 20:50 ` [PATCH 03/24] arm: at91: add at91sam926x_board_init.h Sam Ravnborg
@ 2017-12-30 2:56 ` Andrey Smirnov
2017-12-30 10:56 ` Sam Ravnborg
0 siblings, 1 reply; 28+ messages in thread
From: Andrey Smirnov @ 2017-12-30 2:56 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: Barebox List
On Wed, Dec 27, 2017 at 12:50 PM, Sam Ravnborg <sam@ravnborg.org> wrote:
> To prepare moving reset code to board code create at91sam926x_board_init.h.
>
> at91sam926x_board_init.h is a copy of at91sam926x_lowlevel_init.c
> with a few changes:
> - We no longer call board code from this function
> - The struct is renamed to avoid name clashes
> - Function renamed to better match the prurpose
>
> This file allows board code to include at91sam926x_board_init.h
> and use the init functions in their init code.
>
> Users must select AT91SAM926X_BOARD_INIT
>
If the intent of this commit is to keep this code as close to original
at91sam926x_lowlevel_init.c then a whole bunch of my comments below
could probably be ignored, but I added them anyway just FWIW.
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> ---
> .../include/mach/at91sam926x_board_init.h | 231 +++++++++++++++++++++
> 1 file changed, 231 insertions(+)
> create mode 100644 arch/arm/mach-at91/include/mach/at91sam926x_board_init.h
>
> diff --git a/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h b/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h
> new file mode 100644
> index 000000000..1c58d2f25
> --- /dev/null
> +++ b/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h
> @@ -0,0 +1,231 @@
> +#ifndef __AT91SAM926X_BOARD_INIT_H__
> +#define __AT91SAM926X_BOARD_INIT_H__
> +/*
> + * Copyright (C) 2008 Ronetix Ilko Iliev (www.ronetix.at)
> + * Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> + *
> + * Under GPLv2
> + */
> +
> +#include <common.h>
> +#include <init.h>
> +
> +#include <mach/at91sam9_sdramc.h>
> +#include <mach/at91sam9_smc.h>
> +#include <mach/at91_rstc.h>
> +#include <mach/at91_pio.h>
> +#include <mach/at91_pmc.h>
> +#include <mach/at91_wdt.h>
> +#include <mach/hardware.h>
> +#include <mach/gpio.h>
> +
> +struct at91sam926x_board_cfg {
> + /* SoC specific */
> + void __iomem *pio;
> + void __iomem *sdramc;
> + u32 ebi_pio_is_peripha;
> + u32 matrix_csa;
> +
> + /* board specific */
> + u32 wdt_mr;
> + u32 ebi_pio_pdr;
> + u32 ebi_pio_ppudr;
> + u32 ebi_csa;
> + u32 smc_cs;
> + u32 smc_mode;
> + u32 smc_cycle;
> + u32 smc_pulse;
> + u32 smc_setup;
> + u32 pmc_mor;
> + u32 pmc_pllar;
> + u32 pmc_mckr1;
> + u32 pmc_mckr2;
> + u32 sdrc_cr;
> + u32 sdrc_tr1;
> + u32 sdrc_mdr;
> + u32 sdrc_tr2;
> + u32 rstc_rmr;
> +};
> +
> +
> +static void __always_inline access_sdram(void)
> +{
> + writel(0x00000000, AT91_SDRAM_BASE);
> +}
Is there a reason to use __always_inline vs regular inline here?
> +
> +static void __always_inline pmc_check_mckrdy(void)
> +{
> + u32 r;
> +
> + do {
> + r = at91_pmc_read(AT91_PMC_SR);
> + } while (!(r & AT91_PMC_MCKRDY));
> +}
> +
> +static int __always_inline running_in_sram(void)
> +{
> + u32 addr = get_pc();
> +
> + addr >>= 28;
> + return addr == 0;
> +}
> +
> +#define at91_sdramc_read(field) \
> + __raw_readl(cfg->sdramc + field)
> +
> +#define at91_sdramc_write(field, value) \
> + __raw_writel(value, cfg->sdramc + field)
I'd rather these were inline functions that didn't implicitly rely on
"cfg" to be defined, but that's my personal preference, so feel free
to keep it this way.
> +
> +static void __always_inline __bare_init at91sam926x_sdramc_init(struct at91sam926x_board_cfg *cfg)
> +{
Using __always_inline and __bare_init at the same time doesn't make
much sense to me. If function is always inlined then it ends up in
whatever section its caller is in and if it is placed into "bare init"
section then it's not really inlined. Am I missing something?
> + u32 r;
> + int i;
> + int in_sram = running_in_sram();
> +
> + /*
> + * SDRAMC Check if Refresh Timer Counter is already initialized
> + */
> + r = at91_sdramc_read(AT91_SDRAMC_TR);
> + if (r && !in_sram)
> + return;
> +
> + /* SDRAMC_MR : Normal Mode */
> + at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_NORMAL);
> +
> + /* SDRAMC_TR - Refresh Timer register */
> + at91_sdramc_write(AT91_SDRAMC_TR, cfg->sdrc_tr1);
> +
> + /* SDRAMC_CR - Configuration register*/
> + at91_sdramc_write(AT91_SDRAMC_CR, cfg->sdrc_cr);
> +
> + /* Memory Device Type */
> + at91_sdramc_write(AT91_SDRAMC_MDR, cfg->sdrc_mdr);
> +
> + /* SDRAMC_MR : Precharge All */
> + at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_PRECHARGE);
> +
> + /* access SDRAM */
As much as I like comments in code, this one is not really useful (I
can see what's being done already and it doesn't really clarify why).
Would you mind dropping this and other comment like this?
> + access_sdram();
> +
> + /* SDRAMC_MR : refresh */
> + at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_REFRESH);
> +
> + /* access SDRAM 8 times */
> + for (i = 0; i < 8; i++)
> + access_sdram();
> +
> + /* SDRAMC_MR : Load Mode Register */
> + at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_LMR);
> +
> + /* access SDRAM */
> + access_sdram();
> +
> + /* SDRAMC_MR : Normal Mode */
> + at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_NORMAL);
> +
> + /* access SDRAM */
> + access_sdram();
> +
> + /* SDRAMC_TR : Refresh Timer Counter */
> + at91_sdramc_write(AT91_SDRAMC_TR, cfg->sdrc_tr2);
> +
> + /* access SDRAM */
> + access_sdram();
> +}
> +
> +#if !defined(CONFIG_AT91SAM926X_BOARD_INIT)
> +/*
> + * Empty function if the board do not use this.
> + * Board code can call this, and let Kconfig select decide if
> + * the board uses at91sam926x_board_init()
> + */
> +static void __always_inline __bare_init at91sam926x_board_init(struct at91sam926x_board_cfg *cfg)
> +{
> +}
> +#else
> +static void __always_inline __bare_init at91sam926x_board_init(struct at91sam926x_board_cfg *cfg)
> +{
> + u32 r;
> + int in_sram = running_in_sram();
> +
if (!IS_ENABLED(CONFIG_AT91SAM926X_BOARD_INIT)
return;
instead to avoid having to repeat the signature twice?
> + __raw_writel(cfg->wdt_mr, AT91_BASE_WDT + AT91_WDT_MR);
> +
> + /* configure PIOx as EBI0 D[16-31] */
> + at91_mux_gpio_disable(cfg->pio, cfg->ebi_pio_pdr);
> + at91_mux_set_pullup(cfg->pio, cfg->ebi_pio_ppudr, true);
> + if (cfg->ebi_pio_is_peripha)
> + at91_mux_set_A_periph(cfg->pio, cfg->ebi_pio_ppudr);
> +
> + at91_sys_write(cfg->matrix_csa, cfg->ebi_csa);
> +
> + /* flash */
> + at91_smc_write(cfg->smc_cs, AT91_SAM9_SMC_MODE, cfg->smc_mode);
> +
> + at91_smc_write(cfg->smc_cs, AT91_SMC_CYCLE, cfg->smc_cycle);
> +
> + at91_smc_write(cfg->smc_cs, AT91_SMC_PULSE, cfg->smc_pulse);
> +
> + at91_smc_write(cfg->smc_cs, AT91_SMC_SETUP, cfg->smc_setup);
> +
> + /*
> + * PMC Check if the PLL is already initialized
> + */
> + r = at91_pmc_read(AT91_PMC_MCKR);
> + if (r & AT91_PMC_CSS && !in_sram)
> + return;
Does GCC say anything about lack of parenthesis around bitwise and above?
> +
> + /*
> + * Enable the Main Oscillator
> + */
> + at91_pmc_write(AT91_CKGR_MOR, cfg->pmc_mor);
> +
> + do {
> + r = at91_pmc_read(AT91_PMC_SR);
> + } while (!(r & AT91_PMC_MOSCS));
> +
> + /*
> + * PLLAR: x MHz for PCK
> + */
> + at91_pmc_write(AT91_CKGR_PLLAR, cfg->pmc_pllar);
> +
> + do {
> + r = at91_pmc_read(AT91_PMC_SR);
> + } while (!(r & AT91_PMC_LOCKA));
> +
> + /*
> + * PCK/x = MCK Master Clock from SLOW
> + */
> + at91_pmc_write(AT91_PMC_MCKR, cfg->pmc_mckr1);
> +
> + pmc_check_mckrdy();
> +
> + /*
> + * PCK/x = MCK Master Clock from PLLA
> + */
> + at91_pmc_write(AT91_PMC_MCKR, cfg->pmc_mckr2);
> +
> + pmc_check_mckrdy();
> +
> + /*
> + * Init SDRAM
> + */
> + at91sam926x_sdramc_init(cfg);
> +
> + /* User reset enable*/
> + at91_sys_write(AT91_RSTC_MR, cfg->rstc_rmr);
> +
> +#ifdef CONFIG_SYS_MATRIX_MCFG_REMAP
> + /* MATRIX_MCFG - REMAP all masters */
> + at91_sys_write(AT91_MATRIX_MCFG0, 0x1FF);
> +#endif
if (IS_ENABLED(CONFIG_SYS_MATRIX_MCFG_REMAP))
here as well?
Thanks,
Andrey Smirnov
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCH 03/24] arm: at91: add at91sam926x_board_init.h
2017-12-30 2:56 ` Andrey Smirnov
@ 2017-12-30 10:56 ` Sam Ravnborg
0 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-30 10:56 UTC (permalink / raw)
To: Andrey Smirnov; +Cc: Barebox List
Hi Andrey.
On Fri, Dec 29, 2017 at 06:56:39PM -0800, Andrey Smirnov wrote:
> On Wed, Dec 27, 2017 at 12:50 PM, Sam Ravnborg <sam@ravnborg.org> wrote:
> > To prepare moving reset code to board code create at91sam926x_board_init.h.
> >
> > at91sam926x_board_init.h is a copy of at91sam926x_lowlevel_init.c
> > with a few changes:
> > - We no longer call board code from this function
> > - The struct is renamed to avoid name clashes
> > - Function renamed to better match the prurpose
> >
> > This file allows board code to include at91sam926x_board_init.h
> > and use the init functions in their init code.
> >
> > Users must select AT91SAM926X_BOARD_INIT
> >
>
> If the intent of this commit is to keep this code as close to original
> at91sam926x_lowlevel_init.c then a whole bunch of my comments below
> could probably be ignored, but I added them anyway just FWIW.
The intent was more in the area of "it works, so do not break it".
I will divide this in two patches where the second patch will
go through the code and update thereby implicit addressing many of your
comments.
>
> > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> > ---
> > .../include/mach/at91sam926x_board_init.h | 231 +++++++++++++++++++++
> > 1 file changed, 231 insertions(+)
> > create mode 100644 arch/arm/mach-at91/include/mach/at91sam926x_board_init.h
> >
> > diff --git a/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h b/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h
> > new file mode 100644
> > index 000000000..1c58d2f25
> > --- /dev/null
> > +++ b/arch/arm/mach-at91/include/mach/at91sam926x_board_init.h
> > @@ -0,0 +1,231 @@
> > +#ifndef __AT91SAM926X_BOARD_INIT_H__
> > +#define __AT91SAM926X_BOARD_INIT_H__
> > +/*
> > + * Copyright (C) 2008 Ronetix Ilko Iliev (www.ronetix.at)
> > + * Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > + *
> > + * Under GPLv2
> > + */
> > +
> > +#include <common.h>
> > +#include <init.h>
> > +
> > +#include <mach/at91sam9_sdramc.h>
> > +#include <mach/at91sam9_smc.h>
> > +#include <mach/at91_rstc.h>
> > +#include <mach/at91_pio.h>
> > +#include <mach/at91_pmc.h>
> > +#include <mach/at91_wdt.h>
> > +#include <mach/hardware.h>
> > +#include <mach/gpio.h>
> > +
> > +struct at91sam926x_board_cfg {
> > + /* SoC specific */
> > + void __iomem *pio;
> > + void __iomem *sdramc;
> > + u32 ebi_pio_is_peripha;
> > + u32 matrix_csa;
> > +
> > + /* board specific */
> > + u32 wdt_mr;
> > + u32 ebi_pio_pdr;
> > + u32 ebi_pio_ppudr;
> > + u32 ebi_csa;
> > + u32 smc_cs;
> > + u32 smc_mode;
> > + u32 smc_cycle;
> > + u32 smc_pulse;
> > + u32 smc_setup;
> > + u32 pmc_mor;
> > + u32 pmc_pllar;
> > + u32 pmc_mckr1;
> > + u32 pmc_mckr2;
> > + u32 sdrc_cr;
> > + u32 sdrc_tr1;
> > + u32 sdrc_mdr;
> > + u32 sdrc_tr2;
> > + u32 rstc_rmr;
> > +};
> > +
> > +
> > +static void __always_inline access_sdram(void)
> > +{
> > + writel(0x00000000, AT91_SDRAM_BASE);
> > +}
>
> Is there a reason to use __always_inline vs regular inline here?
My thinking here is that the compiler is forced to inline this,
so everything ends up in one function and thus in the same section.
So inline is not a hint, but an order that must be followed.
>
> > +
> > +static void __always_inline pmc_check_mckrdy(void)
> > +{
> > + u32 r;
> > +
> > + do {
> > + r = at91_pmc_read(AT91_PMC_SR);
> > + } while (!(r & AT91_PMC_MCKRDY));
> > +}
> > +
> > +static int __always_inline running_in_sram(void)
> > +{
> > + u32 addr = get_pc();
> > +
> > + addr >>= 28;
> > + return addr == 0;
> > +}
> > +
> > +#define at91_sdramc_read(field) \
> > + __raw_readl(cfg->sdramc + field)
> > +
> > +#define at91_sdramc_write(field, value) \
> > + __raw_writel(value, cfg->sdramc + field)
>
> I'd rather these were inline functions that didn't implicitly rely on
> "cfg" to be defined, but that's my personal preference, so feel free
> to keep it this way.
Will drop the macros in second patch.
>
> > +
> > +static void __always_inline __bare_init at91sam926x_sdramc_init(struct at91sam926x_board_cfg *cfg)
> > +{
>
> Using __always_inline and __bare_init at the same time doesn't make
> much sense to me. If function is always inlined then it ends up in
> whatever section its caller is in and if it is placed into "bare init"
> section then it's not really inlined. Am I missing something?
My bad, thanks for spotting this. Will drop __bare_init here.
>
> > + u32 r;
> > + int i;
> > + int in_sram = running_in_sram();
> > +
> > + /*
> > + * SDRAMC Check if Refresh Timer Counter is already initialized
> > + */
> > + r = at91_sdramc_read(AT91_SDRAMC_TR);
> > + if (r && !in_sram)
> > + return;
> > +
> > + /* SDRAMC_MR : Normal Mode */
> > + at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_NORMAL);
> > +
> > + /* SDRAMC_TR - Refresh Timer register */
> > + at91_sdramc_write(AT91_SDRAMC_TR, cfg->sdrc_tr1);
> > +
> > + /* SDRAMC_CR - Configuration register*/
> > + at91_sdramc_write(AT91_SDRAMC_CR, cfg->sdrc_cr);
> > +
> > + /* Memory Device Type */
> > + at91_sdramc_write(AT91_SDRAMC_MDR, cfg->sdrc_mdr);
> > +
> > + /* SDRAMC_MR : Precharge All */
> > + at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_PRECHARGE);
> > +
> > + /* access SDRAM */
>
> As much as I like comments in code, this one is not really useful (I
> can see what's being done already and it doesn't really clarify why).
> Would you mind dropping this and other comment like this?
>
> > + access_sdram();
> > +
> > + /* SDRAMC_MR : refresh */
> > + at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_REFRESH);
> > +
> > + /* access SDRAM 8 times */
> > + for (i = 0; i < 8; i++)
> > + access_sdram();
> > +
> > + /* SDRAMC_MR : Load Mode Register */
> > + at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_LMR);
> > +
> > + /* access SDRAM */
> > + access_sdram();
> > +
> > + /* SDRAMC_MR : Normal Mode */
> > + at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_NORMAL);
> > +
> > + /* access SDRAM */
> > + access_sdram();
> > +
> > + /* SDRAMC_TR : Refresh Timer Counter */
> > + at91_sdramc_write(AT91_SDRAMC_TR, cfg->sdrc_tr2);
> > +
> > + /* access SDRAM */
> > + access_sdram();
> > +}
> > +
> > +#if !defined(CONFIG_AT91SAM926X_BOARD_INIT)
> > +/*
> > + * Empty function if the board do not use this.
> > + * Board code can call this, and let Kconfig select decide if
> > + * the board uses at91sam926x_board_init()
> > + */
> > +static void __always_inline __bare_init at91sam926x_board_init(struct at91sam926x_board_cfg *cfg)
> > +{
> > +}
> > +#else
> > +static void __always_inline __bare_init at91sam926x_board_init(struct at91sam926x_board_cfg *cfg)
> > +{
> > + u32 r;
> > + int in_sram = running_in_sram();
> > +
>
> if (!IS_ENABLED(CONFIG_AT91SAM926X_BOARD_INIT)
> return;
>
> instead to avoid having to repeat the signature twice?
Yes, much better.
>
> > + __raw_writel(cfg->wdt_mr, AT91_BASE_WDT + AT91_WDT_MR);
> > +
> > + /* configure PIOx as EBI0 D[16-31] */
> > + at91_mux_gpio_disable(cfg->pio, cfg->ebi_pio_pdr);
> > + at91_mux_set_pullup(cfg->pio, cfg->ebi_pio_ppudr, true);
> > + if (cfg->ebi_pio_is_peripha)
> > + at91_mux_set_A_periph(cfg->pio, cfg->ebi_pio_ppudr);
> > +
> > + at91_sys_write(cfg->matrix_csa, cfg->ebi_csa);
> > +
> > + /* flash */
> > + at91_smc_write(cfg->smc_cs, AT91_SAM9_SMC_MODE, cfg->smc_mode);
> > +
> > + at91_smc_write(cfg->smc_cs, AT91_SMC_CYCLE, cfg->smc_cycle);
> > +
> > + at91_smc_write(cfg->smc_cs, AT91_SMC_PULSE, cfg->smc_pulse);
> > +
> > + at91_smc_write(cfg->smc_cs, AT91_SMC_SETUP, cfg->smc_setup);
> > +
> > + /*
> > + * PMC Check if the PLL is already initialized
> > + */
> > + r = at91_pmc_read(AT91_PMC_MCKR);
> > + if (r & AT91_PMC_CSS && !in_sram)
> > + return;
>
> Does GCC say anything about lack of parenthesis around bitwise and above?
No warning, but will add ().
>
> > +
> > + /*
> > + * Enable the Main Oscillator
> > + */
> > + at91_pmc_write(AT91_CKGR_MOR, cfg->pmc_mor);
> > +
> > + do {
> > + r = at91_pmc_read(AT91_PMC_SR);
> > + } while (!(r & AT91_PMC_MOSCS));
> > +
> > + /*
> > + * PLLAR: x MHz for PCK
> > + */
> > + at91_pmc_write(AT91_CKGR_PLLAR, cfg->pmc_pllar);
> > +
> > + do {
> > + r = at91_pmc_read(AT91_PMC_SR);
> > + } while (!(r & AT91_PMC_LOCKA));
> > +
> > + /*
> > + * PCK/x = MCK Master Clock from SLOW
> > + */
> > + at91_pmc_write(AT91_PMC_MCKR, cfg->pmc_mckr1);
> > +
> > + pmc_check_mckrdy();
> > +
> > + /*
> > + * PCK/x = MCK Master Clock from PLLA
> > + */
> > + at91_pmc_write(AT91_PMC_MCKR, cfg->pmc_mckr2);
> > +
> > + pmc_check_mckrdy();
> > +
> > + /*
> > + * Init SDRAM
> > + */
> > + at91sam926x_sdramc_init(cfg);
> > +
> > + /* User reset enable*/
> > + at91_sys_write(AT91_RSTC_MR, cfg->rstc_rmr);
> > +
> > +#ifdef CONFIG_SYS_MATRIX_MCFG_REMAP
> > + /* MATRIX_MCFG - REMAP all masters */
> > + at91_sys_write(AT91_MATRIX_MCFG0, 0x1FF);
> > +#endif
>
> if (IS_ENABLED(CONFIG_SYS_MATRIX_MCFG_REMAP))
>
> here as well?
Will delete this chunk, as there are no other references to SYS_MATRIX_MCFG_REMAP
Thanks for your feedback. Will post an updated patch set.
Sam
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 04/24] at91sam9263ek: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (2 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 03/24] arm: at91: add at91sam926x_board_init.h Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 05/24] at91sam9261ek, at91sam9g10ek: " Sam Ravnborg
` (19 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Move reset code to the board specific code.
This drops the dependency where mach-at91/ code
calls into the board code.
Drop the now (for this board) unessesary CONFIG select's
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/at91sam9263ek/lowlevel_init.c | 43 ++++++++++++++++++++-------
arch/arm/mach-at91/Kconfig | 3 +-
2 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/arch/arm/boards/at91sam9263ek/lowlevel_init.c b/arch/arm/boards/at91sam9263ek/lowlevel_init.c
index 2f8b312d3..70e0da3b1 100644
--- a/arch/arm/boards/at91sam9263ek/lowlevel_init.c
+++ b/arch/arm/boards/at91sam9263ek/lowlevel_init.c
@@ -4,21 +4,17 @@
* Under GPLv2
*/
-#include <common.h>
-#include <init.h>
-#include <mach/hardware.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91_lowlevel_init.h>
+#include <linux/sizes.h>
+
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam926x_board_init.h>
+#include <mach/at91sam9263_matrix.h>
#define MASTER_PLL_MUL 171
#define MASTER_PLL_DIV 14
-void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg)
+static void __bare_init at91sam9263ek_board_config(struct at91sam926x_board_cfg *cfg)
{
/* Disable Watchdog */
cfg->wdt_mr =
@@ -102,3 +98,28 @@ void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_c
AT91_RSTC_RSTTYP_WAKEUP |
AT91_RSTC_RSTTYP_WATCHDOG;
}
+
+static void __bare_init at91sam9263ek_init(void)
+{
+ struct at91sam926x_board_cfg cfg;
+
+ cfg.pio = IOMEM(AT91SAM9263_BASE_PIOD);
+ cfg.sdramc = IOMEM(AT91SAM9263_BASE_SDRAMC0);
+ cfg.ebi_pio_is_peripha = true;
+ cfg.matrix_csa = AT91_MATRIX_EBI0CSA;
+
+ at91sam9263ek_board_config(&cfg);
+ at91sam926x_board_init(&cfg);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1, at91_get_sdram_size(cfg.sdramc),
+ NULL);
+}
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9263_SRAM0_BASE + AT91SAM9263_SRAM0_SIZE - 16);
+
+ at91sam9263ek_init();
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 670ef1a39..e7b664e9a 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -442,8 +442,7 @@ config MACH_AT91SAM9263EK
bool "Atmel AT91SAM9263-EK"
select HAVE_NAND_ATMEL_BUSWIDTH_16
select HAVE_AT91_BOOTSTRAP
- select AT91SAM9263_LWL
- select AT91SAM926X_LWL
+ select AT91SAM926X_BOARD_INIT
help
Say y here if you are using Atmel's AT91SAM9263-EK Evaluation board
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 05/24] at91sam9261ek, at91sam9g10ek: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (3 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 04/24] at91sam9263ek: move reset vector to board code Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 06/24] pm9261: " Sam Ravnborg
` (18 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Move reset vector to board code and drop use
of arch/arm/mach-at91/at91sam9261_lowlevel_init.c.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/at91sam9261ek/Makefile | 2 +-
arch/arm/boards/at91sam9261ek/lowlevel_init.c | 41 ++++++++++++++++++++-------
arch/arm/mach-at91/Kconfig | 4 +--
3 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/arch/arm/boards/at91sam9261ek/Makefile b/arch/arm/boards/at91sam9261ek/Makefile
index 667095ae4..e7a9cde41 100644
--- a/arch/arm/boards/at91sam9261ek/Makefile
+++ b/arch/arm/boards/at91sam9261ek/Makefile
@@ -1,4 +1,4 @@
obj-y += init.o
-lwl-$(CONFIG_AT91SAM926X_LWL) += lowlevel_init.o
+lwl-y += lowlevel_init.o
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-at91sam9261ek
diff --git a/arch/arm/boards/at91sam9261ek/lowlevel_init.c b/arch/arm/boards/at91sam9261ek/lowlevel_init.c
index 056584166..c4e4957ca 100644
--- a/arch/arm/boards/at91sam9261ek/lowlevel_init.c
+++ b/arch/arm/boards/at91sam9261ek/lowlevel_init.c
@@ -4,16 +4,10 @@
* Under GPLv2
*/
-#include <common.h>
-#include <init.h>
-#include <mach/hardware.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91_lowlevel_init.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam926x_board_init.h>
+#include <mach/at91sam9261_matrix.h>
#define MASTER_CLOCK 200
@@ -25,7 +19,7 @@
#define MASTER_PLL_DIV 1
#endif
-void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg)
+static void __bare_init at91sam9261ek_board_config(struct at91sam926x_board_cfg *cfg)
{
/* Disable Watchdog */
cfg->wdt_mr =
@@ -106,3 +100,28 @@ void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_c
AT91_RSTC_RSTTYP_WAKEUP |
AT91_RSTC_RSTTYP_WATCHDOG;
}
+
+static void __bare_init at91sam9261ek_init(void)
+{
+ struct at91sam926x_board_cfg cfg;
+
+ cfg.pio = IOMEM(AT91SAM9261_BASE_PIOC);
+ cfg.sdramc = IOMEM(AT91SAM9261_BASE_SDRAMC);
+ cfg.ebi_pio_is_peripha = false;
+ cfg.matrix_csa = AT91_MATRIX_EBICSA;
+
+ at91sam9261ek_board_config(&cfg);
+ at91sam926x_board_init(&cfg);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1, at91_get_sdram_size(cfg.sdramc),
+ NULL);
+}
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9261_SRAM_BASE + AT91SAM9261_SRAM_SIZE - 16);
+
+ at91sam9261ek_init();
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index e7b664e9a..be2173185 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -336,8 +336,7 @@ config MACH_AT91SAM9261EK
select HAVE_AT91_DATAFLASH_CARD
select HAVE_NAND_ATMEL_BUSWIDTH_16
select HAVE_AT91_BOOTSTRAP
- select AT91SAM9261_LWL
- select AT91SAM926X_LWL
+ select AT91SAM926X_BOARD_INIT
help
Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.
<http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
@@ -366,7 +365,6 @@ config MACH_AT91SAM9G10EK
bool "Atmel AT91SAM9G10-EK Evaluation Kit"
select HAVE_NAND_ATMEL_BUSWIDTH_16
select HAS_DM9000
- select AT91SAM9261_LWL
help
Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit.
<http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588>
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 06/24] pm9261: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (4 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 05/24] at91sam9261ek, at91sam9g10ek: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 07/24] at91: drop unused at91sam9261_lowlevel_init Sam Ravnborg
` (17 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/pm9261/lowlevel_init.c | 39 +++++++++++++++++++++++++---------
arch/arm/mach-at91/Kconfig | 3 +--
2 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boards/pm9261/lowlevel_init.c b/arch/arm/boards/pm9261/lowlevel_init.c
index 91a64b415..a4cb8af69 100644
--- a/arch/arm/boards/pm9261/lowlevel_init.c
+++ b/arch/arm/boards/pm9261/lowlevel_init.c
@@ -4,22 +4,16 @@
* Under GPLv2
*/
-#include <common.h>
-#include <init.h>
-#include <mach/hardware.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91sam9_sdramc.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam926x_board_init.h>
#include <mach/at91sam9_matrix.h>
-#include <mach/at91_lowlevel_init.h>
#define MASTER_PLL_DIV 15
#define MASTER_PLL_MUL 162
#define MAIN_PLL_DIV 2
-void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg)
+static void __bare_init pm9261_board_config(struct at91sam926x_board_cfg *cfg)
{
/* Disable Watchdog */
cfg->wdt_mr =
@@ -100,3 +94,28 @@ void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_c
AT91_RSTC_RSTTYP_WAKEUP |
AT91_RSTC_RSTTYP_WATCHDOG;
}
+
+static void __bare_init pm9261_init(void)
+{
+ struct at91sam926x_board_cfg cfg;
+
+ cfg.pio = IOMEM(AT91SAM9261_BASE_PIOC);
+ cfg.sdramc = IOMEM(AT91SAM9261_BASE_SDRAMC);
+ cfg.ebi_pio_is_peripha = false;
+ cfg.matrix_csa = AT91_MATRIX_EBICSA;
+
+ pm9261_board_config(&cfg);
+ at91sam926x_board_init(&cfg);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1, at91_get_sdram_size(cfg.sdramc),
+ NULL);
+}
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9261_SRAM_BASE + AT91SAM9261_SRAM_SIZE - 16);
+
+ pm9261_init();
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index be2173185..14ea5e4e2 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -345,8 +345,7 @@ config MACH_PM9261
bool "Ronetix PM9261"
select HAS_DM9000
select HAVE_AT91_BOOTSTRAP
- select AT91SAM9261_LWL
- select AT91SAM926X_LWL
+ select AT91SAM926X_BOARD_INIT
help
Say y here if you are using the Ronetix PM9261 Board
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 07/24] at91: drop unused at91sam9261_lowlevel_init
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (5 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 06/24] pm9261: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 08/24] pm9263: move reset vector to board code Sam Ravnborg
` (16 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
All at91sam9261 based boards uses board specific
reset vectors so the mach-at91 provided version is
no longer in use.
Delete unused CONFIG symbols too.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/mach-at91/Kconfig | 2 --
arch/arm/mach-at91/Makefile | 1 -
arch/arm/mach-at91/at91sam9261_lowlevel_init.c | 48 --------------------------
3 files changed, 51 deletions(-)
delete mode 100644 arch/arm/mach-at91/at91sam9261_lowlevel_init.c
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 14ea5e4e2..ced75d762 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -45,8 +45,6 @@ config AT91SAM926X_LWL
# as implemented in the *lowlevel_init.c files
config AT91SAM9260_LWL
bool
-config AT91SAM9261_LWL
- bool
config AT91SAM9263_LWL
bool
config AT91SAM9G45_LWL
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 66b83000a..1c7921914 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -12,7 +12,6 @@ lwl-$(CONFIG_AT91SAM926X_LWL) += at91sam926x_lowlevel_init.o
lwl-$(CONFIG_AT91RM9200_LWL) += at91rm9200_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o
-lwl-$(CONFIG_AT91SAM9261_LWL) += at91sam9261_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9G45_LWL) += at91sam9g45_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9N12_LWL) += at91sam9n12_lowlevel_init.o
diff --git a/arch/arm/mach-at91/at91sam9261_lowlevel_init.c b/arch/arm/mach-at91/at91sam9261_lowlevel_init.c
deleted file mode 100644
index 0ad7f0a0c..000000000
--- a/arch/arm/mach-at91/at91sam9261_lowlevel_init.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
- */
-
-#define __LOWLEVEL_INIT__
-
-#include <common.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
-#include <asm/barebox-arm-head.h>
-#include <mach/hardware.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91_pio.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91_lowlevel_init.h>
-#include <mach/io.h>
-#include <init.h>
-#include <linux/sizes.h>
-
-void __bare_init at91sam9261_lowlevel_init(void)
-{
- struct at91sam926x_lowlevel_cfg cfg;
-
- cfg.pio = IOMEM(AT91SAM9261_BASE_PIOC);
- cfg.sdramc = IOMEM(AT91SAM9261_BASE_SDRAMC);
- cfg.ebi_pio_is_peripha = false;
- cfg.matrix_csa = AT91_MATRIX_EBICSA;
-
- at91sam926x_lowlevel_init(&cfg);
-
- barebox_arm_entry(AT91_CHIPSELECT_1, at91_get_sdram_size(cfg.sdramc),
- NULL);
-}
-
-void __naked __bare_init barebox_arm_reset_vector(void)
-{
- arm_cpu_lowlevel_init();
-
- arm_setup_stack(AT91SAM9261_SRAM_BASE + AT91SAM9261_SRAM_SIZE - 16);
-
- at91sam9261_lowlevel_init();
-}
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 08/24] pm9263: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (6 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 07/24] at91: drop unused at91sam9261_lowlevel_init Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 09/24] usb-a926x: " Sam Ravnborg
` (15 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/pm9263/lowlevel_init.c | 43 +++++++++++++++++++++++++---------
arch/arm/mach-at91/Kconfig | 3 +--
2 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/arch/arm/boards/pm9263/lowlevel_init.c b/arch/arm/boards/pm9263/lowlevel_init.c
index 6336d5106..6849f0a5b 100644
--- a/arch/arm/boards/pm9263/lowlevel_init.c
+++ b/arch/arm/boards/pm9263/lowlevel_init.c
@@ -4,22 +4,18 @@
* Under GPLv2
*/
-#include <common.h>
-#include <init.h>
-#include <mach/hardware.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91_lowlevel_init.h>
+#include <linux/sizes.h>
+
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam926x_board_init.h>
+#include <mach/at91sam9263_matrix.h>
#define MASTER_PLL_DIV 6
#define MASTER_PLL_MUL 65
#define MAIN_PLL_DIV 2 /* 2 or 4 */
-void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg)
+static void __bare_init pm9263_board_config(struct at91sam926x_board_cfg *cfg)
{
/* Disable Watchdog */
cfg->wdt_mr =
@@ -119,3 +115,28 @@ void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_c
AT91_RSTC_RSTTYP_WAKEUP |
AT91_RSTC_RSTTYP_WATCHDOG;
}
+
+static void __bare_init pm9263_board_init(void)
+{
+ struct at91sam926x_board_cfg cfg;
+
+ cfg.pio = IOMEM(AT91SAM9263_BASE_PIOD);
+ cfg.sdramc = IOMEM(AT91SAM9263_BASE_SDRAMC0);
+ cfg.ebi_pio_is_peripha = true;
+ cfg.matrix_csa = AT91_MATRIX_EBI0CSA;
+
+ pm9263_board_config(&cfg);
+ at91sam926x_board_init(&cfg);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1, at91_get_sdram_size(cfg.sdramc),
+ NULL);
+}
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9263_SRAM0_BASE + AT91SAM9263_SRAM0_SIZE - 16);
+
+ pm9263_board_init();
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index ced75d762..a622279d7 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -450,8 +450,7 @@ config MACH_MMCCPU
config MACH_PM9263
bool "Ronetix PM9263"
select HAVE_AT91_BOOTSTRAP
- select AT91SAM9263_LWL
- select AT91SAM926X_LWL
+ select AT91SAM926X_BOARD_INIT
help
Say y here if you are using the Ronetix PM9263 Board
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 09/24] usb-a926x: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (7 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 08/24] pm9263: move reset vector to board code Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 10/24] mmccpu: delete unused lowlevel_init Sam Ravnborg
` (14 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
For all Calao USB boards move reset vector to board code.
Introduce two different lowlevel.c files, one
for each processor.
Include a rename to make filenames similar.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/usb-a926x/Makefile | 4 +-
arch/arm/boards/usb-a926x/usb_a9260_lowlevel.c | 26 +++++++++++++
..._a9263_lowlevel_init.c => usb_a9263_lowlevel.c} | 43 ++++++++++++++++------
arch/arm/mach-at91/Kconfig | 5 +--
4 files changed, 62 insertions(+), 16 deletions(-)
create mode 100644 arch/arm/boards/usb-a926x/usb_a9260_lowlevel.c
rename arch/arm/boards/usb-a926x/{usb_a9263_lowlevel_init.c => usb_a9263_lowlevel.c} (76%)
diff --git a/arch/arm/boards/usb-a926x/Makefile b/arch/arm/boards/usb-a926x/Makefile
index a4eae1844..65cc4082f 100644
--- a/arch/arm/boards/usb-a926x/Makefile
+++ b/arch/arm/boards/usb-a926x/Makefile
@@ -2,6 +2,8 @@ obj-y += init.o
obj-$(CONFIG_AT91_BOOTSTRAP) += usb_a9263_bootstrap.o
-lwl-$(CONFIG_AT91SAM926X_LWL) += usb_a9263_lowlevel_init.o
+lwl-$(CONFIG_MACH_USB_A9260) += usb_a9260_lowlevel.o
+lwl-$(CONFIG_MACH_USB_A9G20) += usb_a9260_lowlevel.o
+lwl-$(CONFIG_MACH_USB_A9263) += usb_a9263_lowlevel.o
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-usb-a926x
diff --git a/arch/arm/boards/usb-a926x/usb_a9260_lowlevel.c b/arch/arm/boards/usb-a926x/usb_a9260_lowlevel.c
new file mode 100644
index 000000000..02896856d
--- /dev/null
+++ b/arch/arm/boards/usb-a926x/usb_a9260_lowlevel.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9260.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9260_SRAM_BASE + AT91SAM9260_SRAM_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1,
+ at91_get_sdram_size(IOMEM(AT91SAM9260_BASE_SDRAMC)),
+ NULL);
+}
diff --git a/arch/arm/boards/usb-a926x/usb_a9263_lowlevel_init.c b/arch/arm/boards/usb-a926x/usb_a9263_lowlevel.c
similarity index 76%
rename from arch/arm/boards/usb-a926x/usb_a9263_lowlevel_init.c
rename to arch/arm/boards/usb-a926x/usb_a9263_lowlevel.c
index f6dc58e3f..066452b95 100644
--- a/arch/arm/boards/usb-a926x/usb_a9263_lowlevel_init.c
+++ b/arch/arm/boards/usb-a926x/usb_a9263_lowlevel.c
@@ -4,16 +4,12 @@
* Under GPLv2
*/
-#include <common.h>
-#include <init.h>
-#include <mach/hardware.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91_lowlevel_init.h>
+#include <linux/sizes.h>
+
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam926x_board_init.h>
+#include <mach/at91sam9263_matrix.h>
#define MASTER_CLOCK 180
@@ -24,7 +20,7 @@
#endif
#define MASTER_PLL_DIV 6
-void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg)
+static void __bare_init usb_a9263_board_config(struct at91sam926x_board_cfg *cfg)
{
/* Disable Watchdog */
cfg->wdt_mr =
@@ -109,3 +105,28 @@ void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_c
AT91_RSTC_RSTTYP_WAKEUP |
AT91_RSTC_RSTTYP_WATCHDOG;
}
+
+static void __bare_init usb_a9263_init(void)
+{
+ struct at91sam926x_board_cfg cfg;
+
+ cfg.pio = IOMEM(AT91SAM9263_BASE_PIOD);
+ cfg.sdramc = IOMEM(AT91SAM9263_BASE_SDRAMC0);
+ cfg.ebi_pio_is_peripha = true;
+ cfg.matrix_csa = AT91_MATRIX_EBI0CSA;
+
+ usb_a9263_board_config(&cfg);
+ at91sam926x_board_init(&cfg);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1, at91_get_sdram_size(cfg.sdramc),
+ NULL);
+}
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9263_SRAM0_BASE + AT91SAM9263_SRAM0_SIZE - 16);
+
+ usb_a9263_init();
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index a622279d7..306f82497 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -305,7 +305,6 @@ config MACH_TNY_A9260
config MACH_USB_A9260
bool "CALAO USB-A9260"
select SUPPORT_CALAO_DAB_MMX
- select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems USB-A9260.
<http://www.calao-systems.com>
@@ -396,7 +395,6 @@ config MACH_TNY_A9G20
config MACH_USB_A9G20
bool "CALAO USB-A9G20"
select SUPPORT_CALAO_DAB_MMX
- select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems USB-A9G20.
<http://www.calao-systems.com>
@@ -466,8 +464,7 @@ config MACH_TNY_A9263
config MACH_USB_A9263
bool "CALAO USB-A9263"
select HAVE_AT91_BOOTSTRAP
- select AT91SAM9263_LWL
- select AT91SAM926X_LWL
+ select AT91SAM926X_BOARD_INIT
help
Select this if you are using a Calao Systems USB-A9263.
<http://www.calao-systems.com>
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 10/24] mmccpu: delete unused lowlevel_init
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (8 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 09/24] usb-a926x: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 11/24] mmccpu: move reset vector to board code Sam Ravnborg
` (13 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/mmccpu/Makefile | 3 -
arch/arm/boards/mmccpu/lowlevel_init.c | 135 ---------------------------------
2 files changed, 138 deletions(-)
delete mode 100644 arch/arm/boards/mmccpu/lowlevel_init.c
diff --git a/arch/arm/boards/mmccpu/Makefile b/arch/arm/boards/mmccpu/Makefile
index d8289a341..eb072c016 100644
--- a/arch/arm/boards/mmccpu/Makefile
+++ b/arch/arm/boards/mmccpu/Makefile
@@ -1,4 +1 @@
obj-y += init.o
-
-# Not used, documented by a lwl-n assignment
-lwl-n += lowlevel_init.o
diff --git a/arch/arm/boards/mmccpu/lowlevel_init.c b/arch/arm/boards/mmccpu/lowlevel_init.c
deleted file mode 100644
index c193eae58..000000000
--- a/arch/arm/boards/mmccpu/lowlevel_init.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
- */
-
-#include <common.h>
-#include <init.h>
-#include <mach/hardware.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91_lowlevel_init.h>
-
-#define MASTER_PLL_MUL 54
-#define MASTER_PLL_DIV 4
-
-void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg)
-{
- /* Disable Watchdog */
- cfg->wdt_mr =
- AT91_WDT_WDIDLEHLT | AT91_WDT_WDDBGHLT |
- AT91_WDT_WDV |
- AT91_WDT_WDDIS |
- AT91_WDT_WDD;
-
- /* define PDC[31:16] as DATA[31:16] */
- cfg->ebi_pio_pdr = 0xFFFF0000;
- /* no pull-up for D[31:16] */
- cfg->ebi_pio_ppudr = 0xFFFF0000;
- /* EBI0_CSA, CS1 SDRAM, CS3 NAND Flash, 3.3V memories */
- cfg->ebi_csa =
- AT91_MATRIX_EBI0_DBPUC | AT91_MATRIX_EBI0_VDDIOMSEL_1_8V |
- AT91_MATRIX_EBI0_CS1A_SDRAMC |
- AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA;
-
- cfg->smc_cs = 0;
-#if 1
- cfg->smc_mode =
- AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
- AT91_SMC_DBW_16 |
- AT91_SMC_TDFMODE |
- AT91_SMC_TDF_(6);
- cfg->smc_cycle =
- AT91_SMC_NWECYCLE_(16) | AT91_SMC_NRDCYCLE_(16);
- cfg->smc_pulse =
- AT91_SMC_NWEPULSE_(5) | AT91_SMC_NCS_WRPULSE_(7) |
- AT91_SMC_NRDPULSE_(5) | AT91_SMC_NCS_RDPULSE_(13);
- cfg->smc_setup =
- AT91_SMC_NWESETUP_(3) | AT91_SMC_NCS_WRSETUP_(2) |
- AT91_SMC_NRDSETUP_(8) | AT91_SMC_NCS_RDSETUP_(0);
-#elif 0 /* slow setup */
- cfg->smc_mode =
- AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
- AT91_SMC_DBW_16 |
- AT91_SMC_TDFMODE |
- AT91_SMC_TDF_(1);
- cfg->smc_cycle =
- AT91_SMC_NWECYCLE_(0xd00) | AT91_SMC_NRDCYCLE_(0xd00);
- cfg->smc_pulse =
- AT91_SMC_NWEPULSE_(5) | AT91_SMC_NCS_WRPULSE_(7) |
- AT91_SMC_NRDPULSE_(5) | AT91_SMC_NCS_RDPULSE_(13);
- cfg->smc_setup =
- AT91_SMC_NWESETUP_(3) | AT91_SMC_NCS_WRSETUP_(2) |
- AT91_SMC_NRDSETUP_(8) | AT91_SMC_NCS_RDSETUP_(0);
-#else /* RONETIX' original values */
- cfg->smc_mode =
- AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
- AT91_SMC_DBW_16 |
- AT91_SMC_TDFMODE |
- AT91_SMC_TDF_(6);
- cfg->smc_cycle =
- AT91_SMC_NWECYCLE_(22) | AT91_SMC_NRDCYCLE_(22);
- cfg->smc_pulse =
- AT91_SMC_NWEPULSE_(11) | AT91_SMC_NCS_WRPULSE_(11) |
- AT91_SMC_NRDPULSE_(11) | AT91_SMC_NCS_RDPULSE_(11);
- cfg->smc_setup =
- AT91_SMC_NWESETUP_(10) | AT91_SMC_NCS_WRSETUP_(10) |
- AT91_SMC_NRDSETUP_(10) | AT91_SMC_NCS_RDSETUP_(10);
-#endif
-
- cfg->pmc_mor =
- AT91_PMC_MOSCEN |
- (255 << 8); /* Main Oscillator Start-up Time */
- cfg->pmc_pllar =
- AT91_PMC_PLLA_WR_ERRATA | /* Bit 29 must be 1 when prog */
- AT91_PMC_OUT |
- AT91_PMC_PLLCOUNT | /* PLL Counter */
- (2 << 28) | /* PLL Clock Frequency Range */
- ((MASTER_PLL_MUL - 1) << 16) | (MASTER_PLL_DIV);
- /* PCK/2 = MCK Master Clock from PLLA */
- cfg->pmc_mckr1 =
- AT91_PMC_CSS_SLOW |
- AT91_PMC_PRES_1 |
- AT91SAM9_PMC_MDIV_2 |
- AT91_PMC_PDIV_1;
- /* PCK/2 = MCK Master Clock from PLLA */
- cfg->pmc_mckr2 =
- AT91_PMC_CSS_PLLA |
- AT91_PMC_PRES_1 |
- AT91SAM9_PMC_MDIV_2 |
- AT91_PMC_PDIV_1;
-
- /* SDRAM */
- /* SDRAMC_TR - Refresh Timer register */
- cfg->sdrc_tr1 = 0x13C;
- /* SDRAMC_CR - Configuration register*/
- cfg->sdrc_cr =
- AT91_SDRAMC_NC_9 |
- AT91_SDRAMC_NR_13 |
- AT91_SDRAMC_NB_4 |
- AT91_SDRAMC_CAS_3 |
- AT91_SDRAMC_DBW_32 |
- (2 << 8) | /* tWR - Write Recovery Delay */
- (8 << 12) | /* tRC - Row Cycle Delay */
- (2 << 16) | /* tRP - Row Precharge Delay */
- (2 << 20) | /* tRCD - Row to Column Delay */
- (5 << 24) | /* tRAS - Active to Precharge Delay */
- (12 << 28); /* tXSR - Exit Self Refresh to Active Delay */
-
- /* Memory Device Register -> SDRAM */
- cfg->sdrc_mdr = AT91_SDRAMC_MD_SDRAM;
- /* SDRAM_TR */
- cfg->sdrc_tr2 = 780;
-
- /* user reset enable */
- cfg->rstc_rmr =
- AT91_RSTC_KEY |
- AT91_RSTC_PROCRST |
- AT91_RSTC_RSTTYP_WAKEUP |
- AT91_RSTC_RSTTYP_WATCHDOG;
-}
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 11/24] mmccpu: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (9 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 10/24] mmccpu: delete unused lowlevel_init Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 12/24] tny-a926x: delete unused tny_a9263_lowlevel_init.c Sam Ravnborg
` (12 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Introduce lowlevel.c to hold the reser vector code for the board.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/mmccpu/Makefile | 2 ++
arch/arm/boards/mmccpu/lowlevel.c | 26 ++++++++++++++++++++++++++
arch/arm/mach-at91/Kconfig | 1 -
3 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boards/mmccpu/lowlevel.c
diff --git a/arch/arm/boards/mmccpu/Makefile b/arch/arm/boards/mmccpu/Makefile
index eb072c016..e11fd5b69 100644
--- a/arch/arm/boards/mmccpu/Makefile
+++ b/arch/arm/boards/mmccpu/Makefile
@@ -1 +1,3 @@
obj-y += init.o
+
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/mmccpu/lowlevel.c b/arch/arm/boards/mmccpu/lowlevel.c
new file mode 100644
index 000000000..3ba24ce4c
--- /dev/null
+++ b/arch/arm/boards/mmccpu/lowlevel.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9263.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9263_SRAM0_BASE + AT91SAM9263_SRAM0_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1,
+ at91_get_sdram_size(IOMEM(AT91SAM9263_BASE_SDRAMC0)),
+ NULL);
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 306f82497..4dd608f0e 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -441,7 +441,6 @@ config MACH_AT91SAM9263EK
config MACH_MMCCPU
bool "Bucyrus MMC-CPU"
- select AT91SAM9263_LWL
help
Say y here if you are using the Bucyrus MMC-CPU
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 12/24] tny-a926x: delete unused tny_a9263_lowlevel_init.c
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (10 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 11/24] mmccpu: move reset vector to board code Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 13/24] tny-a926x: move reset vector to board code Sam Ravnborg
` (11 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/tny-a926x/Makefile | 3 -
.../arm/boards/tny-a926x/tny_a9263_lowlevel_init.c | 107 ---------------------
2 files changed, 110 deletions(-)
delete mode 100644 arch/arm/boards/tny-a926x/tny_a9263_lowlevel_init.c
diff --git a/arch/arm/boards/tny-a926x/Makefile b/arch/arm/boards/tny-a926x/Makefile
index 24bbf2356..49e0d4649 100644
--- a/arch/arm/boards/tny-a926x/Makefile
+++ b/arch/arm/boards/tny-a926x/Makefile
@@ -2,7 +2,4 @@ obj-y += init.o
obj-$(CONFIG_AT91_BOOTSTRAP) += tny_a9263_bootstrap.o
-# Not used, documented with a lwl-n assignment
-lwl-n += tny_a9263_lowlevel_init.o
-
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-tny-a926x
diff --git a/arch/arm/boards/tny-a926x/tny_a9263_lowlevel_init.c b/arch/arm/boards/tny-a926x/tny_a9263_lowlevel_init.c
deleted file mode 100644
index 1b146da62..000000000
--- a/arch/arm/boards/tny-a926x/tny_a9263_lowlevel_init.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
- */
-
-#include <common.h>
-#include <init.h>
-#include <mach/hardware.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91_lowlevel_init.h>
-
-#define MASTER_CLOCK 180
-
-#if MASTER_CLOCK == 200
-#define MASTER_PLL_MUL 100
-#else
-#define MASTER_PLL_MUL 90
-#endif
-#define MASTER_PLL_DIV 6
-
-void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg)
-{
- /* Disable Watchdog */
- cfg->wdt_mr =
- AT91_WDT_WDIDLEHLT | AT91_WDT_WDDBGHLT |
- AT91_WDT_WDV |
- AT91_WDT_WDDIS |
- AT91_WDT_WDD;
-
- /* define PDC[31:16] as DATA[31:16] */
- cfg->ebi_pio_pdr = 0xFFFF0000;
- /* no pull-up for D[31:16] */
- cfg->ebi_pio_ppudr = 0xFFFF0000;
- /* EBI0_CSA, CS1 SDRAM, CS3 NAND Flash, 3.3V memories */
- cfg->ebi_csa =
- AT91_MATRIX_EBI0_DBPUC | AT91_MATRIX_EBI0_VDDIOMSEL_3_3V |
- AT91_MATRIX_EBI0_CS1A_SDRAMC;
-
- cfg->smc_cs = 3;
- cfg->smc_mode =
- AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
- AT91_SMC_DBW_8 |
- AT91_SMC_EXNWMODE_DISABLE |
- AT91_SMC_TDF_(2);
- cfg->smc_cycle =
- AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5);
- cfg->smc_pulse =
- AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) |
- AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3);
- cfg->smc_setup =
- AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) |
- AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0);
-
- cfg->pmc_mor = AT91_PMC_OSCBYPASS;
- cfg->pmc_pllar =
- AT91_PMC_PLLA_WR_ERRATA | /* Bit 29 must be 1 when prog */
- AT91_PMC_PLLCOUNT | /* PLL Counter */
- (0 << 28) | /* PLL Clock Frequency Range */
- ((MASTER_PLL_MUL - 1) << 16) | (MASTER_PLL_DIV);
- /* PCK/2 = MCK Master Clock from PLLA */
- cfg->pmc_mckr1 =
- AT91_PMC_CSS_SLOW |
- AT91_PMC_PRES_1 |
- AT91SAM9_PMC_MDIV_2 |
- AT91_PMC_PDIV_1;
- /* PCK/2 = MCK Master Clock from PLLA */
- cfg->pmc_mckr2 =
- AT91_PMC_CSS_PLLA |
- AT91_PMC_PRES_1 |
- AT91SAM9_PMC_MDIV_2 |
- AT91_PMC_PDIV_1;
-
- /* SDRAM */
- /* SDRAMC_TR - Refresh Timer register */
- cfg->sdrc_tr1 = 0x13C;
- /* SDRAMC_CR - Configuration register*/
- cfg->sdrc_cr =
- AT91_SDRAMC_NR_13 |
- AT91_SDRAMC_NC_9 |
- AT91_SDRAMC_NB_4 |
- AT91_SDRAMC_CAS_2 |
- AT91_SDRAMC_DBW_32 |
- (2 << 8) | /* Write Recovery Delay */
- (7 << 12) | /* Row Cycle Delay */
- (2 << 16) | /* Row Precharge Delay */
- (2 << 20) | /* Row to Column Delay */
- (5 << 24) | /* Active to Precharge Delay */
- (8 << 28); /* Exit Self Refresh to Active Delay */
-
- /* Memory Device Register -> SDRAM */
- cfg->sdrc_mdr = AT91_SDRAMC_MD_SDRAM;
- /* SDRAM_TR */
- cfg->sdrc_tr2 = (MASTER_CLOCK * 7);
-
- /* user reset enable */
- cfg->rstc_rmr =
- AT91_RSTC_KEY |
- AT91_RSTC_PROCRST |
- AT91_RSTC_RSTTYP_WAKEUP |
- AT91_RSTC_RSTTYP_WATCHDOG;
-}
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 13/24] tny-a926x: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (11 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 12/24] tny-a926x: delete unused tny_a9263_lowlevel_init.c Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 14/24] qil-a926x: " Sam Ravnborg
` (10 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Create two files (one for each CPU type) that
contains the reset vector.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/tny-a926x/Makefile | 4 ++++
arch/arm/boards/tny-a926x/tny_a9260_lowlevel.c | 26 ++++++++++++++++++++++++++
arch/arm/boards/tny-a926x/tny_a9263_lowlevel.c | 26 ++++++++++++++++++++++++++
arch/arm/mach-at91/Kconfig | 3 ---
4 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 arch/arm/boards/tny-a926x/tny_a9260_lowlevel.c
create mode 100644 arch/arm/boards/tny-a926x/tny_a9263_lowlevel.c
diff --git a/arch/arm/boards/tny-a926x/Makefile b/arch/arm/boards/tny-a926x/Makefile
index 49e0d4649..a96d02061 100644
--- a/arch/arm/boards/tny-a926x/Makefile
+++ b/arch/arm/boards/tny-a926x/Makefile
@@ -2,4 +2,8 @@ obj-y += init.o
obj-$(CONFIG_AT91_BOOTSTRAP) += tny_a9263_bootstrap.o
+lwl-$(CONFIG_MACH_TNY_A9260) += tny_a9260_lowlevel.o
+lwl-$(CONFIG_MACH_TNY_A9G20) += tny_a9260_lowlevel.o
+lwl-$(CONFIG_MACH_TNY_A9263) += tny_a9263_lowlevel.o
+
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-tny-a926x
diff --git a/arch/arm/boards/tny-a926x/tny_a9260_lowlevel.c b/arch/arm/boards/tny-a926x/tny_a9260_lowlevel.c
new file mode 100644
index 000000000..02896856d
--- /dev/null
+++ b/arch/arm/boards/tny-a926x/tny_a9260_lowlevel.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9260.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9260_SRAM_BASE + AT91SAM9260_SRAM_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1,
+ at91_get_sdram_size(IOMEM(AT91SAM9260_BASE_SDRAMC)),
+ NULL);
+}
diff --git a/arch/arm/boards/tny-a926x/tny_a9263_lowlevel.c b/arch/arm/boards/tny-a926x/tny_a9263_lowlevel.c
new file mode 100644
index 000000000..3ba24ce4c
--- /dev/null
+++ b/arch/arm/boards/tny-a926x/tny_a9263_lowlevel.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9263.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9263_SRAM0_BASE + AT91SAM9263_SRAM0_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1,
+ at91_get_sdram_size(IOMEM(AT91SAM9263_BASE_SDRAMC0)),
+ NULL);
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 4dd608f0e..2410ff8a9 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -297,7 +297,6 @@ config MACH_QIL_A9260
config MACH_TNY_A9260
bool "CALAO TNY-A9260"
select SUPPORT_CALAO_MOB_TNY_MD2
- select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems TNY-A9260.
<http://www.calao-systems.com>
@@ -387,7 +386,6 @@ config MACH_AT91SAM9G20EK
config MACH_TNY_A9G20
select SUPPORT_CALAO_MOB_TNY_MD2
bool "CALAO TNY-A9G20"
- select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems TNY-A9G20.
<http://www.calao-systems.com>
@@ -455,7 +453,6 @@ config MACH_TNY_A9263
bool "CALAO TNY-A9263"
select SUPPORT_CALAO_MOB_TNY_MD2
select HAVE_AT91_BOOTSTRAP
- select AT91SAM9263_LWL
help
Select this if you are using a Calao Systems TNY-A9263.
<http://www.calao-systems.com>
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 14/24] qil-a926x: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (12 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 13/24] tny-a926x: move reset vector to board code Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 15/24] haba-knx: " Sam Ravnborg
` (9 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Create new file lowlevel.c that contains the reset vector.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/qil-a926x/Makefile | 3 +++
arch/arm/boards/qil-a926x/lowlevel.c | 26 ++++++++++++++++++++++++++
arch/arm/mach-at91/Kconfig | 2 --
3 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/boards/qil-a926x/lowlevel.c
diff --git a/arch/arm/boards/qil-a926x/Makefile b/arch/arm/boards/qil-a926x/Makefile
index 0c7bc3f04..82e46b369 100644
--- a/arch/arm/boards/qil-a926x/Makefile
+++ b/arch/arm/boards/qil-a926x/Makefile
@@ -1,2 +1,5 @@
obj-y += init.o
+
+lwl-y += lowlevel.o
+
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-qil-a926x
diff --git a/arch/arm/boards/qil-a926x/lowlevel.c b/arch/arm/boards/qil-a926x/lowlevel.c
new file mode 100644
index 000000000..02896856d
--- /dev/null
+++ b/arch/arm/boards/qil-a926x/lowlevel.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9260.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9260_SRAM_BASE + AT91SAM9260_SRAM_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1,
+ at91_get_sdram_size(IOMEM(AT91SAM9260_BASE_SDRAMC)),
+ NULL);
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 2410ff8a9..1604b8d43 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -289,7 +289,6 @@ config MACH_AT91SAM9260EK
config MACH_QIL_A9260
bool "CALAO QIL-A9260 board"
- select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems QIL-A9260 Board.
<http://www.calao-systems.com>
@@ -407,7 +406,6 @@ config MACH_DSS11
config MACH_QIL_A9G20
bool "CALAO QIL-A9G20 board"
- select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems QIL-A9G20 Board.
<http://www.calao-systems.com>
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 15/24] haba-knx: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (13 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 14/24] qil-a926x: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 16/24] sama5d{3, 4}{xek, xplained}: " Sam Ravnborg
` (8 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Create new file lowlevel.c that contains the reset vector.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/haba-knx/Makefile | 3 +++
arch/arm/boards/haba-knx/lowlevel.c | 26 ++++++++++++++++++++++++++
arch/arm/mach-at91/Kconfig | 1 -
3 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boards/haba-knx/lowlevel.c
diff --git a/arch/arm/boards/haba-knx/Makefile b/arch/arm/boards/haba-knx/Makefile
index d9db6aba6..b1c469dcf 100644
--- a/arch/arm/boards/haba-knx/Makefile
+++ b/arch/arm/boards/haba-knx/Makefile
@@ -1,2 +1,5 @@
obj-y += init.o
+
+lwl-y += lowlevel.o
+
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-haba-knx
diff --git a/arch/arm/boards/haba-knx/lowlevel.c b/arch/arm/boards/haba-knx/lowlevel.c
new file mode 100644
index 000000000..02896856d
--- /dev/null
+++ b/arch/arm/boards/haba-knx/lowlevel.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9260.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9260_SRAM_BASE + AT91SAM9260_SRAM_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1,
+ at91_get_sdram_size(IOMEM(AT91SAM9260_BASE_SDRAMC)),
+ NULL);
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 1604b8d43..4ca99282a 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -412,7 +412,6 @@ config MACH_QIL_A9G20
config MACH_HABA_KNX_LITE
bool "CALAO HABA-KNX-LITE"
- select AT91SAM9260_LWL
help
Select this if you are using a Calao Systems HABA-KNX-LITE.
<http://www.calao-systems.com>
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 16/24] sama5d{3, 4}{xek, xplained}: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (14 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 15/24] haba-knx: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 17/24] at91sam9n12ek: " Sam Ravnborg
` (7 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Include deletion of now unused sama5d3_lowlevel_init.c
and related CONFIG symbols
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/sama5d3_xplained/Makefile | 1 +
.../sama5d3_xplained/lowlevel.c} | 10 ++++------
arch/arm/boards/sama5d3xek/Makefile | 1 +
arch/arm/boards/sama5d3xek/lowlevel.c | 23 ++++++++++++++++++++++
arch/arm/boards/sama5d4_xplained/Makefile | 1 +
arch/arm/boards/sama5d4_xplained/lowlevel.c | 23 ++++++++++++++++++++++
arch/arm/boards/sama5d4ek/Makefile | 1 +
arch/arm/boards/sama5d4ek/lowlevel.c | 23 ++++++++++++++++++++++
arch/arm/mach-at91/Kconfig | 8 --------
arch/arm/mach-at91/Makefile | 2 --
10 files changed, 77 insertions(+), 16 deletions(-)
rename arch/arm/{mach-at91/sama5d3_lowlevel_init.c => boards/sama5d3_xplained/lowlevel.c} (86%)
create mode 100644 arch/arm/boards/sama5d3xek/lowlevel.c
create mode 100644 arch/arm/boards/sama5d4_xplained/lowlevel.c
create mode 100644 arch/arm/boards/sama5d4ek/lowlevel.c
diff --git a/arch/arm/boards/sama5d3_xplained/Makefile b/arch/arm/boards/sama5d3_xplained/Makefile
index 3c301cb0c..fc6d83be8 100644
--- a/arch/arm/boards/sama5d3_xplained/Makefile
+++ b/arch/arm/boards/sama5d3_xplained/Makefile
@@ -1,2 +1,3 @@
obj-y += init.o
+lwl-y += lowlevel.o
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-sama5d3_xplained
diff --git a/arch/arm/mach-at91/sama5d3_lowlevel_init.c b/arch/arm/boards/sama5d3_xplained/lowlevel.c
similarity index 86%
rename from arch/arm/mach-at91/sama5d3_lowlevel_init.c
rename to arch/arm/boards/sama5d3_xplained/lowlevel.c
index 01d28514d..161b473a7 100644
--- a/arch/arm/mach-at91/sama5d3_lowlevel_init.c
+++ b/arch/arm/boards/sama5d3_xplained/lowlevel.c
@@ -4,16 +4,14 @@
* Under GPLv2
*/
-#define __LOWLEVEL_INIT__
-
#include <common.h>
-#include <linux/sizes.h>
#include <init.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
+
#include <asm/barebox-arm-head.h>
-#include <mach/hardware.h>
+#include <asm/barebox-arm.h>
+
#include <mach/at91sam9_ddrsdr.h>
+#include <mach/hardware.h>
void __naked __bare_init barebox_arm_reset_vector(void)
{
diff --git a/arch/arm/boards/sama5d3xek/Makefile b/arch/arm/boards/sama5d3xek/Makefile
index 32dcb4283..6ed914fc0 100644
--- a/arch/arm/boards/sama5d3xek/Makefile
+++ b/arch/arm/boards/sama5d3xek/Makefile
@@ -1,3 +1,4 @@
obj-y += init.o
obj-$(CONFIG_W1) += hw_version.o
+lwl-y += lowlevel.o
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-sama5d3xek
diff --git a/arch/arm/boards/sama5d3xek/lowlevel.c b/arch/arm/boards/sama5d3xek/lowlevel.c
new file mode 100644
index 000000000..161b473a7
--- /dev/null
+++ b/arch/arm/boards/sama5d3xek/lowlevel.c
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_ddrsdr.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(SAMA5D3_SRAM_BASE + SAMA5D3_SRAM_SIZE - 16);
+
+ barebox_arm_entry(SAMA5_DDRCS, at91sama5_get_ddram_size(), NULL);
+}
diff --git a/arch/arm/boards/sama5d4_xplained/Makefile b/arch/arm/boards/sama5d4_xplained/Makefile
index 44550f528..8873dfc22 100644
--- a/arch/arm/boards/sama5d4_xplained/Makefile
+++ b/arch/arm/boards/sama5d4_xplained/Makefile
@@ -1 +1,2 @@
obj-y += sama5d4_xplained.o
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/sama5d4_xplained/lowlevel.c b/arch/arm/boards/sama5d4_xplained/lowlevel.c
new file mode 100644
index 000000000..161b473a7
--- /dev/null
+++ b/arch/arm/boards/sama5d4_xplained/lowlevel.c
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_ddrsdr.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(SAMA5D3_SRAM_BASE + SAMA5D3_SRAM_SIZE - 16);
+
+ barebox_arm_entry(SAMA5_DDRCS, at91sama5_get_ddram_size(), NULL);
+}
diff --git a/arch/arm/boards/sama5d4ek/Makefile b/arch/arm/boards/sama5d4ek/Makefile
index 4363b3924..152750bbe 100644
--- a/arch/arm/boards/sama5d4ek/Makefile
+++ b/arch/arm/boards/sama5d4ek/Makefile
@@ -1 +1,2 @@
obj-y += sama5d4ek.o
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/sama5d4ek/lowlevel.c b/arch/arm/boards/sama5d4ek/lowlevel.c
new file mode 100644
index 000000000..161b473a7
--- /dev/null
+++ b/arch/arm/boards/sama5d4ek/lowlevel.c
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_ddrsdr.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(SAMA5D3_SRAM_BASE + SAMA5D3_SRAM_SIZE - 16);
+
+ barebox_arm_entry(SAMA5_DDRCS, at91sama5_get_ddram_size(), NULL);
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 4ca99282a..991600fe4 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -53,10 +53,6 @@ config AT91SAM9N12_LWL
bool
config AT91RM9200_LWL
bool
-config SAMA5D3_LWL
- bool
-config SAMA5D4_LWL
- bool
config AT91SAM9_SMC
bool
@@ -522,13 +518,11 @@ choice
config MACH_SAMA5D3XEK
bool "Atmel SAMA5D3X Evaluation Kit"
- select SAMA5D3_LWL
help
Select this if you are using Atmel's SAMA5D3X-EK Evaluation Kit.
config MACH_SAMA5D3_XPLAINED
bool "Atmel SAMA5D3_XPLAINED Evaluation Kit"
- select SAMA5D3_LWL
help
Select this if you are using Atmel's SAMA5D3_XPLAINED Evaluation Kit.
@@ -545,13 +539,11 @@ choice
config MACH_SAMA5D4EK
bool "Atmel SAMA5D4 Evaluation Kit"
- select SAMA5D4_LWL
help
Select this if you are using Atmel's SAMA5D4-EK Evaluation Kit.
config MACH_SAMA5D4_XPLAINED
bool "Atmel SAMA5D4 XPLAINED ULTRA Evaluation Kit"
- select SAMA5D4_LWL
help
Select this if you are using Atmel's SAMA5D4_XPLAINED ULTRA Evaluation Kit.
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 1c7921914..cb8dade6d 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -15,8 +15,6 @@ lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9G45_LWL) += at91sam9g45_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9N12_LWL) += at91sam9n12_lowlevel_init.o
-lwl-$(CONFIG_SAMA5D3_LWL) += sama5d3_lowlevel_init.o
-lwl-$(CONFIG_SAMA5D4_LWL) += sama5d3_lowlevel_init.o
obj-$(CONFIG_AT91SAM9_RESET) += at91sam9_reset.o
obj-$(CONFIG_AT91SAM9G45_RESET) += at91sam9g45_reset.o
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 17/24] at91sam9n12ek: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (15 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 16/24] sama5d{3, 4}{xek, xplained}: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 18/24] at91sam9260ek, at91sam9g20ek: " Sam Ravnborg
` (6 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Delete the unused at91sam9n12_lowlevel_init.c
Create new lowlevel.c that contains the reset vector.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/at91sam9n12ek/Makefile | 3 +++
.../at91sam9n12ek/lowlevel.c} | 13 +++++--------
arch/arm/mach-at91/Kconfig | 3 ---
arch/arm/mach-at91/Makefile | 1 -
4 files changed, 8 insertions(+), 12 deletions(-)
rename arch/arm/{mach-at91/at91sam9n12_lowlevel_init.c => boards/at91sam9n12ek/lowlevel.c} (84%)
diff --git a/arch/arm/boards/at91sam9n12ek/Makefile b/arch/arm/boards/at91sam9n12ek/Makefile
index f5d125a0e..458b05591 100644
--- a/arch/arm/boards/at91sam9n12ek/Makefile
+++ b/arch/arm/boards/at91sam9n12ek/Makefile
@@ -1,2 +1,5 @@
obj-y += init.o
+
+lwl-y += lowlevel.o
+
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-at91sam9n12ek
diff --git a/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c b/arch/arm/boards/at91sam9n12ek/lowlevel.c
similarity index 84%
rename from arch/arm/mach-at91/at91sam9n12_lowlevel_init.c
rename to arch/arm/boards/at91sam9n12ek/lowlevel.c
index 2b5cb158b..3c5234eb5 100644
--- a/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c
+++ b/arch/arm/boards/at91sam9n12ek/lowlevel.c
@@ -4,17 +4,14 @@
* Under GPLv2
*/
-#define __LOWLEVEL_INIT__
-
#include <common.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
+#include <init.h>
+
#include <asm/barebox-arm-head.h>
-#include <mach/hardware.h>
-#include <mach/io.h>
+#include <asm/barebox-arm.h>
+
#include <mach/at91sam9_ddrsdr.h>
-#include <init.h>
-#include <linux/sizes.h>
+#include <mach/hardware.h>
void __naked __bare_init barebox_arm_reset_vector(void)
{
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 991600fe4..94d85dbcf 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -49,8 +49,6 @@ config AT91SAM9263_LWL
bool
config AT91SAM9G45_LWL
bool
-config AT91SAM9N12_LWL
- bool
config AT91RM9200_LWL
bool
@@ -501,7 +499,6 @@ choice
config MACH_AT91SAM9N12EK
bool "Atmel AT91SAM9N12 Evaluation Kit"
- select AT91SAM9N12_LWL
help
Select this if you are using Atmel's AT91SAM9N12-EK Evaluation Kit.
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index cb8dade6d..b51f1873b 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -14,7 +14,6 @@ lwl-$(CONFIG_AT91RM9200_LWL) += at91rm9200_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9G45_LWL) += at91sam9g45_lowlevel_init.o
-lwl-$(CONFIG_AT91SAM9N12_LWL) += at91sam9n12_lowlevel_init.o
obj-$(CONFIG_AT91SAM9_RESET) += at91sam9_reset.o
obj-$(CONFIG_AT91SAM9G45_RESET) += at91sam9g45_reset.o
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 18/24] at91sam9260ek, at91sam9g20ek: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (16 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 17/24] at91sam9n12ek: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 19/24] at91sam9m10g45ek, at91sam9m10ihd, pm9g45: " Sam Ravnborg
` (5 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Create new lowlevel.c that contains the reset vector.
Drop unused CONFIG symbols
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/at91sam9260ek/Makefile | 3 +++
arch/arm/boards/at91sam9260ek/lowlevel.c | 26 ++++++++++++++++++++++++++
arch/arm/mach-at91/Kconfig | 2 --
3 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/boards/at91sam9260ek/lowlevel.c
diff --git a/arch/arm/boards/at91sam9260ek/Makefile b/arch/arm/boards/at91sam9260ek/Makefile
index 6e07f189f..9cc933a28 100644
--- a/arch/arm/boards/at91sam9260ek/Makefile
+++ b/arch/arm/boards/at91sam9260ek/Makefile
@@ -1,2 +1,5 @@
obj-y += init.o
+
+lwl-y += lowlevel.o
+
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-at91sam9260ek
diff --git a/arch/arm/boards/at91sam9260ek/lowlevel.c b/arch/arm/boards/at91sam9260ek/lowlevel.c
new file mode 100644
index 000000000..02896856d
--- /dev/null
+++ b/arch/arm/boards/at91sam9260ek/lowlevel.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9260.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9260_SRAM_BASE + AT91SAM9260_SRAM_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1,
+ at91_get_sdram_size(IOMEM(AT91SAM9260_BASE_SDRAMC)),
+ NULL);
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 94d85dbcf..69d6d6fc1 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -276,7 +276,6 @@ config MACH_ANIMEO_IP
config MACH_AT91SAM9260EK
bool "Atmel AT91SAM9260-EK"
- select AT91SAM9260_LWL
select HAVE_NAND_ATMEL_BUSWIDTH_16
help
Say y here if you are using Atmel's AT91SAM9260-EK Evaluation board
@@ -371,7 +370,6 @@ choice
config MACH_AT91SAM9G20EK
bool "Atmel AT91SAM9G20-EK Evaluation Kit"
select HAVE_NAND_ATMEL_BUSWIDTH_16
- select AT91SAM9260_LWL
help
Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit
that embeds only one SD/MMC slot.
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 19/24] at91sam9m10g45ek, at91sam9m10ihd, pm9g45: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (17 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 18/24] at91sam9260ek, at91sam9g20ek: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 20/24] animeo: " Sam Ravnborg
` (4 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
These three board share the same at91sam9g45_lowlevel_init.c file.
Introduce lowlevel.c file for the boards that contains the reset vector.
Delete the now unused at91sam9g45_lowlevel_init.c file
Drop unused CONFIG symbols and Makefile references
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/at91sam9m10g45ek/Makefile | 3 +++
.../at91sam9m10g45ek/lowlevel.c} | 11 ++++------
arch/arm/boards/at91sam9m10ihd/Makefile | 2 ++
arch/arm/boards/at91sam9m10ihd/lowlevel.c | 25 ++++++++++++++++++++++
arch/arm/boards/pm9g45/Makefile | 3 +++
arch/arm/boards/pm9g45/lowlevel.c | 24 +++++++++++++++++++++
arch/arm/mach-at91/Kconfig | 5 -----
arch/arm/mach-at91/Makefile | 1 -
8 files changed, 61 insertions(+), 13 deletions(-)
rename arch/arm/{mach-at91/at91sam9g45_lowlevel_init.c => boards/at91sam9m10g45ek/lowlevel.c} (84%)
create mode 100644 arch/arm/boards/at91sam9m10ihd/lowlevel.c
create mode 100644 arch/arm/boards/pm9g45/lowlevel.c
diff --git a/arch/arm/boards/at91sam9m10g45ek/Makefile b/arch/arm/boards/at91sam9m10g45ek/Makefile
index dd8052157..da011f825 100644
--- a/arch/arm/boards/at91sam9m10g45ek/Makefile
+++ b/arch/arm/boards/at91sam9m10g45ek/Makefile
@@ -1,2 +1,5 @@
obj-y += init.o
+
+lwl-y += lowlevel.o
+
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-at91sam9m10g45ek
diff --git a/arch/arm/mach-at91/at91sam9g45_lowlevel_init.c b/arch/arm/boards/at91sam9m10g45ek/lowlevel.c
similarity index 84%
rename from arch/arm/mach-at91/at91sam9g45_lowlevel_init.c
rename to arch/arm/boards/at91sam9m10g45ek/lowlevel.c
index 2cdb7a6a5..9be195837 100644
--- a/arch/arm/mach-at91/at91sam9g45_lowlevel_init.c
+++ b/arch/arm/boards/at91sam9m10g45ek/lowlevel.c
@@ -4,17 +4,14 @@
* Under GPLv2
*/
-#define __LOWLEVEL_INIT__
-
#include <common.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
+#include <init.h>
+
#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
#include <mach/hardware.h>
-#include <mach/io.h>
#include <mach/at91sam9_ddrsdr.h>
-#include <init.h>
-#include <linux/sizes.h>
void __naked __bare_init barebox_arm_reset_vector(void)
{
diff --git a/arch/arm/boards/at91sam9m10ihd/Makefile b/arch/arm/boards/at91sam9m10ihd/Makefile
index f2acf201b..06193007a 100644
--- a/arch/arm/boards/at91sam9m10ihd/Makefile
+++ b/arch/arm/boards/at91sam9m10ihd/Makefile
@@ -1,2 +1,4 @@
obj-y += init.o
obj-y += hw_version.o
+
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/at91sam9m10ihd/lowlevel.c b/arch/arm/boards/at91sam9m10ihd/lowlevel.c
new file mode 100644
index 000000000..624f7e800
--- /dev/null
+++ b/arch/arm/boards/at91sam9m10ihd/lowlevel.c
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_ddrsdr.h>
+#include <mach/at91sam9g45.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9G45_SRAM_BASE + AT91SAM9G45_SRAM_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_6, at91sam9g45_get_ddram_size(1),
+ NULL);
+}
diff --git a/arch/arm/boards/pm9g45/Makefile b/arch/arm/boards/pm9g45/Makefile
index d81b1881b..abf50243e 100644
--- a/arch/arm/boards/pm9g45/Makefile
+++ b/arch/arm/boards/pm9g45/Makefile
@@ -1,2 +1,5 @@
obj-y += init.o
+
+lwl-y += lowlevel.o
+
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-pm9g45
diff --git a/arch/arm/boards/pm9g45/lowlevel.c b/arch/arm/boards/pm9g45/lowlevel.c
new file mode 100644
index 000000000..182b9ea7d
--- /dev/null
+++ b/arch/arm/boards/pm9g45/lowlevel.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_ddrsdr.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9G45_SRAM_BASE + AT91SAM9G45_SRAM_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_6, at91sam9g45_get_ddram_size(1),
+ NULL);
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 69d6d6fc1..9571b199c 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -47,8 +47,6 @@ config AT91SAM9260_LWL
bool
config AT91SAM9263_LWL
bool
-config AT91SAM9G45_LWL
- bool
config AT91RM9200_LWL
bool
@@ -465,14 +463,12 @@ choice
config MACH_AT91SAM9M10IHD
bool "Atmel AT91SAM9M10IDH Tablet"
- select AT91SAM9G45_LWL
help
Select this if you are using Atmel's AT91SAM9M10IHD Tablet
config MACH_AT91SAM9M10G45EK
bool "Atmel AT91SAM9M10G45-EK Evaluation Kit"
select HAVE_NAND_ATMEL_BUSWIDTH_16
- select AT91SAM9G45_LWL
help
Select this if you are using Atmel's AT91SAM9M10G45-EK Evaluation Kit
or AT91SAM9G45-EKES or AT91SAM9M10-EKES (for those 2 select the LG LCD)
@@ -480,7 +476,6 @@ config MACH_AT91SAM9M10G45EK
config MACH_PM9G45
bool "Ronetix PM9G45"
- select AT91SAM9G45_LWL
help
Say y here if you are using the Ronetix PM9G45 Board
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index b51f1873b..c430498ff 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -13,7 +13,6 @@ lwl-$(CONFIG_AT91SAM926X_LWL) += at91sam926x_lowlevel_init.o
lwl-$(CONFIG_AT91RM9200_LWL) += at91rm9200_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o
-lwl-$(CONFIG_AT91SAM9G45_LWL) += at91sam9g45_lowlevel_init.o
obj-$(CONFIG_AT91SAM9_RESET) += at91sam9_reset.o
obj-$(CONFIG_AT91SAM9G45_RESET) += at91sam9g45_reset.o
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 20/24] animeo: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (18 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 19/24] at91sam9m10g45ek, at91sam9m10ihd, pm9g45: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 21/24] telit-evk-pro3: " Sam Ravnborg
` (3 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/animeo_ip/Makefile | 3 +++
arch/arm/boards/animeo_ip/lowlevel.c | 26 ++++++++++++++++++++++++++
arch/arm/mach-at91/Kconfig | 1 -
3 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boards/animeo_ip/lowlevel.c
diff --git a/arch/arm/boards/animeo_ip/Makefile b/arch/arm/boards/animeo_ip/Makefile
index 510b142ff..61c714b45 100644
--- a/arch/arm/boards/animeo_ip/Makefile
+++ b/arch/arm/boards/animeo_ip/Makefile
@@ -1,2 +1,5 @@
obj-y += init.o
+
+lwl-y += lowlevel.o
+
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-animeo_ip
diff --git a/arch/arm/boards/animeo_ip/lowlevel.c b/arch/arm/boards/animeo_ip/lowlevel.c
new file mode 100644
index 000000000..02896856d
--- /dev/null
+++ b/arch/arm/boards/animeo_ip/lowlevel.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9260.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9260_SRAM_BASE + AT91SAM9260_SRAM_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1,
+ at91_get_sdram_size(IOMEM(AT91SAM9260_BASE_SDRAMC)),
+ NULL);
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 9571b199c..8cd85f7b9 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -269,7 +269,6 @@ choice
config MACH_ANIMEO_IP
bool "Somfy Animeo IP"
- select AT91SAM9260_LWL
depends on !CONSOLE_NONE
config MACH_AT91SAM9260EK
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 21/24] telit-evk-pro3: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (19 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 20/24] animeo: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 22/24] dss11: " Sam Ravnborg
` (2 subsequent siblings)
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/telit-evk-pro3/Makefile | 2 ++
arch/arm/boards/telit-evk-pro3/lowlevel.c | 26 ++++++++++++++++++++++++++
arch/arm/mach-at91/Kconfig | 1 -
3 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boards/telit-evk-pro3/lowlevel.c
diff --git a/arch/arm/boards/telit-evk-pro3/Makefile b/arch/arm/boards/telit-evk-pro3/Makefile
index eb072c016..e11fd5b69 100644
--- a/arch/arm/boards/telit-evk-pro3/Makefile
+++ b/arch/arm/boards/telit-evk-pro3/Makefile
@@ -1 +1,3 @@
obj-y += init.o
+
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/telit-evk-pro3/lowlevel.c b/arch/arm/boards/telit-evk-pro3/lowlevel.c
new file mode 100644
index 000000000..02896856d
--- /dev/null
+++ b/arch/arm/boards/telit-evk-pro3/lowlevel.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9260.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9260_SRAM_BASE + AT91SAM9260_SRAM_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1,
+ at91_get_sdram_size(IOMEM(AT91SAM9260_BASE_SDRAMC)),
+ NULL);
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 8cd85f7b9..8b33dcec3 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -299,7 +299,6 @@ config MACH_USB_A9260
config MACH_GE863
bool "Telit EVK-PRO3"
- select AT91SAM9260_LWL
help
Say y here if you are using Telit EVK-PRO3 with GE863-PRO3
<http://www.telit.com>
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 22/24] dss11: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (20 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 21/24] telit-evk-pro3: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 23/24] at91rm9200ek: " Sam Ravnborg
2017-12-27 20:50 ` [PATCH 24/24] arm: at91: remove leftovers from moving reset code in mach-at91 Sam Ravnborg
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/dss11/Makefile | 2 ++
arch/arm/boards/dss11/lowlevel.c | 26 ++++++++++++++++++++++++++
arch/arm/mach-at91/Kconfig | 1 -
3 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boards/dss11/lowlevel.c
diff --git a/arch/arm/boards/dss11/Makefile b/arch/arm/boards/dss11/Makefile
index eb072c016..e11fd5b69 100644
--- a/arch/arm/boards/dss11/Makefile
+++ b/arch/arm/boards/dss11/Makefile
@@ -1 +1,3 @@
obj-y += init.o
+
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/dss11/lowlevel.c b/arch/arm/boards/dss11/lowlevel.c
new file mode 100644
index 000000000..02896856d
--- /dev/null
+++ b/arch/arm/boards/dss11/lowlevel.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Under GPLv2
+ */
+
+#include <common.h>
+#include <init.h>
+
+#include <asm/barebox-arm-head.h>
+#include <asm/barebox-arm.h>
+
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9260.h>
+#include <mach/hardware.h>
+
+void __naked __bare_init barebox_arm_reset_vector(void)
+{
+ arm_cpu_lowlevel_init();
+
+ arm_setup_stack(AT91SAM9260_SRAM_BASE + AT91SAM9260_SRAM_SIZE - 16);
+
+ barebox_arm_entry(AT91_CHIPSELECT_1,
+ at91_get_sdram_size(IOMEM(AT91SAM9260_BASE_SDRAMC)),
+ NULL);
+}
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 8b33dcec3..67adb3cf3 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -387,7 +387,6 @@ config MACH_USB_A9G20
config MACH_DSS11
bool "aizo dSS11"
select HAVE_NAND_ATMEL_BUSWIDTH_16
- select AT91SAM9260_LWL
help
Select this if you are using aizo dSS11
that embeds only one SD/MMC slot.
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 23/24] at91rm9200ek: move reset vector to board code
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (21 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 22/24] dss11: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
2017-12-27 20:50 ` [PATCH 24/24] arm: at91: remove leftovers from moving reset code in mach-at91 Sam Ravnborg
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Include deletion of now unused at91rm9200_lowlevel_init.c
and related CONFIG symbols
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/boards/at91rm9200ek/Makefile | 3 +++
.../at91rm9200ek/lowlevel.c} | 14 ++++++--------
arch/arm/mach-at91/Kconfig | 3 ---
arch/arm/mach-at91/Makefile | 1 -
4 files changed, 9 insertions(+), 12 deletions(-)
rename arch/arm/{mach-at91/at91rm9200_lowlevel_init.c => boards/at91rm9200ek/lowlevel.c} (97%)
diff --git a/arch/arm/boards/at91rm9200ek/Makefile b/arch/arm/boards/at91rm9200ek/Makefile
index dec1c5045..a07c06a6d 100644
--- a/arch/arm/boards/at91rm9200ek/Makefile
+++ b/arch/arm/boards/at91rm9200ek/Makefile
@@ -1,2 +1,5 @@
obj-y += init.o
+
+lwl-y += lowlevel.o
+
bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-at91rm9200ek
diff --git a/arch/arm/mach-at91/at91rm9200_lowlevel_init.c b/arch/arm/boards/at91rm9200ek/lowlevel.c
similarity index 97%
rename from arch/arm/mach-at91/at91rm9200_lowlevel_init.c
rename to arch/arm/boards/at91rm9200ek/lowlevel.c
index f78e36808..a85a22e79 100644
--- a/arch/arm/mach-at91/at91rm9200_lowlevel_init.c
+++ b/arch/arm/boards/at91rm9200ek/lowlevel.c
@@ -4,19 +4,17 @@
* Under GPLv2
*/
-#define __LOWLEVEL_INIT__
-
#include <common.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
+#include <init.h>
+
#include <asm/barebox-arm-head.h>
-#include <mach/hardware.h>
-#include <mach/at91rm9200.h>
+#include <asm/barebox-arm.h>
+
#include <mach/at91rm9200_mc.h>
+#include <mach/at91rm9200.h>
#include <mach/at91_pio.h>
#include <mach/at91_pmc.h>
-#include <mach/io.h>
-#include <init.h>
+#include <mach/hardware.h>
void static inline access_sdram(void)
{
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 67adb3cf3..2c379d96c 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -47,8 +47,6 @@ config AT91SAM9260_LWL
bool
config AT91SAM9263_LWL
bool
-config AT91RM9200_LWL
- bool
config AT91SAM9_SMC
bool
@@ -251,7 +249,6 @@ choice
config MACH_AT91RM9200EK
bool "Atmel AT91RM9200-EK Evaluation Kit"
select HAVE_AT91_DATAFLASH_CARD
- select AT91RM9200_LWL
help
Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit.
<http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507>
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index c430498ff..7193b8690 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_AT91_BOOTSTRAP) += bootstrap.o
lwl-$(CONFIG_AT91SAM926X_LWL) += at91sam926x_lowlevel_init.o
-lwl-$(CONFIG_AT91RM9200_LWL) += at91rm9200_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o
lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH 24/24] arm: at91: remove leftovers from moving reset code in mach-at91
2017-12-27 20:48 [PATCH v3 0/24] at91: move reset vector to board code Sam Ravnborg
` (22 preceding siblings ...)
2017-12-27 20:50 ` [PATCH 23/24] at91rm9200ek: " Sam Ravnborg
@ 2017-12-27 20:50 ` Sam Ravnborg
23 siblings, 0 replies; 28+ messages in thread
From: Sam Ravnborg @ 2017-12-27 20:50 UTC (permalink / raw)
To: Barebox List; +Cc: Sam Ravnborg
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/arm/mach-at91/Kconfig | 11 --
arch/arm/mach-at91/Makefile | 5 -
arch/arm/mach-at91/at91sam9260_lowlevel_init.c | 48 -----
arch/arm/mach-at91/at91sam9263_lowlevel_init.c | 48 -----
arch/arm/mach-at91/at91sam926x_lowlevel_init.c | 199 ---------------------
.../mach-at91/include/mach/at91_lowlevel_init.h | 46 -----
6 files changed, 357 deletions(-)
delete mode 100644 arch/arm/mach-at91/at91sam9260_lowlevel_init.c
delete mode 100644 arch/arm/mach-at91/at91sam9263_lowlevel_init.c
delete mode 100644 arch/arm/mach-at91/at91sam926x_lowlevel_init.c
delete mode 100644 arch/arm/mach-at91/include/mach/at91_lowlevel_init.h
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 2c379d96c..b877c269d 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -37,17 +37,6 @@ config HAVE_AT91_BOOTSTRAP
config AT91SAM926X_BOARD_INIT
bool
-# Select if board uses the common at91sam926x_lowlevel_init
-config AT91SAM926X_LWL
- bool
-
-# Select if board uses barebox reset vector from mach-at91
-# as implemented in the *lowlevel_init.c files
-config AT91SAM9260_LWL
- bool
-config AT91SAM9263_LWL
- bool
-
config AT91SAM9_SMC
bool
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 7193b8690..8462cba60 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -8,11 +8,6 @@ obj-$(CONFIG_CMD_AT91_BOOT_TEST) += boot_test_cmd.o
obj-$(CONFIG_AT91_BOOTSTRAP) += bootstrap.o
-lwl-$(CONFIG_AT91SAM926X_LWL) += at91sam926x_lowlevel_init.o
-
-lwl-$(CONFIG_AT91SAM9260_LWL) += at91sam9260_lowlevel_init.o
-lwl-$(CONFIG_AT91SAM9263_LWL) += at91sam9263_lowlevel_init.o
-
obj-$(CONFIG_AT91SAM9_RESET) += at91sam9_reset.o
obj-$(CONFIG_AT91SAM9G45_RESET) += at91sam9g45_reset.o
diff --git a/arch/arm/mach-at91/at91sam9260_lowlevel_init.c b/arch/arm/mach-at91/at91sam9260_lowlevel_init.c
deleted file mode 100644
index 7f84185ef..000000000
--- a/arch/arm/mach-at91/at91sam9260_lowlevel_init.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
- */
-
-#define __LOWLEVEL_INIT__
-
-#include <common.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
-#include <asm/barebox-arm-head.h>
-#include <mach/hardware.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91_pio.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91_lowlevel_init.h>
-#include <mach/io.h>
-#include <init.h>
-#include <linux/sizes.h>
-
-void __bare_init at91sam9260_lowlevel_init(void)
-{
- struct at91sam926x_lowlevel_cfg cfg;
-
- cfg.pio = IOMEM(AT91SAM9260_BASE_PIOC);
- cfg.sdramc = IOMEM(AT91SAM9260_BASE_SDRAMC);
- cfg.ebi_pio_is_peripha = false;
- cfg.matrix_csa = AT91_MATRIX_EBICSA;
-
- at91sam926x_lowlevel_init(&cfg);
-
- barebox_arm_entry(AT91_CHIPSELECT_1, at91_get_sdram_size(cfg.sdramc),
- NULL);
-}
-
-void __naked __bare_init barebox_arm_reset_vector(void)
-{
- arm_cpu_lowlevel_init();
-
- arm_setup_stack(AT91SAM9260_SRAM_BASE + AT91SAM9260_SRAM_SIZE - 16);
-
- at91sam9260_lowlevel_init();
-}
diff --git a/arch/arm/mach-at91/at91sam9263_lowlevel_init.c b/arch/arm/mach-at91/at91sam9263_lowlevel_init.c
deleted file mode 100644
index 0be84551f..000000000
--- a/arch/arm/mach-at91/at91sam9263_lowlevel_init.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2009-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
- */
-
-#define __LOWLEVEL_INIT__
-
-#include <common.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
-#include <asm/barebox-arm-head.h>
-#include <mach/hardware.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91_pio.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91_lowlevel_init.h>
-#include <mach/io.h>
-#include <init.h>
-#include <linux/sizes.h>
-
-void __bare_init at91sam9263_lowlevel_init(void)
-{
- struct at91sam926x_lowlevel_cfg cfg;
-
- cfg.pio = IOMEM(AT91SAM9263_BASE_PIOD);
- cfg.sdramc = IOMEM(AT91SAM9263_BASE_SDRAMC0);
- cfg.ebi_pio_is_peripha = true;
- cfg.matrix_csa = AT91_MATRIX_EBI0CSA;
-
- at91sam926x_lowlevel_init(&cfg);
-
- barebox_arm_entry(AT91_CHIPSELECT_1, at91_get_sdram_size(cfg.sdramc),
- NULL);
-}
-
-void __naked __bare_init barebox_arm_reset_vector(void)
-{
- arm_cpu_lowlevel_init();
-
- arm_setup_stack(AT91SAM9263_SRAM0_BASE + AT91SAM9263_SRAM0_SIZE - 16);
-
- at91sam9263_lowlevel_init();
-}
diff --git a/arch/arm/mach-at91/at91sam926x_lowlevel_init.c b/arch/arm/mach-at91/at91sam926x_lowlevel_init.c
deleted file mode 100644
index 5dd8bc4e6..000000000
--- a/arch/arm/mach-at91/at91sam926x_lowlevel_init.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2008 Ronetix Ilko Iliev (www.ronetix.at)
- * Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
- */
-
-#define __LOWLEVEL_INIT__
-
-#include <common.h>
-#include <asm/system.h>
-#include <asm/barebox-arm.h>
-#include <asm/barebox-arm-head.h>
-#include <mach/hardware.h>
-#include <mach/at91_pmc.h>
-#include <mach/at91_pio.h>
-#include <mach/at91_rstc.h>
-#include <mach/at91_wdt.h>
-#include <mach/at91sam9_matrix.h>
-#include <mach/at91sam9_sdramc.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91_lowlevel_init.h>
-#include <mach/gpio.h>
-#include <mach/io.h>
-#include <init.h>
-#include <linux/sizes.h>
-
-#include "gpio.h"
-
-static void inline access_sdram(void)
-{
- writel(0x00000000, AT91_SDRAM_BASE);
-}
-
-static void inline pmc_check_mckrdy(void)
-{
- u32 r;
-
- do {
- r = at91_pmc_read(AT91_PMC_SR);
- } while (!(r & AT91_PMC_MCKRDY));
-}
-
-static int inline running_in_sram(void)
-{
- u32 addr = get_pc();
-
- addr >>= 28;
- return addr == 0;
-}
-
-#define at91_sdramc_read(field) \
- __raw_readl(cfg->sdramc + field)
-
-#define at91_sdramc_write(field, value) \
- __raw_writel(value, cfg->sdramc + field)
-
-void __bare_init at91sam926x_sdramc_init(struct at91sam926x_lowlevel_cfg *cfg)
-{
- u32 r;
- int i;
- int in_sram = running_in_sram();
-
- /*
- * SDRAMC Check if Refresh Timer Counter is already initialized
- */
- r = at91_sdramc_read(AT91_SDRAMC_TR);
- if (r && !in_sram)
- return;
-
- /* SDRAMC_MR : Normal Mode */
- at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_NORMAL);
-
- /* SDRAMC_TR - Refresh Timer register */
- at91_sdramc_write(AT91_SDRAMC_TR, cfg->sdrc_tr1);
-
- /* SDRAMC_CR - Configuration register*/
- at91_sdramc_write(AT91_SDRAMC_CR, cfg->sdrc_cr);
-
- /* Memory Device Type */
- at91_sdramc_write(AT91_SDRAMC_MDR, cfg->sdrc_mdr);
-
- /* SDRAMC_MR : Precharge All */
- at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_PRECHARGE);
-
- /* access SDRAM */
- access_sdram();
-
- /* SDRAMC_MR : refresh */
- at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_REFRESH);
-
- /* access SDRAM 8 times */
- for (i = 0; i < 8; i++)
- access_sdram();
-
- /* SDRAMC_MR : Load Mode Register */
- at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_LMR);
-
- /* access SDRAM */
- access_sdram();
-
- /* SDRAMC_MR : Normal Mode */
- at91_sdramc_write(AT91_SDRAMC_MR, AT91_SDRAMC_MODE_NORMAL);
-
- /* access SDRAM */
- access_sdram();
-
- /* SDRAMC_TR : Refresh Timer Counter */
- at91_sdramc_write(AT91_SDRAMC_TR, cfg->sdrc_tr2);
-
- /* access SDRAM */
- access_sdram();
-}
-
-void __bare_init at91sam926x_lowlevel_init(struct at91sam926x_lowlevel_cfg *cfg)
-{
- u32 r;
- int in_sram = running_in_sram();
-
- at91sam926x_lowlevel_board_config(cfg);
-
- __raw_writel(cfg->wdt_mr, AT91_BASE_WDT + AT91_WDT_MR);
-
- /* configure PIOx as EBI0 D[16-31] */
- at91_mux_gpio_disable(cfg->pio, cfg->ebi_pio_pdr);
- at91_mux_set_pullup(cfg->pio, cfg->ebi_pio_ppudr, true);
- if (cfg->ebi_pio_is_peripha)
- at91_mux_set_A_periph(cfg->pio, cfg->ebi_pio_ppudr);
-
- at91_sys_write(cfg->matrix_csa, cfg->ebi_csa);
-
- /* flash */
- at91_smc_write(cfg->smc_cs, AT91_SAM9_SMC_MODE, cfg->smc_mode);
-
- at91_smc_write(cfg->smc_cs, AT91_SMC_CYCLE, cfg->smc_cycle);
-
- at91_smc_write(cfg->smc_cs, AT91_SMC_PULSE, cfg->smc_pulse);
-
- at91_smc_write(cfg->smc_cs, AT91_SMC_SETUP, cfg->smc_setup);
-
- /*
- * PMC Check if the PLL is already initialized
- */
- r = at91_pmc_read(AT91_PMC_MCKR);
- if (r & AT91_PMC_CSS && !in_sram)
- return;
-
- /*
- * Enable the Main Oscillator
- */
- at91_pmc_write(AT91_CKGR_MOR, cfg->pmc_mor);
-
- do {
- r = at91_pmc_read(AT91_PMC_SR);
- } while (!(r & AT91_PMC_MOSCS));
-
- /*
- * PLLAR: x MHz for PCK
- */
- at91_pmc_write(AT91_CKGR_PLLAR, cfg->pmc_pllar);
-
- do {
- r = at91_pmc_read(AT91_PMC_SR);
- } while (!(r & AT91_PMC_LOCKA));
-
- /*
- * PCK/x = MCK Master Clock from SLOW
- */
- at91_pmc_write(AT91_PMC_MCKR, cfg->pmc_mckr1);
-
- pmc_check_mckrdy();
-
- /*
- * PCK/x = MCK Master Clock from PLLA
- */
- at91_pmc_write(AT91_PMC_MCKR, cfg->pmc_mckr2);
-
- pmc_check_mckrdy();
-
- /*
- * Init SDRAM
- */
- at91sam926x_sdramc_init(cfg);
-
- /* User reset enable*/
- at91_sys_write(AT91_RSTC_MR, cfg->rstc_rmr);
-
-#ifdef CONFIG_SYS_MATRIX_MCFG_REMAP
- /* MATRIX_MCFG - REMAP all masters */
- at91_sys_write(AT91_MATRIX_MCFG0, 0x1FF);
-#endif
- /*
- * When boot from external boot
- * we need to enable mck and ohter clock
- * so enable all of them
- * We will shutdown what we don't need later
- */
- at91_pmc_write(AT91_PMC_PCER, 0xffffffff);
-}
diff --git a/arch/arm/mach-at91/include/mach/at91_lowlevel_init.h b/arch/arm/mach-at91/include/mach/at91_lowlevel_init.h
deleted file mode 100644
index d72dfff38..000000000
--- a/arch/arm/mach-at91/include/mach/at91_lowlevel_init.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2
- */
-
-#ifndef __AT91_LOWLEVEL_INIT_H__
-#define __AT91_LOWLEVEL_INIT_H__
-
-struct at91sam926x_lowlevel_cfg {
- /* SoC specific */
- void __iomem *pio;
- void __iomem *sdramc;
- u32 ebi_pio_is_peripha;
- u32 matrix_csa;
-
- /* board specific */
- u32 wdt_mr;
- u32 ebi_pio_pdr;
- u32 ebi_pio_ppudr;
- u32 ebi_csa;
- u32 smc_cs;
- u32 smc_mode;
- u32 smc_cycle;
- u32 smc_pulse;
- u32 smc_setup;
- u32 pmc_mor;
- u32 pmc_pllar;
- u32 pmc_mckr1;
- u32 pmc_mckr2;
- u32 sdrc_cr;
- u32 sdrc_tr1;
- u32 sdrc_mdr;
- u32 sdrc_tr2;
- u32 rstc_rmr;
-};
-
-#ifdef CONFIG_AT91SAM926X_LWL
-void at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg);
-void at91sam926x_lowlevel_init(struct at91sam926x_lowlevel_cfg *cfg);
-#else
-static inline void at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg) {}
-static inline void at91sam926x_lowlevel_init(struct at91sam926x_lowlevel_cfg *cfg) {}
-#endif
-
-#endif /* __AT91_LOWLEVEL_INIT_H__ */
--
2.12.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 28+ messages in thread