summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2019-11-09 15:28:35 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2019-11-11 09:15:55 +0100
commit3acac5f7751a5055c023520ff21bb551a2c8ebc3 (patch)
tree4951d595f17b6ed5135f5b3248846ebc6fd462c8
parent7984f6549f300ffd6cff0bae6794b8008cdbbbd0 (diff)
downloadbarebox-3acac5f7751a5055c023520ff21bb551a2c8ebc3.tar.gz
ARM: zynq: switch to multi-image build
Finally move over to a multi-image based build. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/boards/avnet-zedboard/lowlevel.c2
-rw-r--r--arch/arm/configs/zynq_defconfig (renamed from arch/arm/configs/zedboard_defconfig)2
-rw-r--r--arch/arm/mach-zynq/Kconfig18
-rw-r--r--images/Makefile.zynq4
4 files changed, 12 insertions, 14 deletions
diff --git a/arch/arm/boards/avnet-zedboard/lowlevel.c b/arch/arm/boards/avnet-zedboard/lowlevel.c
index ae279e4..93e4da9 100644
--- a/arch/arm/boards/avnet-zedboard/lowlevel.c
+++ b/arch/arm/boards/avnet-zedboard/lowlevel.c
@@ -29,7 +29,7 @@
extern char __dtb_zynq_zed_start[];
-void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
+ENTRY_FUNCTION(start_avnet_zedboard, r0, r1, r2)
{
void *fdt = __dtb_zynq_zed_start + get_runtime_offset();
diff --git a/arch/arm/configs/zedboard_defconfig b/arch/arm/configs/zynq_defconfig
index 0e5078c..a16c57d 100644
--- a/arch/arm/configs/zedboard_defconfig
+++ b/arch/arm/configs/zynq_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARCH_ZYNQ=y
+CONFIG_MACH_ZEDBOARD=y
CONFIG_AEABI=y
CONFIG_ARM_UNWIND=y
CONFIG_MMU=y
@@ -41,5 +42,6 @@ CONFIG_NET=y
CONFIG_DRIVER_SERIAL_CADENCE=y
CONFIG_DRIVER_NET_MACB=y
# CONFIG_SPI is not set
+# CONFIG_PINCTRL is not set
CONFIG_FS_TFTP=y
CONFIG_DIGEST=y
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 944f325..3e07633 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -2,37 +2,33 @@ if ARCH_ZYNQ
config ARCH_TEXT_BASE
hex
- default 0x1ff00000 if MACH_ZEDBOARD
+ default 0x0
config ZYNQ_DEBUG_LL_UART_BASE
hex
default 0xe0001000 if MACH_ZEDBOARD
-choice
- prompt "Xilinx Zynq type board"
-
config ARCH_ZYNQ7000
- bool "Zynq-7000"
+ bool
select CPU_V7
select CLKDEV_LOOKUP
select COMMON_CLK
select COMMON_CLK_OF_PROVIDER
select ARM_SMP_TWD
select HAS_MACB
+ select HAVE_PBL_MULTI_IMAGES
select OFTREE
select OFDEVICE
+ select RELOCATABLE
-endchoice
-if ARCH_ZYNQ7000
-choice
- prompt "Zynq-7000 Board Type"
+menu "select Zynq boards to be built"
config MACH_ZEDBOARD
bool "Avnet Zynq-7000 ZedBoard"
+ select ARCH_ZYNQ7000
-endchoice
-endif
+endmenu
endif
diff --git a/images/Makefile.zynq b/images/Makefile.zynq
index b089a9f..062496a 100644
--- a/images/Makefile.zynq
+++ b/images/Makefile.zynq
@@ -18,6 +18,6 @@ $(obj)/%.zynqimg: $(obj)/% FORCE
#------------------------------------------------------------------------------
-CFG_start_pbl.pblb.zynqimg = $(board)/avnet-zedboard/zedboard.zynqcfg
-FILE_barebox-avnet-zedboard.img = start_pbl.pblb.zynqimg
+CFG_start_avnet_zedboard.pblb.zynqimg = $(board)/avnet-zedboard/zedboard.zynqcfg
+FILE_barebox-avnet-zedboard.img = start_avnet_zedboard.pblb.zynqimg
image-$(CONFIG_MACH_ZEDBOARD) += barebox-avnet-zedboard.img