From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 18/34] ARM AT91: switch to barebox_arm_entry part1
Date: Fri, 1 Feb 2013 09:11:35 +0100 [thread overview]
Message-ID: <20130201081135.GI26329@game.jcrosoft.org> (raw)
In-Reply-To: <1359705587-9762-19-git-send-email-s.hauer@pengutronix.de>
On 08:59 Fri 01 Feb , Sascha Hauer wrote:
> This switches the at91sam926x, 9g10 and 9g20 over to barebox_arm_entry.
> For these SoCs we currently support reading back the memory size from
> the SDRAM controller, so all of these can have a common reset() function.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> arch/arm/boards/at91sam9263ek/Makefile | 4 ++--
> arch/arm/boards/mmccpu/Makefile | 4 ++--
> arch/arm/boards/pm9261/Makefile | 4 ++--
> arch/arm/boards/pm9263/Makefile | 4 ++--
> arch/arm/boards/tny-a926x/Makefile | 4 ++--
> arch/arm/boards/usb-a926x/Makefile | 4 ++--
> arch/arm/mach-at91/Kconfig | 15 ++++++++++-----
> arch/arm/mach-at91/Makefile | 4 ++--
> arch/arm/mach-at91/at91sam926x_lowlevel_init.c | 4 +++-
> 9 files changed, 27 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm/boards/at91sam9263ek/Makefile b/arch/arm/boards/at91sam9263ek/Makefile
> index b6460c3..1702783 100644
> --- a/arch/arm/boards/at91sam9263ek/Makefile
> +++ b/arch/arm/boards/at91sam9263ek/Makefile
> @@ -1,5 +1,5 @@
> obj-y += init.o
>
> -obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o
> +obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
>
> -pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o
> +pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
> diff --git a/arch/arm/boards/mmccpu/Makefile b/arch/arm/boards/mmccpu/Makefile
> index b6460c3..1702783 100644
> --- a/arch/arm/boards/mmccpu/Makefile
> +++ b/arch/arm/boards/mmccpu/Makefile
> @@ -1,5 +1,5 @@
> obj-y += init.o
>
> -obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o
> +obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
>
> -pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o
> +pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
> diff --git a/arch/arm/boards/pm9261/Makefile b/arch/arm/boards/pm9261/Makefile
> index b6460c3..1702783 100644
> --- a/arch/arm/boards/pm9261/Makefile
> +++ b/arch/arm/boards/pm9261/Makefile
> @@ -1,5 +1,5 @@
> obj-y += init.o
>
> -obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o
> +obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
>
> -pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o
> +pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
> diff --git a/arch/arm/boards/pm9263/Makefile b/arch/arm/boards/pm9263/Makefile
> index b6460c3..1702783 100644
> --- a/arch/arm/boards/pm9263/Makefile
> +++ b/arch/arm/boards/pm9263/Makefile
> @@ -1,5 +1,5 @@
> obj-y += init.o
>
> -obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o
> +obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
>
> -pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel_init.o
> +pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
> diff --git a/arch/arm/boards/tny-a926x/Makefile b/arch/arm/boards/tny-a926x/Makefile
> index 36ea09f..caa7163 100644
> --- a/arch/arm/boards/tny-a926x/Makefile
> +++ b/arch/arm/boards/tny-a926x/Makefile
> @@ -5,6 +5,6 @@ obj-$(CONFIG_AT91_BOOTSTRAP) += $(bootstrap-y)
>
> lowlevel_init-$(CONFIG_MACH_TNY_A9263) = tny_a9263_lowlevel_init.o
>
> -obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
> +obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)
>
> -pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
> +pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)
> diff --git a/arch/arm/boards/usb-a926x/Makefile b/arch/arm/boards/usb-a926x/Makefile
> index e314dd5..88f163f 100644
> --- a/arch/arm/boards/usb-a926x/Makefile
> +++ b/arch/arm/boards/usb-a926x/Makefile
> @@ -5,6 +5,6 @@ obj-$(CONFIG_AT91_BOOTSTRAP) += $(bootstrap-y)
>
> lowlevel_init-$(CONFIG_MACH_USB_A9263) = usb_a9263_lowlevel_init.o
>
> -obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
> +obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)
>
> -pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
> +pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index 14bab55..ac6fd2f 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -6,6 +6,9 @@ config HAVE_AT91_DBGU0
> config HAVE_AT91_DBGU1
> bool
>
> +config HAVE_AT91_LOWLEVEL_INIT
> + bool
> +
> config AT91SAM9_SMC
> bool
>
> @@ -76,6 +79,8 @@ config HAVE_AT91_LOAD_BAREBOX_SRAM
>
> config AT91SAM9_LOWLEVEL_INIT
> bool
> + select MACH_HAS_LOWLEVEL_INIT
> + select MACH_DO_LOWLEVEL_INIT
>
> comment "Atmel AT91 System-on-Chip"
>
> @@ -300,7 +305,7 @@ config MACH_AT91SAM9261EK
> config MACH_PM9261
> bool "Ronetix PM9261"
> select HAS_DM9000
> - select MACH_HAS_LOWLEVEL_INIT
> + select HAVE_AT91_LOWLEVEL_INIT
> help
> Say y here if you are using the Ronetix PM9261 Board
>
> @@ -375,7 +380,7 @@ choice
>
> config MACH_AT91SAM9263EK
> bool "Atmel AT91SAM9263-EK"
> - select MACH_HAS_LOWLEVEL_INIT
> + select HAVE_AT91_LOWLEVEL_INIT
> select HAVE_NAND_ATMEL_BUSWIDTH_16
> help
> Say y here if you are using Atmel's AT91SAM9263-EK Evaluation board
> @@ -387,7 +392,7 @@ config MACH_MMCCPU
>
> config MACH_PM9263
> bool "Ronetix PM9263"
> - select MACH_HAS_LOWLEVEL_INIT
> + select HAVE_AT91_LOWLEVEL_INIT
> help
> Say y here if you are using the Ronetix PM9263 Board
>
> @@ -401,7 +406,7 @@ config MACH_TNY_A9263
>
> config MACH_USB_A9263
> bool "CALAO USB-A9263"
> - select MACH_HAS_LOWLEVEL_INIT
> + select HAVE_AT91_LOWLEVEL_INIT
> help
> Select this if you are using a Calao Systems USB-A9263.
> <http://www.calao-systems.com>
> @@ -565,7 +570,7 @@ endif
>
> config AT91_BOOTSTRAP
> bool "at91 bootstrap"
> - depends on MACH_HAS_LOWLEVEL_INIT
> + depends on HAVE_AT91_LOWLEVEL_INIT
> select BOOTSTRAP
>
> config AT91_LOAD_BAREBOX_SRAM
> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
> index f6c8500..38aeef6 100644
> --- a/arch/arm/mach-at91/Makefile
> +++ b/arch/arm/mach-at91/Makefile
> @@ -7,9 +7,9 @@ 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_ARCH_AT91RM9200) = at91rm9200_lowlevel_init.o
> -obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
> +obj-y += $(lowlevel_init-y)
>
> -pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
> +pbl-y += $(lowlevel_init-y)
>
> obj-$(CONFIG_AT91SAM9_RESET) += at91sam9_reset.o
> obj-$(CONFIG_AT91SAM9G45_RESET) += at91sam9g45_reset.o
> diff --git a/arch/arm/mach-at91/at91sam926x_lowlevel_init.c b/arch/arm/mach-at91/at91sam926x_lowlevel_init.c
> index 8b9b33e..cda0456 100644
> --- a/arch/arm/mach-at91/at91sam926x_lowlevel_init.c
> +++ b/arch/arm/mach-at91/at91sam926x_lowlevel_init.c
> @@ -49,6 +49,7 @@ static int inline running_in_sram(void)
> void __bare_init at91sam926x_lowlevel_init(void *pio, bool is_pio_asr,
> u32 matrix_csa)
> {
> +#ifdef CONFIG_HAVE_AT91_LOWLEVEL_INIT
> u32 r;
> int i;
> int in_sram = running_in_sram();
> @@ -184,5 +185,6 @@ void __bare_init at91sam926x_lowlevel_init(void *pio, bool is_pio_asr,
> at91_pmc_write(AT91_PMC_PCER, 0xffffffff);
>
> end:
> - board_init_lowlevel_return();
> +#endif
> + barebox_arm_entry(AT91_SDRAM_BASE, at91_get_sdram_size(), 0);
I send a patch series to split this pleqse rebase on it
at at91_get_sram_size is going to be drop for SOC specific on
Best Regards,
J.
> }
> --
> 1.7.10.4
>
>
> _______________________________________________
> 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
next prev parent reply other threads:[~2013-02-01 8:12 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-01 7:59 [PATCH v2] Add new ARM entry point for barebox Sascha Hauer
2013-02-01 7:59 ` [PATCH 01/34] ARM: Add new " Sascha Hauer
2013-02-01 7:59 ` [PATCH 02/34] ARM: add __noreturn to board_init_lowlevel_return Sascha Hauer
2013-02-01 7:59 ` [PATCH 03/34] ARM i.MX: Use SRAM stack in lowlevel code Sascha Hauer
2013-02-01 7:59 ` [PATCH 04/34] ARM i.MX: Add i.MX specific entry point for barebox Sascha Hauer
2013-02-01 7:59 ` [PATCH 05/34] ARM i.MX: prepare external nand boot for SoC specific entry Sascha Hauer
2013-02-01 7:59 ` [PATCH 06/34] ARM i.MX boards: switch to barebox_arm_entry Sascha Hauer
2013-02-01 7:59 ` [PATCH 07/34] ARM MXS " Sascha Hauer
2013-02-01 7:59 ` [PATCH 08/34] ARM OMAP " Sascha Hauer
2013-02-01 7:59 ` [PATCH 09/34] ARM Samsung " Sascha Hauer
2013-02-01 7:59 ` [PATCH 10/34] ARM PXA " Sascha Hauer
2013-02-01 7:59 ` [PATCH 11/34] ARM ep93xx " Sascha Hauer
2013-02-01 7:59 ` [PATCH 12/34] ARM tegra " Sascha Hauer
2013-02-01 7:59 ` [PATCH 13/34] ARM nomadik " Sascha Hauer
2013-02-01 7:59 ` [PATCH 14/34] ARM versatile " Sascha Hauer
2013-02-01 7:59 ` [PATCH 15/34] ARM netx " Sascha Hauer
2013-02-01 7:59 ` [PATCH 16/34] ARM clep7212: " Sascha Hauer
2013-02-01 7:59 ` [PATCH 17/34] ARM raspberrypi: " Sascha Hauer
2013-02-01 7:59 ` [PATCH 18/34] ARM AT91: switch to barebox_arm_entry part1 Sascha Hauer
2013-02-01 8:11 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2013-02-03 10:13 ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-01 7:59 ` [PATCH 19/34] ARM AT91: switch at91rm9200 board to barebox_arm_entry Sascha Hauer
2013-02-01 7:59 ` [PATCH 20/34] ARM AT91: switch sama5d3 " Sascha Hauer
2013-02-01 7:59 ` [PATCH 21/34] ARM AT91: switch remaining boards " Sascha Hauer
2013-02-01 8:12 ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-02 21:23 ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-01 7:59 ` [PATCH 22/34] ARM: remove now unused MACH_[HAS|DO]_LOWLEVEL_INIT Sascha Hauer
2013-02-01 7:59 ` [PATCH 23/34] ARM start-pbl: make board_init_lowlevel_return static Sascha Hauer
2013-02-01 7:59 ` [PATCH 24/34] ARM start-pbl: call uncompressed binary with arguments Sascha Hauer
2013-02-01 7:59 ` [PATCH 25/34] ARM start: pickup parameters from pbl Sascha Hauer
2013-02-01 7:59 ` [PATCH 26/34] ARM: Setup stack at end of SDRAM Sascha Hauer
2013-02-01 7:59 ` [PATCH 27/34] ARM pbl: Use dynamic parameters for early malloc space Sascha Hauer
2013-02-01 7:59 ` [PATCH 28/34] ARM mmu: pickup already enabled mmu Sascha Hauer
2013-02-01 7:59 ` [PATCH 29/34] ARM: Factor out early mmu code Sascha Hauer
2013-02-01 7:59 ` [PATCH 30/34] ARM: Enable mmu early Sascha Hauer
2013-02-01 7:59 ` [PATCH 31/34] ARM: Automatically determine malloc size Sascha Hauer
2013-02-01 7:59 ` [PATCH 32/34] generic memory layout: fix deps for [MALLOC|STACK]_BASE Sascha Hauer
2013-02-01 7:59 ` [PATCH 33/34] ARM: disable HAVE_CONFIGURABLE_MEMORY_LAYOUT Sascha Hauer
2013-02-01 7:59 ` [PATCH 34/34] ARM pbl: inline decompress function Sascha Hauer
2013-02-01 8:15 ` [PATCH v2] Add new ARM entry point for barebox Jean-Christophe PLAGNIOL-VILLARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130201081135.GI26329@game.jcrosoft.org \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox