[PATCH 2/2] at91sam9263ek: enable multi-image build

[Sam Ravnborg]

From 265d9e416b53e6ad1f7941e0de61d0257ab1e233 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <***@ravnborg.org>
Date: Fri, 7 Jul 2017 17:56:20 +0200
Subject: [PATCH 2/2] at91sam9263ek: enable multi-image build

Convert at91sam9263ek to multi-image build as we already do
for many of the i.MX based boards and recently for
the at91sam9x5ek board.

Signed-off-by: Sam Ravnborg <***@ravnborg.org>
---
arch/arm/boards/at91sam9263ek/lowlevel_init.c | 2 +-
arch/arm/configs/at91sam9263ek_defconfig | 3 ++-
arch/arm/mach-at91/Kconfig | 18 +++++++++++-------
images/Makefile.at91 | 4 ++++
4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boards/at91sam9263ek/lowlevel_init.c b/arch/arm/boards/at91sam9263ek/lowlevel_init.c
index 70e0da3b1..3138bc7ca 100644
--- a/arch/arm/boards/at91sam9263ek/lowlevel_init.c
+++ b/arch/arm/boards/at91sam9263ek/lowlevel_init.c
@@ -115,7 +115,7 @@ static void __bare_init at91sam9263ek_init(void)
NULL);
}

-void __naked __bare_init barebox_arm_reset_vector(void)
+ENTRY_FUNCTION(start_at91sam9263ek, r0, r1, r2)
{
arm_cpu_lowlevel_init();

diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig
index b28614d43..c509290b5 100644
--- a/arch/arm/configs/at91sam9263ek_defconfig
+++ b/arch/arm/configs/at91sam9263ek_defconfig
@@ -1,7 +1,8 @@
CONFIG_ARCH_AT91SAM9263=y
+CONFIG_AT91_MULTI_BOARDS=y
+CONFIG_MACH_AT91SAM9263EK=y
CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
-CONFIG_PBL_IMAGE=y
CONFIG_MMU=y
CONFIG_EXPERIMENTAL=y
CONFIG_MALLOC_TLSF=y
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 17e432fea..50b4d88e5 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -224,6 +224,8 @@ config SUPPORT_CALAO_DAB_MMX
config SUPPORT_CALAO_MOB_TNY_MD2
bool

+if !AT91_MULTI_BOARDS
+
# ----------------------------------------------------------

if ARCH_AT91RM9200
@@ -392,13 +394,6 @@ if ARCH_AT91SAM9263
choice
prompt "AT91SAM9263 Board Type"

-config MACH_AT91SAM9263EK
- bool "Atmel AT91SAM9263-EK"
- select HAVE_NAND_ATMEL_BUSWIDTH_16
- select HAVE_AT91_BOOTSTRAP
- help
- Say y here if you are using Atmel's AT91SAM9263-EK Evaluation board
-
config MACH_MMCCPU
bool "Bucyrus MMC-CPU"
help
@@ -513,6 +508,7 @@ config MACH_SAMA5D4_XPLAINED
endchoice

endif
+endif

# ----------------------------------------------------------

@@ -523,6 +519,14 @@ config AT91_MULTI_BOARDS

if AT91_MULTI_BOARDS

+config MACH_AT91SAM9263EK
+ bool "Atmel AT91SAM9263-EK"
+ depends on ARCH_AT91SAM9263
+ select HAVE_NAND_ATMEL_BUSWIDTH_16
+ select HAVE_AT91_BOOTSTRAP
+ help
+ Say y here if you are using Atmel's AT91SAM9263-EK Evaluation board
+
config MACH_AT91SAM9X5EK
bool "Atmel AT91SAM9x5 Series Evaluation Kit"
depends on ARCH_AT91SAM9X5
diff --git a/images/Makefile.at91 b/images/Makefile.at91
index dc6c1db4b..c7d86563a 100644
--- a/images/Makefile.at91
+++ b/images/Makefile.at91
@@ -5,3 +5,7 @@
pblx-$(CONFIG_MACH_AT91SAM9X5EK) += start_at91sam9x5ek
FILE_barebox-at91sam9x5ek.img = start_at91sam9x5ek.pblx
image-$(CONFIG_MACH_AT91SAM9X5EK) += barebox-at91sam9x5ek.img
+
+pblx-$(CONFIG_MACH_AT91SAM9263EK) += start_at91sam9263ek
+FILE_barebox-at91sam9263ek.img = start_at91sam9263ek.pblx
+image-$(CONFIG_MACH_AT91SAM9263EK) += barebox-at91sam9263ek.img

[Sam Ravnborg]

Post by Sam Ravnborg

Post by Sam Ravnborg
From 265d9e416b53e6ad1f7941e0de61d0257ab1e233 Mon Sep 17 00:00:00 2001

Date: Fri, 7 Jul 2017 17:56:20 +0200
Subject: [PATCH 2/2] at91sam9263ek: enable multi-image build
Convert at91sam9263ek to multi-image build as we already do
for many of the i.MX based boards and recently for
the at91sam9x5ek board.

Some additional testing revealed that this patch is buggy.
I was missing CONFIG_RELOCTABLE and for some reasons this
did not show up in my initial testing.

I will send an updated version in some days.

Sam