From 3acac5f7751a5055c023520ff21bb551a2c8ebc3 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Sat, 9 Nov 2019 15:28:35 +0100 Subject: ARM: zynq: switch to multi-image build Finally move over to a multi-image based build. Signed-off-by: Lucas Stach Signed-off-by: Sascha Hauer --- arch/arm/boards/avnet-zedboard/lowlevel.c | 2 +- arch/arm/configs/zedboard_defconfig | 45 ----------------------------- arch/arm/configs/zynq_defconfig | 47 +++++++++++++++++++++++++++++++ arch/arm/mach-zynq/Kconfig | 18 +++++------- images/Makefile.zynq | 4 +-- 5 files changed, 57 insertions(+), 59 deletions(-) delete mode 100644 arch/arm/configs/zedboard_defconfig create mode 100644 arch/arm/configs/zynq_defconfig diff --git a/arch/arm/boards/avnet-zedboard/lowlevel.c b/arch/arm/boards/avnet-zedboard/lowlevel.c index ae279e4e64..93e4da96ec 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/zedboard_defconfig deleted file mode 100644 index 0e5078c402..0000000000 --- a/arch/arm/configs/zedboard_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -CONFIG_ARCH_ZYNQ=y -CONFIG_AEABI=y -CONFIG_ARM_UNWIND=y -CONFIG_MMU=y -CONFIG_STACK_SIZE=0xf000 -CONFIG_MALLOC_SIZE=0x8000000 -CONFIG_MALLOC_TLSF=y -CONFIG_KALLSYMS=y -CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_CMDLINE_EDITING=y -CONFIG_AUTO_COMPLETE=y -CONFIG_MENU=y -CONFIG_BOOTM_SHOW_TYPE=y -CONFIG_BOOTM_VERBOSE=y -CONFIG_BOOTM_INITRD=y -CONFIG_BOOTM_OFTREE=y -CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/avnet-zedboard/env" -CONFIG_DEBUG_LL=y -CONFIG_LONGHELP=y -CONFIG_CMD_MEMINFO=y -CONFIG_CMD_ARM_MMUINFO=y -CONFIG_CMD_GO=y -CONFIG_CMD_RESET=y -CONFIG_CMD_PARTITION=y -CONFIG_CMD_EXPORT=y -CONFIG_CMD_PRINTENV=y -CONFIG_CMD_SAVEENV=y -CONFIG_CMD_LN=y -CONFIG_CMD_SLEEP=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_EDIT=y -CONFIG_CMD_MENU=y -CONFIG_CMD_MENU_MANAGEMENT=y -CONFIG_CMD_READLINE=y -CONFIG_CMD_TIMEOUT=y -CONFIG_CMD_CLK=y -CONFIG_CMD_OFTREE=y -CONFIG_CMD_TIME=y -CONFIG_NET=y -CONFIG_DRIVER_SERIAL_CADENCE=y -CONFIG_DRIVER_NET_MACB=y -# CONFIG_SPI is not set -CONFIG_FS_TFTP=y -CONFIG_DIGEST=y diff --git a/arch/arm/configs/zynq_defconfig b/arch/arm/configs/zynq_defconfig new file mode 100644 index 0000000000..a16c57d5ce --- /dev/null +++ b/arch/arm/configs/zynq_defconfig @@ -0,0 +1,47 @@ +CONFIG_ARCH_ZYNQ=y +CONFIG_MACH_ZEDBOARD=y +CONFIG_AEABI=y +CONFIG_ARM_UNWIND=y +CONFIG_MMU=y +CONFIG_STACK_SIZE=0xf000 +CONFIG_MALLOC_SIZE=0x8000000 +CONFIG_MALLOC_TLSF=y +CONFIG_KALLSYMS=y +CONFIG_HUSH_FANCY_PROMPT=y +CONFIG_CMDLINE_EDITING=y +CONFIG_AUTO_COMPLETE=y +CONFIG_MENU=y +CONFIG_BOOTM_SHOW_TYPE=y +CONFIG_BOOTM_VERBOSE=y +CONFIG_BOOTM_INITRD=y +CONFIG_BOOTM_OFTREE=y +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y +CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/avnet-zedboard/env" +CONFIG_DEBUG_LL=y +CONFIG_LONGHELP=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_ARM_MMUINFO=y +CONFIG_CMD_GO=y +CONFIG_CMD_RESET=y +CONFIG_CMD_PARTITION=y +CONFIG_CMD_EXPORT=y +CONFIG_CMD_PRINTENV=y +CONFIG_CMD_SAVEENV=y +CONFIG_CMD_LN=y +CONFIG_CMD_SLEEP=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_EDIT=y +CONFIG_CMD_MENU=y +CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_READLINE=y +CONFIG_CMD_TIMEOUT=y +CONFIG_CMD_CLK=y +CONFIG_CMD_OFTREE=y +CONFIG_CMD_TIME=y +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 944f325bcc..3e07633e5f 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 b089a9fd26..062496ac7d 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 -- cgit v1.2.3