On 1.6.2017 10:12, Mike Looijmans wrote:

On 29-05-17 17:34, Michal Simek wrote:

...

On 29.5.2017 15:41, Mike Looijmans wrote:

...

The topic-miamilite SoM contains a Zynq xc7z010 SoC, 1GB DDR3L RAM, 64MB dual-parallel QSPI NOR flash and clock sources.

Signed-off-by: Mike Looijmans mike.looijmans@topic.nl

arch/arm/dts/Makefile | 1 + arch/arm/dts/zynq-topic-miamilite.dts | 17 ++ .../topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c | 227 +++++++++++++++++++++ board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt | 61 ++++++ configs/topic_miamilite_defconfig | 52 +++++ include/configs/topic_miamilite.h | 2 + 6 files changed, 360 insertions(+) create mode 100644 arch/arm/dts/zynq-topic-miamilite.dts create mode 100644 board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c create mode 100644 board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt create mode 100644 configs/topic_miamilite_defconfig create mode 100644 include/configs/topic_miamilite.h

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 2b1a4e9..8745f04 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -122,6 +122,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \ zynq-microzed.dtb \ zynq-picozed.dtb \ zynq-topic-miami.dtb \

• zynq-topic-miamilite.dtb \ zynq-topic-miamiplus.dtb \ zynq-zc770-xm010.dtb \ zynq-zc770-xm011.dtb \

diff --git a/arch/arm/dts/zynq-topic-miamilite.dts b/arch/arm/dts/zynq-topic-miamilite.dts new file mode 100644 index 0000000..f88cb4b --- /dev/null +++ b/arch/arm/dts/zynq-topic-miamilite.dts @@ -0,0 +1,17 @@ +/*

• • Topic Miami Lite board DTS
• • Copyright (C) 2017 Topic Embedded Products
• • SPDX-License-Identifier: GPL-2.0+
• */

+#include "zynq-topic-miami.dts"

+/ {

• model = "Topic Miami Lite Zynq Board";
• compatible = "topic,miamilite", "xlnx,zynq-7000";

+};

+&qspi {

• is-dual = <1>;

+}; diff --git a/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c b/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c new file mode 100644 index 0000000..ec0cc7d --- /dev/null +++ b/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c @@ -0,0 +1,227 @@ +/*

• • (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved.
• • (c) Copyright 2016 Topic Embedded Products.
• • SPDX-License-Identifier: GPL-2.0+
• */

+#include "../ps7_init_gpl.h"

+static unsigned long ps7_pll_init_data_3_0[] = {

• EMIT_MASKWRITE(0xF8000008, 0x0000FFFFU, 0x0000DF0DU),
• EMIT_MASKWRITE(0xF8000110, 0x003FFFF0U, 0x000FA220U),
• EMIT_MASKWRITE(0xF8000100, 0x0007F000U, 0x00028000U),
• EMIT_MASKWRITE(0xF8000100, 0x00000010U, 0x00000010U),
• EMIT_MASKWRITE(0xF8000100, 0x00000001U, 0x00000001U),
• EMIT_MASKWRITE(0xF8000100, 0x00000001U, 0x00000000U),
• EMIT_MASKPOLL(0xF800010C, 0x00000001U),
• EMIT_MASKWRITE(0xF8000100, 0x00000010U, 0x00000000U),
• EMIT_MASKWRITE(0xF8000120, 0x1F003F30U, 0x1F000200U),
• EMIT_MASKWRITE(0xF8000114, 0x003FFFF0U, 0x0012C220U),
• EMIT_MASKWRITE(0xF8000104, 0x0007F000U, 0x00020000U),
• EMIT_MASKWRITE(0xF8000104, 0x00000010U, 0x00000010U),
• EMIT_MASKWRITE(0xF8000104, 0x00000001U, 0x00000001U),
• EMIT_MASKWRITE(0xF8000104, 0x00000001U, 0x00000000U),
• EMIT_MASKPOLL(0xF800010C, 0x00000002U),
• EMIT_MASKWRITE(0xF8000104, 0x00000010U, 0x00000000U),
• EMIT_MASKWRITE(0xF8000124, 0xFFF00003U, 0x0C200003U),
• EMIT_MASKWRITE(0xF8000118, 0x003FFFF0U, 0x00113220U),
• EMIT_MASKWRITE(0xF8000108, 0x0007F000U, 0x00024000U),
• EMIT_MASKWRITE(0xF8000108, 0x00000010U, 0x00000010U),
• EMIT_MASKWRITE(0xF8000108, 0x00000001U, 0x00000001U),
• EMIT_MASKWRITE(0xF8000108, 0x00000001U, 0x00000000U),
• EMIT_MASKPOLL(0xF800010C, 0x00000004U),
• EMIT_MASKWRITE(0xF8000108, 0x00000010U, 0x00000000U),
• EMIT_MASKWRITE(0xF8000004, 0x0000FFFFU, 0x0000767BU),
• EMIT_EXIT(),

+};

+static unsigned long ps7_clock_init_data_3_0[] = {

• EMIT_MASKWRITE(0xF8000008, 0x0000FFFFU, 0x0000DF0DU),
• EMIT_MASKWRITE(0xF8000128, 0x03F03F01U, 0x00302301U),
• EMIT_MASKWRITE(0xF8000138, 0x00000011U, 0x00000011U),
• EMIT_MASKWRITE(0xF800013C, 0x00000011U, 0x00000011U),
• EMIT_MASKWRITE(0xF8000140, 0x03F03F71U, 0x00100141U),
• EMIT_MASKWRITE(0xF8000144, 0x03F03F71U, 0x00100141U),
• EMIT_MASKWRITE(0xF8000148, 0x00003F31U, 0x00000C01U),
• EMIT_MASKWRITE(0xF800014C, 0x00003F31U, 0x00000601U),
• EMIT_MASKWRITE(0xF8000150, 0x00003F33U, 0x00001803U),
• EMIT_MASKWRITE(0xF8000154, 0x00003F33U, 0x00000C03U),
• EMIT_MASKWRITE(0xF8000158, 0x00003F33U, 0x00000601U),
• EMIT_MASKWRITE(0xF8000168, 0x00003F31U, 0x00000601U),
• EMIT_MASKWRITE(0xF8000170, 0x03F03F30U, 0x00100C00U),
• EMIT_MASKWRITE(0xF8000180, 0x03F03F30U, 0x00100C00U),
• EMIT_MASKWRITE(0xF8000190, 0x03F03F30U, 0x00100600U),
• EMIT_MASKWRITE(0xF80001A0, 0x03F03F30U, 0x00101800U),
• EMIT_MASKWRITE(0xF80001C4, 0x00000001U, 0x00000001U),
• EMIT_MASKWRITE(0xF800012C, 0x01FFCCCDU, 0x01FC4C4DU),
• EMIT_MASKWRITE(0xF8000004, 0x0000FFFFU, 0x0000767BU),
• EMIT_EXIT(),

+};

+static unsigned long ps7_ddr_init_data_3_0[] = {

• EMIT_MASKWRITE(0xF8006000, 0x0001FFFFU, 0x00000080U),
• EMIT_MASKWRITE(0xF8006004, 0x0007FFFFU, 0x00001081U),
• EMIT_MASKWRITE(0xF8006008, 0x03FFFFFFU, 0x03C0780FU),
• EMIT_MASKWRITE(0xF800600C, 0x03FFFFFFU, 0x02001001U),
• EMIT_MASKWRITE(0xF8006010, 0x03FFFFFFU, 0x00014001U),
• EMIT_MASKWRITE(0xF8006014, 0x001FFFFFU, 0x0004281AU),
• EMIT_MASKWRITE(0xF8006018, 0xF7FFFFFFU, 0x44E458D2U),
• EMIT_MASKWRITE(0xF800601C, 0xFFFFFFFFU, 0x720238E5U),
• EMIT_MASKWRITE(0xF8006020, 0x7FDFFFFCU, 0x270872D0U),
• EMIT_MASKWRITE(0xF8006024, 0x0FFFFFC3U, 0x00000000U),
• EMIT_MASKWRITE(0xF8006028, 0x00003FFFU, 0x00002007U),
• EMIT_MASKWRITE(0xF800602C, 0xFFFFFFFFU, 0x00000008U),
• EMIT_MASKWRITE(0xF8006030, 0xFFFFFFFFU, 0x00040930U),
• EMIT_MASKWRITE(0xF8006034, 0x13FF3FFFU, 0x000116D4U),
• EMIT_MASKWRITE(0xF8006038, 0x00000003U, 0x00000000U),
• EMIT_MASKWRITE(0xF800603C, 0x000FFFFFU, 0x00000777U),
• EMIT_MASKWRITE(0xF8006040, 0xFFFFFFFFU, 0xFFF00000U),
• EMIT_MASKWRITE(0xF8006044, 0x0FFFFFFFU, 0x0F666666U),
• EMIT_MASKWRITE(0xF8006048, 0x0003F03FU, 0x0003C008U),
• EMIT_MASKWRITE(0xF8006050, 0xFF0F8FFFU, 0x77010800U),
• EMIT_MASKWRITE(0xF8006058, 0x00010000U, 0x00000000U),
• EMIT_MASKWRITE(0xF800605C, 0x0000FFFFU, 0x00005003U),
• EMIT_MASKWRITE(0xF8006060, 0x000017FFU, 0x0000003EU),
• EMIT_MASKWRITE(0xF8006064, 0x00021FE0U, 0x00020000U),
• EMIT_MASKWRITE(0xF8006068, 0x03FFFFFFU, 0x00284141U),
• EMIT_MASKWRITE(0xF800606C, 0x0000FFFFU, 0x00001610U),
• EMIT_MASKWRITE(0xF8006078, 0x03FFFFFFU, 0x00466111U),
• EMIT_MASKWRITE(0xF800607C, 0x000FFFFFU, 0x00032222U),
• EMIT_MASKWRITE(0xF80060A4, 0xFFFFFFFFU, 0x10200802U),
• EMIT_MASKWRITE(0xF80060A8, 0x0FFFFFFFU, 0x0690CB73U),
• EMIT_MASKWRITE(0xF80060AC, 0x000001FFU, 0x000001FEU),
• EMIT_MASKWRITE(0xF80060B0, 0x1FFFFFFFU, 0x1CFFFFFFU),
• EMIT_MASKWRITE(0xF80060B4, 0x00000200U, 0x00000200U),
• EMIT_MASKWRITE(0xF80060B8, 0x01FFFFFFU, 0x00200066U),
• EMIT_MASKWRITE(0xF80060C4, 0x00000003U, 0x00000003U),
• EMIT_MASKWRITE(0xF80060C4, 0x00000003U, 0x00000000U),
• EMIT_MASKWRITE(0xF80060C8, 0x000000FFU, 0x00000000U),
• EMIT_MASKWRITE(0xF80060DC, 0x00000001U, 0x00000000U),
• EMIT_MASKWRITE(0xF80060F0, 0x0000FFFFU, 0x00000000U),
• EMIT_MASKWRITE(0xF80060F4, 0x0000000FU, 0x00000008U),
• EMIT_MASKWRITE(0xF8006114, 0x000000FFU, 0x00000000U),
• EMIT_MASKWRITE(0xF8006118, 0x7FFFFFCFU, 0x40000001U),
• EMIT_MASKWRITE(0xF800611C, 0x7FFFFFCFU, 0x40000001U),
• EMIT_MASKWRITE(0xF8006120, 0x7FFFFFCFU, 0x40000001U),
• EMIT_MASKWRITE(0xF8006124, 0x7FFFFFCFU, 0x40000001U),
• EMIT_MASKWRITE(0xF800612C, 0x000FFFFFU, 0x0003482CU),
• EMIT_MASKWRITE(0xF8006130, 0x000FFFFFU, 0x00033032U),
• EMIT_MASKWRITE(0xF8006134, 0x000FFFFFU, 0x0002E81FU),
• EMIT_MASKWRITE(0xF8006138, 0x000FFFFFU, 0x0002F81AU),
• EMIT_MASKWRITE(0xF8006140, 0x000FFFFFU, 0x00000035U),
• EMIT_MASKWRITE(0xF8006144, 0x000FFFFFU, 0x00000035U),
• EMIT_MASKWRITE(0xF8006148, 0x000FFFFFU, 0x00000035U),
• EMIT_MASKWRITE(0xF800614C, 0x000FFFFFU, 0x00000035U),
• EMIT_MASKWRITE(0xF8006154, 0x000FFFFFU, 0x000000ACU),
• EMIT_MASKWRITE(0xF8006158, 0x000FFFFFU, 0x000000B2U),
• EMIT_MASKWRITE(0xF800615C, 0x000FFFFFU, 0x0000009FU),
• EMIT_MASKWRITE(0xF8006160, 0x000FFFFFU, 0x0000009AU),
• EMIT_MASKWRITE(0xF8006168, 0x001FFFFFU, 0x00000127U),
• EMIT_MASKWRITE(0xF800616C, 0x001FFFFFU, 0x00000121U),
• EMIT_MASKWRITE(0xF8006170, 0x001FFFFFU, 0x0000010FU),
• EMIT_MASKWRITE(0xF8006174, 0x001FFFFFU, 0x00000113U),
• EMIT_MASKWRITE(0xF800617C, 0x000FFFFFU, 0x000000ECU),
• EMIT_MASKWRITE(0xF8006180, 0x000FFFFFU, 0x000000F2U),
• EMIT_MASKWRITE(0xF8006184, 0x000FFFFFU, 0x000000DFU),
• EMIT_MASKWRITE(0xF8006188, 0x000FFFFFU, 0x000000DAU),
• EMIT_MASKWRITE(0xF8006190, 0xFFFFFFFFU, 0x1002E080U),
• EMIT_MASKWRITE(0xF8006194, 0x000FFFFFU, 0x0001FC82U),
• EMIT_MASKWRITE(0xF8006204, 0xFFFFFFFFU, 0x00000000U),
• EMIT_MASKWRITE(0xF8006208, 0x000703FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF800620C, 0x000703FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF8006210, 0x000703FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF8006214, 0x000703FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF8006218, 0x000F03FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF800621C, 0x000F03FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF8006220, 0x000F03FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF8006224, 0x000F03FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF80062A8, 0x00000FF5U, 0x00000000U),
• EMIT_MASKWRITE(0xF80062AC, 0xFFFFFFFFU, 0x00000000U),
• EMIT_MASKWRITE(0xF80062B0, 0x003FFFFFU, 0x00005125U),
• EMIT_MASKWRITE(0xF80062B4, 0x0003FFFFU, 0x000012A8U),
• EMIT_MASKPOLL(0xF8000B74, 0x00002000U),
• EMIT_MASKWRITE(0xF8006000, 0x0001FFFFU, 0x00000081U),
• EMIT_MASKPOLL(0xF8006054, 0x00000007U),
• EMIT_EXIT(),

+};

+static unsigned long ps7_mio_init_data_3_0[] = {

• EMIT_MASKWRITE(0xF8000008, 0x0000FFFFU, 0x0000DF0DU),
• EMIT_MASKWRITE(0xF8000B40, 0x00000FFFU, 0x00000600U),
• EMIT_MASKWRITE(0xF8000B44, 0x00000FFFU, 0x00000600U),
• EMIT_MASKWRITE(0xF8000B48, 0x00000FFFU, 0x00000672U),
• EMIT_MASKWRITE(0xF8000B4C, 0x00000FFFU, 0x00000672U),
• EMIT_MASKWRITE(0xF8000B50, 0x00000FFFU, 0x00000674U),
• EMIT_MASKWRITE(0xF8000B54, 0x00000FFFU, 0x00000674U),
• EMIT_MASKWRITE(0xF8000B58, 0x00000FFFU, 0x00000600U),
• EMIT_MASKWRITE(0xF8000B5C, 0xFFFFFFFFU, 0x0018C61CU),
• EMIT_MASKWRITE(0xF8000B60, 0xFFFFFFFFU, 0x00F9861CU),
• EMIT_MASKWRITE(0xF8000B64, 0xFFFFFFFFU, 0x00F9861CU),
• EMIT_MASKWRITE(0xF8000B68, 0xFFFFFFFFU, 0x00F9861CU),
• EMIT_MASKWRITE(0xF8000B6C, 0x00007FFFU, 0x00000E60U),
• EMIT_MASKWRITE(0xF8000B70, 0x00000001U, 0x00000001U),
• EMIT_MASKWRITE(0xF8000B70, 0x00000021U, 0x00000020U),
• EMIT_MASKWRITE(0xF8000B70, 0x07FEFFFFU, 0x00000823U),
• EMIT_MASKWRITE(0xF8000004, 0x0000FFFFU, 0x0000767BU),
• EMIT_EXIT(),

+};

+static unsigned long ps7_peripherals_init_data_3_0[] = {

• EMIT_MASKWRITE(0xF8000008, 0x0000FFFFU, 0x0000DF0DU),
• EMIT_MASKWRITE(0xF8000B48, 0x00000180U, 0x00000180U),
• EMIT_MASKWRITE(0xF8000B4C, 0x00000180U, 0x00000180U),
• EMIT_MASKWRITE(0xF8000B50, 0x00000180U, 0x00000180U),
• EMIT_MASKWRITE(0xF8000B54, 0x00000180U, 0x00000180U),
• EMIT_MASKWRITE(0xF8000004, 0x0000FFFFU, 0x0000767BU),
• EMIT_MASKWRITE(0xE0001034, 0x000000FFU, 0x00000006U),
• EMIT_MASKWRITE(0xE0001018, 0x0000FFFFU, 0x0000007CU),
• EMIT_MASKWRITE(0xE0001000, 0x000001FFU, 0x00000017U),
• EMIT_MASKWRITE(0xE0001004, 0x000003FFU, 0x00000020U),
• EMIT_MASKWRITE(0xE0000034, 0x000000FFU, 0x00000006U),
• EMIT_MASKWRITE(0xE0000018, 0x0000FFFFU, 0x0000007CU),
• EMIT_MASKWRITE(0xE0000000, 0x000001FFU, 0x00000017U),
• EMIT_MASKWRITE(0xE0000004, 0x000003FFU, 0x00000020U),
• EMIT_MASKWRITE(0xE000D000, 0x000800FFU, 0x000800C1U),
• EMIT_MASKWRITE(0xF8007000, 0x20000000U, 0x00000000U),
• EMIT_MASKDELAY(0xF8F00200, 1),
• EMIT_MASKDELAY(0xF8F00200, 1),
• EMIT_MASKDELAY(0xF8F00200, 1),
• EMIT_EXIT(),

+};

+static unsigned long ps7_post_config_3_0[] = {

• EMIT_MASKWRITE(0xF8000008, 0x0000FFFFU, 0x0000DF0DU),
• EMIT_MASKWRITE(0xF8000900, 0x0000000FU, 0x0000000FU),
• EMIT_MASKWRITE(0xF8000240, 0xFFFFFFFFU, 0x00000000U),
• EMIT_MASKWRITE(0xF8000004, 0x0000FFFFU, 0x0000767BU),
• EMIT_EXIT(),

+};

+int ps7_init(void) +{

• int ret;
• ret = ps7_config(ps7_mio_init_data_3_0);
• if (ret != PS7_INIT_SUCCESS)

•    return ret;
  

• ret = ps7_config(ps7_pll_init_data_3_0);
• if (ret != PS7_INIT_SUCCESS)

•    return ret;
  

• ret = ps7_config(ps7_clock_init_data_3_0);
• if (ret != PS7_INIT_SUCCESS)

•    return ret;
  

• ret = ps7_config(ps7_ddr_init_data_3_0);
• if (ret != PS7_INIT_SUCCESS)

•    return ret;
  

• ret = ps7_config(ps7_peripherals_init_data_3_0);
• if (ret != PS7_INIT_SUCCESS)

•    return ret;
  

• return PS7_INIT_SUCCESS;

+}

+int ps7_post_config(void) +{

• return ps7_config(ps7_post_config_3_0);

+} diff --git a/board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt b/board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt new file mode 100644 index 0000000..db6e642 --- /dev/null +++ b/board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt @@ -0,0 +1,61 @@ +0xF8000120 0x1F000200 // ARM_CLK_CTRL - divisor = 2 433 MHz (?) +0xf8000700 0x202 +0xf8000704 0x202 +0xf8000708 0x202 +0xf800070c 0x202 +0xf8000710 0x202 +0xf8000714 0x202 +0xf8000718 0x202 +0xf800071c 0x200 +0xf8000720 0x202 +0xf8000724 0x202 +0xf8000728 0x202 +0xf800072c 0x202 +0xf8000730 0x202 +0xf8000734 0x202 +0xf8000738 0x12e1 +0xf800073c 0x12e0 +0xf8000740 0x1200 +0xf8000744 0x1200 +0xf8000748 0x1200 +0xf800074c 0x1200 +0xf8000750 0x1200 +0xf8000754 0x1200 +0xf8000758 0x1200 +0xf800075c 0x1200 +0xf8000760 0x1200 +0xf8000764 0x200 +0xf8000768 0x1200 +0xf800076c 0x200 +0xf8000770 0x304 +0xf8000774 0x305 +0xf8000778 0x304 +0xf800077c 0x305 +0xf8000780 0x304 +0xf8000784 0x304 +0xf8000788 0x304 +0xf800078c 0x304 +0xf8000790 0x305 +0xf8000794 0x304 +0xf8000798 0x304 +0xf800079c 0x304 +0xf80007a0 0x380 +0xf80007a4 0x380 +0xf80007a8 0x380 +0xf80007ac 0x380 +0xf80007b0 0x380 +0xf80007b4 0x380 +0xf80007b8 0x1200 +0xf80007bc 0x1200 +0xf80007c0 0x1240 +0xf80007c4 0x1240 +0xf80007c8 0x1240 +0xf80007cc 0x1240 +0xf80007d0 0x1200 +0xf80007d4 0x1200 +0xf8000830 0x380037 +0xf8000834 0x3a0039 +0xF800014C 0x00000621 // LQSPI_CLK_CTRL - ARMPLL/6 (200 MHz) +0xE000D000 0x800238C1 // QSPI config - divide-by-2 +0xE000D038 0x00000020 // QSPI loopback - internal, 0 delay +0xE000D0A0 0xE2FF06EB // LQSPI_CFG - Quad read, dual flash diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig new file mode 100644 index 0000000..8959fa6 --- /dev/null +++ b/configs/topic_miamilite_defconfig @@ -0,0 +1,52 @@ +CONFIG_ARM=y +CONFIG_SYS_VENDOR="topic" +CONFIG_SYS_CONFIG_NAME="topic_miamilite" +CONFIG_ARCH_ZYNQ=y +CONFIG_SYS_TEXT_BASE=0x4000000 +CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt"

+CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miamilite" +CONFIG_BOOTDELAY=0 +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="zynq-uboot> " +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +# CONFIG_CMD_NET is not set +# CONFIG_CMD_NFS is not set +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_EMBED=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_DFU_RAM=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_STMICRO=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ZYNQ=y +CONFIG_DEBUG_UART_BASE=0xe0000000 +CONFIG_DEBUG_UART_CLOCK=100000000 +CONFIG_ZYNQ_QSPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_ULPI_VIEWPORT=y +CONFIG_USB_ULPI=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Xilinx" +CONFIG_G_DNL_VENDOR_NUM=0x03fd +CONFIG_G_DNL_PRODUCT_NUM=0x0300 diff --git a/include/configs/topic_miamilite.h b/include/configs/topic_miamilite.h new file mode 100644 index 0000000..46ca6bd --- /dev/null +++ b/include/configs/topic_miamilite.h @@ -0,0 +1,2 @@ +#include "topic_miami.h" +#define CONFIG_SF_DUAL_FLASH

Isn't it easier to define this in Kconfig and just select it? All configs are on the way to Kconfig anyway.

Probably, yes, but this appears to be the current state. I did a grep on the keywork and strangely only the two topic boards mention it. Apparently no other boards use dual-qspu flash?

I'd propose making the move to Kconfig a separate patch. This patch can be rebased on that.

Not a problem.

M

On 1.6.2017 10:49, Mike Looijmans wrote:

The topic-miamilite SoM contains a Zynq xc7z010 SoC, 1GB DDR3L RAM, 64MB dual-parallel QSPI NOR flash and clock sources.

Signed-off-by: Mike Looijmans mike.looijmans@topic.nl

v2: Move CONFIG_SF_DUAL_FLASH to defconfig

arch/arm/dts/Makefile | 1 + arch/arm/dts/zynq-topic-miamilite.dts | 17 ++ .../topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c | 227 +++++++++++++++++++++ board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt | 61 ++++++ configs/topic_miamilite_defconfig | 53 +++++ 5 files changed, 359 insertions(+) create mode 100644 arch/arm/dts/zynq-topic-miamilite.dts create mode 100644 board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c create mode 100644 board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt create mode 100644 configs/topic_miamilite_defconfig

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 2b1a4e9..8745f04 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -122,6 +122,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \ zynq-microzed.dtb \ zynq-picozed.dtb \ zynq-topic-miami.dtb \

• zynq-topic-miamilite.dtb \ zynq-topic-miamiplus.dtb \ zynq-zc770-xm010.dtb \ zynq-zc770-xm011.dtb \

diff --git a/arch/arm/dts/zynq-topic-miamilite.dts b/arch/arm/dts/zynq-topic-miamilite.dts new file mode 100644 index 0000000..f88cb4b --- /dev/null +++ b/arch/arm/dts/zynq-topic-miamilite.dts @@ -0,0 +1,17 @@ +/*

• • Topic Miami Lite board DTS
• • Copyright (C) 2017 Topic Embedded Products
• • SPDX-License-Identifier: GPL-2.0+
• */

+#include "zynq-topic-miami.dts"

+/ {

• model = "Topic Miami Lite Zynq Board";
• compatible = "topic,miamilite", "xlnx,zynq-7000";

+};

+&qspi {

• is-dual = <1>;

+}; diff --git a/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c b/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c new file mode 100644 index 0000000..ec0cc7d --- /dev/null +++ b/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c @@ -0,0 +1,227 @@ +/*

• • (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved.
• • (c) Copyright 2016 Topic Embedded Products.
• • SPDX-License-Identifier: GPL-2.0+
• */

+#include "../ps7_init_gpl.h"

+static unsigned long ps7_pll_init_data_3_0[] = {

• EMIT_MASKWRITE(0xF8000008, 0x0000FFFFU, 0x0000DF0DU),
• EMIT_MASKWRITE(0xF8000110, 0x003FFFF0U, 0x000FA220U),
• EMIT_MASKWRITE(0xF8000100, 0x0007F000U, 0x00028000U),
• EMIT_MASKWRITE(0xF8000100, 0x00000010U, 0x00000010U),
• EMIT_MASKWRITE(0xF8000100, 0x00000001U, 0x00000001U),
• EMIT_MASKWRITE(0xF8000100, 0x00000001U, 0x00000000U),
• EMIT_MASKPOLL(0xF800010C, 0x00000001U),
• EMIT_MASKWRITE(0xF8000100, 0x00000010U, 0x00000000U),
• EMIT_MASKWRITE(0xF8000120, 0x1F003F30U, 0x1F000200U),
• EMIT_MASKWRITE(0xF8000114, 0x003FFFF0U, 0x0012C220U),
• EMIT_MASKWRITE(0xF8000104, 0x0007F000U, 0x00020000U),
• EMIT_MASKWRITE(0xF8000104, 0x00000010U, 0x00000010U),
• EMIT_MASKWRITE(0xF8000104, 0x00000001U, 0x00000001U),
• EMIT_MASKWRITE(0xF8000104, 0x00000001U, 0x00000000U),
• EMIT_MASKPOLL(0xF800010C, 0x00000002U),
• EMIT_MASKWRITE(0xF8000104, 0x00000010U, 0x00000000U),
• EMIT_MASKWRITE(0xF8000124, 0xFFF00003U, 0x0C200003U),
• EMIT_MASKWRITE(0xF8000118, 0x003FFFF0U, 0x00113220U),
• EMIT_MASKWRITE(0xF8000108, 0x0007F000U, 0x00024000U),
• EMIT_MASKWRITE(0xF8000108, 0x00000010U, 0x00000010U),
• EMIT_MASKWRITE(0xF8000108, 0x00000001U, 0x00000001U),
• EMIT_MASKWRITE(0xF8000108, 0x00000001U, 0x00000000U),
• EMIT_MASKPOLL(0xF800010C, 0x00000004U),
• EMIT_MASKWRITE(0xF8000108, 0x00000010U, 0x00000000U),
• EMIT_MASKWRITE(0xF8000004, 0x0000FFFFU, 0x0000767BU),
• EMIT_EXIT(),

+};

+static unsigned long ps7_clock_init_data_3_0[] = {

• EMIT_MASKWRITE(0xF8000008, 0x0000FFFFU, 0x0000DF0DU),
• EMIT_MASKWRITE(0xF8000128, 0x03F03F01U, 0x00302301U),
• EMIT_MASKWRITE(0xF8000138, 0x00000011U, 0x00000011U),
• EMIT_MASKWRITE(0xF800013C, 0x00000011U, 0x00000011U),
• EMIT_MASKWRITE(0xF8000140, 0x03F03F71U, 0x00100141U),
• EMIT_MASKWRITE(0xF8000144, 0x03F03F71U, 0x00100141U),
• EMIT_MASKWRITE(0xF8000148, 0x00003F31U, 0x00000C01U),
• EMIT_MASKWRITE(0xF800014C, 0x00003F31U, 0x00000601U),
• EMIT_MASKWRITE(0xF8000150, 0x00003F33U, 0x00001803U),
• EMIT_MASKWRITE(0xF8000154, 0x00003F33U, 0x00000C03U),
• EMIT_MASKWRITE(0xF8000158, 0x00003F33U, 0x00000601U),
• EMIT_MASKWRITE(0xF8000168, 0x00003F31U, 0x00000601U),
• EMIT_MASKWRITE(0xF8000170, 0x03F03F30U, 0x00100C00U),
• EMIT_MASKWRITE(0xF8000180, 0x03F03F30U, 0x00100C00U),
• EMIT_MASKWRITE(0xF8000190, 0x03F03F30U, 0x00100600U),
• EMIT_MASKWRITE(0xF80001A0, 0x03F03F30U, 0x00101800U),
• EMIT_MASKWRITE(0xF80001C4, 0x00000001U, 0x00000001U),
• EMIT_MASKWRITE(0xF800012C, 0x01FFCCCDU, 0x01FC4C4DU),
• EMIT_MASKWRITE(0xF8000004, 0x0000FFFFU, 0x0000767BU),
• EMIT_EXIT(),

+};

+static unsigned long ps7_ddr_init_data_3_0[] = {

• EMIT_MASKWRITE(0xF8006000, 0x0001FFFFU, 0x00000080U),
• EMIT_MASKWRITE(0xF8006004, 0x0007FFFFU, 0x00001081U),
• EMIT_MASKWRITE(0xF8006008, 0x03FFFFFFU, 0x03C0780FU),
• EMIT_MASKWRITE(0xF800600C, 0x03FFFFFFU, 0x02001001U),
• EMIT_MASKWRITE(0xF8006010, 0x03FFFFFFU, 0x00014001U),
• EMIT_MASKWRITE(0xF8006014, 0x001FFFFFU, 0x0004281AU),
• EMIT_MASKWRITE(0xF8006018, 0xF7FFFFFFU, 0x44E458D2U),
• EMIT_MASKWRITE(0xF800601C, 0xFFFFFFFFU, 0x720238E5U),
• EMIT_MASKWRITE(0xF8006020, 0x7FDFFFFCU, 0x270872D0U),
• EMIT_MASKWRITE(0xF8006024, 0x0FFFFFC3U, 0x00000000U),
• EMIT_MASKWRITE(0xF8006028, 0x00003FFFU, 0x00002007U),
• EMIT_MASKWRITE(0xF800602C, 0xFFFFFFFFU, 0x00000008U),
• EMIT_MASKWRITE(0xF8006030, 0xFFFFFFFFU, 0x00040930U),
• EMIT_MASKWRITE(0xF8006034, 0x13FF3FFFU, 0x000116D4U),
• EMIT_MASKWRITE(0xF8006038, 0x00000003U, 0x00000000U),
• EMIT_MASKWRITE(0xF800603C, 0x000FFFFFU, 0x00000777U),
• EMIT_MASKWRITE(0xF8006040, 0xFFFFFFFFU, 0xFFF00000U),
• EMIT_MASKWRITE(0xF8006044, 0x0FFFFFFFU, 0x0F666666U),
• EMIT_MASKWRITE(0xF8006048, 0x0003F03FU, 0x0003C008U),
• EMIT_MASKWRITE(0xF8006050, 0xFF0F8FFFU, 0x77010800U),
• EMIT_MASKWRITE(0xF8006058, 0x00010000U, 0x00000000U),
• EMIT_MASKWRITE(0xF800605C, 0x0000FFFFU, 0x00005003U),
• EMIT_MASKWRITE(0xF8006060, 0x000017FFU, 0x0000003EU),
• EMIT_MASKWRITE(0xF8006064, 0x00021FE0U, 0x00020000U),
• EMIT_MASKWRITE(0xF8006068, 0x03FFFFFFU, 0x00284141U),
• EMIT_MASKWRITE(0xF800606C, 0x0000FFFFU, 0x00001610U),
• EMIT_MASKWRITE(0xF8006078, 0x03FFFFFFU, 0x00466111U),
• EMIT_MASKWRITE(0xF800607C, 0x000FFFFFU, 0x00032222U),
• EMIT_MASKWRITE(0xF80060A4, 0xFFFFFFFFU, 0x10200802U),
• EMIT_MASKWRITE(0xF80060A8, 0x0FFFFFFFU, 0x0690CB73U),
• EMIT_MASKWRITE(0xF80060AC, 0x000001FFU, 0x000001FEU),
• EMIT_MASKWRITE(0xF80060B0, 0x1FFFFFFFU, 0x1CFFFFFFU),
• EMIT_MASKWRITE(0xF80060B4, 0x00000200U, 0x00000200U),
• EMIT_MASKWRITE(0xF80060B8, 0x01FFFFFFU, 0x00200066U),
• EMIT_MASKWRITE(0xF80060C4, 0x00000003U, 0x00000003U),
• EMIT_MASKWRITE(0xF80060C4, 0x00000003U, 0x00000000U),
• EMIT_MASKWRITE(0xF80060C8, 0x000000FFU, 0x00000000U),
• EMIT_MASKWRITE(0xF80060DC, 0x00000001U, 0x00000000U),
• EMIT_MASKWRITE(0xF80060F0, 0x0000FFFFU, 0x00000000U),
• EMIT_MASKWRITE(0xF80060F4, 0x0000000FU, 0x00000008U),
• EMIT_MASKWRITE(0xF8006114, 0x000000FFU, 0x00000000U),
• EMIT_MASKWRITE(0xF8006118, 0x7FFFFFCFU, 0x40000001U),
• EMIT_MASKWRITE(0xF800611C, 0x7FFFFFCFU, 0x40000001U),
• EMIT_MASKWRITE(0xF8006120, 0x7FFFFFCFU, 0x40000001U),
• EMIT_MASKWRITE(0xF8006124, 0x7FFFFFCFU, 0x40000001U),
• EMIT_MASKWRITE(0xF800612C, 0x000FFFFFU, 0x0003482CU),
• EMIT_MASKWRITE(0xF8006130, 0x000FFFFFU, 0x00033032U),
• EMIT_MASKWRITE(0xF8006134, 0x000FFFFFU, 0x0002E81FU),
• EMIT_MASKWRITE(0xF8006138, 0x000FFFFFU, 0x0002F81AU),
• EMIT_MASKWRITE(0xF8006140, 0x000FFFFFU, 0x00000035U),
• EMIT_MASKWRITE(0xF8006144, 0x000FFFFFU, 0x00000035U),
• EMIT_MASKWRITE(0xF8006148, 0x000FFFFFU, 0x00000035U),
• EMIT_MASKWRITE(0xF800614C, 0x000FFFFFU, 0x00000035U),
• EMIT_MASKWRITE(0xF8006154, 0x000FFFFFU, 0x000000ACU),
• EMIT_MASKWRITE(0xF8006158, 0x000FFFFFU, 0x000000B2U),
• EMIT_MASKWRITE(0xF800615C, 0x000FFFFFU, 0x0000009FU),
• EMIT_MASKWRITE(0xF8006160, 0x000FFFFFU, 0x0000009AU),
• EMIT_MASKWRITE(0xF8006168, 0x001FFFFFU, 0x00000127U),
• EMIT_MASKWRITE(0xF800616C, 0x001FFFFFU, 0x00000121U),
• EMIT_MASKWRITE(0xF8006170, 0x001FFFFFU, 0x0000010FU),
• EMIT_MASKWRITE(0xF8006174, 0x001FFFFFU, 0x00000113U),
• EMIT_MASKWRITE(0xF800617C, 0x000FFFFFU, 0x000000ECU),
• EMIT_MASKWRITE(0xF8006180, 0x000FFFFFU, 0x000000F2U),
• EMIT_MASKWRITE(0xF8006184, 0x000FFFFFU, 0x000000DFU),
• EMIT_MASKWRITE(0xF8006188, 0x000FFFFFU, 0x000000DAU),
• EMIT_MASKWRITE(0xF8006190, 0xFFFFFFFFU, 0x1002E080U),
• EMIT_MASKWRITE(0xF8006194, 0x000FFFFFU, 0x0001FC82U),
• EMIT_MASKWRITE(0xF8006204, 0xFFFFFFFFU, 0x00000000U),
• EMIT_MASKWRITE(0xF8006208, 0x000703FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF800620C, 0x000703FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF8006210, 0x000703FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF8006214, 0x000703FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF8006218, 0x000F03FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF800621C, 0x000F03FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF8006220, 0x000F03FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF8006224, 0x000F03FFU, 0x000003FFU),
• EMIT_MASKWRITE(0xF80062A8, 0x00000FF5U, 0x00000000U),
• EMIT_MASKWRITE(0xF80062AC, 0xFFFFFFFFU, 0x00000000U),
• EMIT_MASKWRITE(0xF80062B0, 0x003FFFFFU, 0x00005125U),
• EMIT_MASKWRITE(0xF80062B4, 0x0003FFFFU, 0x000012A8U),
• EMIT_MASKPOLL(0xF8000B74, 0x00002000U),
• EMIT_MASKWRITE(0xF8006000, 0x0001FFFFU, 0x00000081U),
• EMIT_MASKPOLL(0xF8006054, 0x00000007U),
• EMIT_EXIT(),

+};

+static unsigned long ps7_mio_init_data_3_0[] = {

• EMIT_MASKWRITE(0xF8000008, 0x0000FFFFU, 0x0000DF0DU),
• EMIT_MASKWRITE(0xF8000B40, 0x00000FFFU, 0x00000600U),
• EMIT_MASKWRITE(0xF8000B44, 0x00000FFFU, 0x00000600U),
• EMIT_MASKWRITE(0xF8000B48, 0x00000FFFU, 0x00000672U),
• EMIT_MASKWRITE(0xF8000B4C, 0x00000FFFU, 0x00000672U),
• EMIT_MASKWRITE(0xF8000B50, 0x00000FFFU, 0x00000674U),
• EMIT_MASKWRITE(0xF8000B54, 0x00000FFFU, 0x00000674U),
• EMIT_MASKWRITE(0xF8000B58, 0x00000FFFU, 0x00000600U),
• EMIT_MASKWRITE(0xF8000B5C, 0xFFFFFFFFU, 0x0018C61CU),
• EMIT_MASKWRITE(0xF8000B60, 0xFFFFFFFFU, 0x00F9861CU),
• EMIT_MASKWRITE(0xF8000B64, 0xFFFFFFFFU, 0x00F9861CU),
• EMIT_MASKWRITE(0xF8000B68, 0xFFFFFFFFU, 0x00F9861CU),
• EMIT_MASKWRITE(0xF8000B6C, 0x00007FFFU, 0x00000E60U),
• EMIT_MASKWRITE(0xF8000B70, 0x00000001U, 0x00000001U),
• EMIT_MASKWRITE(0xF8000B70, 0x00000021U, 0x00000020U),
• EMIT_MASKWRITE(0xF8000B70, 0x07FEFFFFU, 0x00000823U),
• EMIT_MASKWRITE(0xF8000004, 0x0000FFFFU, 0x0000767BU),
• EMIT_EXIT(),

+};

+static unsigned long ps7_peripherals_init_data_3_0[] = {

• EMIT_MASKWRITE(0xF8000008, 0x0000FFFFU, 0x0000DF0DU),
• EMIT_MASKWRITE(0xF8000B48, 0x00000180U, 0x00000180U),
• EMIT_MASKWRITE(0xF8000B4C, 0x00000180U, 0x00000180U),
• EMIT_MASKWRITE(0xF8000B50, 0x00000180U, 0x00000180U),
• EMIT_MASKWRITE(0xF8000B54, 0x00000180U, 0x00000180U),
• EMIT_MASKWRITE(0xF8000004, 0x0000FFFFU, 0x0000767BU),
• EMIT_MASKWRITE(0xE0001034, 0x000000FFU, 0x00000006U),
• EMIT_MASKWRITE(0xE0001018, 0x0000FFFFU, 0x0000007CU),
• EMIT_MASKWRITE(0xE0001000, 0x000001FFU, 0x00000017U),
• EMIT_MASKWRITE(0xE0001004, 0x000003FFU, 0x00000020U),
• EMIT_MASKWRITE(0xE0000034, 0x000000FFU, 0x00000006U),
• EMIT_MASKWRITE(0xE0000018, 0x0000FFFFU, 0x0000007CU),
• EMIT_MASKWRITE(0xE0000000, 0x000001FFU, 0x00000017U),
• EMIT_MASKWRITE(0xE0000004, 0x000003FFU, 0x00000020U),
• EMIT_MASKWRITE(0xE000D000, 0x000800FFU, 0x000800C1U),
• EMIT_MASKWRITE(0xF8007000, 0x20000000U, 0x00000000U),
• EMIT_MASKDELAY(0xF8F00200, 1),
• EMIT_MASKDELAY(0xF8F00200, 1),
• EMIT_MASKDELAY(0xF8F00200, 1),
• EMIT_EXIT(),

+};

+static unsigned long ps7_post_config_3_0[] = {

• EMIT_MASKWRITE(0xF8000008, 0x0000FFFFU, 0x0000DF0DU),
• EMIT_MASKWRITE(0xF8000900, 0x0000000FU, 0x0000000FU),
• EMIT_MASKWRITE(0xF8000240, 0xFFFFFFFFU, 0x00000000U),
• EMIT_MASKWRITE(0xF8000004, 0x0000FFFFU, 0x0000767BU),
• EMIT_EXIT(),

+};

+int ps7_init(void) +{

• int ret;
• ret = ps7_config(ps7_mio_init_data_3_0);
• if (ret != PS7_INIT_SUCCESS)

• return ret;
  

• ret = ps7_config(ps7_pll_init_data_3_0);
• if (ret != PS7_INIT_SUCCESS)

• return ret;
  

• ret = ps7_config(ps7_clock_init_data_3_0);
• if (ret != PS7_INIT_SUCCESS)

• return ret;
  

• ret = ps7_config(ps7_ddr_init_data_3_0);
• if (ret != PS7_INIT_SUCCESS)

• return ret;
  

• ret = ps7_config(ps7_peripherals_init_data_3_0);
• if (ret != PS7_INIT_SUCCESS)

• return ret;
  

• return PS7_INIT_SUCCESS;

+}

+int ps7_post_config(void) +{

• return ps7_config(ps7_post_config_3_0);

+} diff --git a/board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt b/board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt new file mode 100644 index 0000000..db6e642 --- /dev/null +++ b/board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt @@ -0,0 +1,61 @@ +0xF8000120 0x1F000200 // ARM_CLK_CTRL - divisor = 2 433 MHz (?) +0xf8000700 0x202 +0xf8000704 0x202 +0xf8000708 0x202 +0xf800070c 0x202 +0xf8000710 0x202 +0xf8000714 0x202 +0xf8000718 0x202 +0xf800071c 0x200 +0xf8000720 0x202 +0xf8000724 0x202 +0xf8000728 0x202 +0xf800072c 0x202 +0xf8000730 0x202 +0xf8000734 0x202 +0xf8000738 0x12e1 +0xf800073c 0x12e0 +0xf8000740 0x1200 +0xf8000744 0x1200 +0xf8000748 0x1200 +0xf800074c 0x1200 +0xf8000750 0x1200 +0xf8000754 0x1200 +0xf8000758 0x1200 +0xf800075c 0x1200 +0xf8000760 0x1200 +0xf8000764 0x200 +0xf8000768 0x1200 +0xf800076c 0x200 +0xf8000770 0x304 +0xf8000774 0x305 +0xf8000778 0x304 +0xf800077c 0x305 +0xf8000780 0x304 +0xf8000784 0x304 +0xf8000788 0x304 +0xf800078c 0x304 +0xf8000790 0x305 +0xf8000794 0x304 +0xf8000798 0x304 +0xf800079c 0x304 +0xf80007a0 0x380 +0xf80007a4 0x380 +0xf80007a8 0x380 +0xf80007ac 0x380 +0xf80007b0 0x380 +0xf80007b4 0x380 +0xf80007b8 0x1200 +0xf80007bc 0x1200 +0xf80007c0 0x1240 +0xf80007c4 0x1240 +0xf80007c8 0x1240 +0xf80007cc 0x1240 +0xf80007d0 0x1200 +0xf80007d4 0x1200 +0xf8000830 0x380037 +0xf8000834 0x3a0039 +0xF800014C 0x00000621 // LQSPI_CLK_CTRL - ARMPLL/6 (200 MHz) +0xE000D000 0x800238C1 // QSPI config - divide-by-2 +0xE000D038 0x00000020 // QSPI loopback - internal, 0 delay +0xE000D0A0 0xE2FF06EB // LQSPI_CFG - Quad read, dual flash diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig new file mode 100644 index 0000000..a01a82a --- /dev/null +++ b/configs/topic_miamilite_defconfig @@ -0,0 +1,53 @@ +CONFIG_ARM=y +CONFIG_SYS_VENDOR="topic" +CONFIG_SYS_CONFIG_NAME="topic_miami" +CONFIG_ARCH_ZYNQ=y +CONFIG_SYS_TEXT_BASE=0x4000000 +CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt" +CONFIG_DEFAULT_DEVICE_TREE="zynq-topic-miamilite" +CONFIG_BOOTDELAY=0 +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="zynq-uboot> " +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +# CONFIG_CMD_NET is not set +# CONFIG_CMD_NFS is not set +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_EMBED=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_DFU_RAM=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_SF_DUAL_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_STMICRO=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ZYNQ=y +CONFIG_DEBUG_UART_BASE=0xe0000000 +CONFIG_DEBUG_UART_CLOCK=100000000 +CONFIG_ZYNQ_QSPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_ULPI_VIEWPORT=y +CONFIG_USB_ULPI=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Xilinx" +CONFIG_G_DNL_VENDOR_NUM=0x03fd +CONFIG_G_DNL_PRODUCT_NUM=0x0300

Please send it as series with that SF_DUAL_FLASH one because this depends on it.

Thanks, Michal

Move the only use of CONFIG_SF_DUAL_FLASH to defconfig. This makes the associated topic_miamiplus.h header obsolete, so remove that as well.

Signed-off-by: Mike Looijmans mike.looijmans@topic.nl --- README | 6 ------ configs/topic_miamiplus_defconfig | 3 ++- drivers/mtd/spi/Kconfig | 7 +++++++ include/configs/topic_miami.h | 1 - include/configs/topic_miamiplus.h | 2 -- scripts/config_whitelist.txt | 1 - 6 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 include/configs/topic_miamiplus.h

diff --git a/README b/README index 9d351ec..c481016 100644 --- a/README +++ b/README @@ -2639,12 +2639,6 @@ The following options need to be configured: Define this option to include a destructive SPI flash test ('sf test').

- CONFIG_SF_DUAL_FLASH Dual flash memories - - Define this option to use dual flash support where two flash - memories can be connected with a given cs line. - Currently Xilinx Zynq qspi supports these type of connections. - - SystemACE Support: CONFIG_SYSTEMACE

diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index 10762f8..535ce6d 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_SYS_VENDOR="topic" -CONFIG_SYS_CONFIG_NAME="topic_miamiplus" +CONFIG_SYS_CONFIG_NAME="topic_miami" CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamiplus/ps7_regs.txt" @@ -28,6 +28,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_RAM=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y +CONFIG_SF_DUAL_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index 5ca0a71..5700859 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -42,6 +42,13 @@ config SPI_FLASH_BAR Bank/Extended address registers are used to access the flash which has size > 16MiB in 3-byte addressing.

+config SF_DUAL_FLASH + bool "SPI DUAL flash memory support" + depends on SPI_FLASH + help + Enable this option to support two flash memories connected to a single + controller. Currently Xilinx Zynq qspi supports this. + if SPI_FLASH

config SPI_FLASH_ATMEL diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index a289225..ee46d3a 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -56,7 +56,6 @@ #undef CONFIG_SF_DEFAULT_SPEED #define CONFIG_SF_DEFAULT_SPEED 108000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#undef CONFIG_SF_DUAL_FLASH #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #undef CONFIG_SPI_FLASH_WINBOND #undef CONFIG_SPI_FLASH_ISSI diff --git a/include/configs/topic_miamiplus.h b/include/configs/topic_miamiplus.h deleted file mode 100644 index 46ca6bd..0000000 --- a/include/configs/topic_miamiplus.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "topic_miami.h" -#define CONFIG_SF_DUAL_FLASH diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e8f49eb..642c433 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2401,7 +2401,6 @@ CONFIG_SF_DEFAULT_BUS CONFIG_SF_DEFAULT_CS CONFIG_SF_DEFAULT_MODE CONFIG_SF_DEFAULT_SPEED -CONFIG_SF_DUAL_FLASH CONFIG_SGI_IP28 CONFIG_SH4_PCI CONFIG_SH73A0