-----Original Message----- From: Alexander Graf [mailto:agraf@suse.de] Sent: Saturday, May 14, 2016 11:44 PM To: Prabhakar Kushwaha prabhakar.kushwaha@nxp.com; u- boot@lists.denx.de Cc: Pratiyush Srivastava pratiyush.srivastava@nxp.com Subject: Re: [U-Boot] [PATCH 10/10][v3] armv8: ls1012a: Add support of ls1012ardb board
On 14.05.16 10:31, Prabhakar Kushwaha wrote:
QorIQ LS1012A Reference Design System (LS1012ARDB) is a high-performance development platform, with a complete debugging
environment.
The LS1012ARDB board supports the QorIQ LS1012A processor and is optimized to support the high-bandwidth DDR3L memory and a full complement of high-speed SerDes ports.
Signed-off-by: Calvin Johnson calvin.johnson@nxp.com Signed-off-by: Pratiyush Mohan Srivastava pratiyush.srivastava@nxp.com Signed-off-by: Prabhakar Kushwaha prabhakar.kushwaha@nxp.com
Changes for v2: Sending as it is Changes for v3: Incorporated York's comments
arch/arm/Kconfig | 10 ++ arch/arm/dts/Makefile | 3 +- arch/arm/dts/fsl-ls1012a-rdb.dts | 16 +++ arch/arm/dts/fsl-ls1012a-rdb.dtsi | 39 ++++++ board/freescale/ls1012ardb/Kconfig | 15 +++ board/freescale/ls1012ardb/MAINTAINERS | 6 + board/freescale/ls1012ardb/Makefile | 7 ++ board/freescale/ls1012ardb/README | 54 ++++++++ board/freescale/ls1012ardb/ls1012ardb.c | 210 ++++++++++++++++++++++++++++++++
This file looks like it's 90% identical to the ls1012aqds file. Can't you share those 90%? Just create a third file with common functions maybe?
Yes this point of time they are 90% identical as this patch is for base support.
Further patches will come for IPs, board muxing etc. Base patch is sent to unblock developers to start sending patches directly in upstream.
configs/ls1012ardb_qspi_defconfig | 32 +++++ include/configs/ls1012ardb.h | 59 +++++++++ 11 files changed, 450 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/fsl-ls1012a-rdb.dts create mode 100644 arch/arm/dts/fsl-ls1012a-rdb.dtsi create mode 100644 board/freescale/ls1012ardb/Kconfig create mode 100644 board/freescale/ls1012ardb/MAINTAINERS create mode 100644 board/freescale/ls1012ardb/Makefile create mode 100644 board/freescale/ls1012ardb/README create mode 100644 board/freescale/ls1012ardb/ls1012ardb.c create mode 100644 configs/ls1012ardb_qspi_defconfig create mode 100644 include/configs/ls1012ardb.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2540045..31dfac2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -682,6 +682,15 @@ config TARGET_LS1012AQDS development platform that supports the QorIQ LS1012A Layerscape Architecture processor.
+config TARGET_LS1012ARDB
- bool "Support ls1012ardb"
- select ARM64
- help
Support for Freescale LS1012ARDB platform.The LS1012A Reference design board (RDB) is a high-performancedevelopment platform that supports the QorIQ LS1012ALayerscape Architecture processor.config TARGET_LS1021AQDS bool "Support ls1021aqds" select CPU_V7 @@ -841,6 +850,7 @@ source "board/freescale/ls1043aqds/Kconfig" source "board/freescale/ls1021atwr/Kconfig" source "board/freescale/ls1043ardb/Kconfig" source "board/freescale/ls1012aqds/Kconfig" +source "board/freescale/ls1012ardb/Kconfig" source "board/freescale/mx23evk/Kconfig" source "board/freescale/mx25pdk/Kconfig" source "board/freescale/mx28evk/Kconfig" diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index b26870a..9324d82 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -114,7 +114,8 @@ dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \ dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds-duart.dtb \ fsl-ls1043a-qds-lpuart.dtb \ fsl-ls1043a-rdb.dtb \
- fsl-ls1012a-qds.dtb
- fsl-ls1012a-qds.dtb \
- fsl-ls1012a-rdb.dtb
dtb-$(CONFIG_ARCH_SNAPDRAGON) += dragonboard410c.dtb
diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dts b/arch/arm/dts/fsl-ls1012a-rdb.dts new file mode 100644 index 0000000..4ec9786 --- /dev/null +++ b/arch/arm/dts/fsl-ls1012a-rdb.dts @@ -0,0 +1,16 @@ +/*
- Device Tree file for Freescale Layerscape-1012A family SoC.
- Copyright (C) 2016, Freescale Semiconductor
- SPDX-License-Identifier: GPL-2.0+
- */
+/dts-v1/; +#include "fsl-ls1012a-rdb.dtsi"
+/ {
chosen {stdout-path = &duart0;};+}; diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dtsi b/arch/arm/dts/fsl-ls1012a-rdb.dtsi new file mode 100644 index 0000000..71aba78 --- /dev/null +++ b/arch/arm/dts/fsl-ls1012a-rdb.dtsi @@ -0,0 +1,39 @@ +/*
- Device Tree Include file for Freescale Layerscape-1012A family SoC.
- Copyright (C) 2016, Freescale Semiconductor
- This file is licensed under the terms of the GNU General Public
- License version 2. This program is licensed "as is" without any
- warranty of any kind, whether express or implied.
- */
+/include/ "fsl-ls1012a.dtsi"
+/ {
- model = "LS1012A RDB Board";
- aliases {
spi0 = &qspi;- };
+};
+&qspi {
- bus-num = <0>;
- status = "okay";
- qflash0: s25fl128s@0 {
#address-cells = <1>;#size-cells = <1>;compatible = "spi-flash";spi-max-frequency = <20000000>;reg = <0>;- };
+};
+&i2c0 {
- status = "okay";
+};
+&duart0 {
- status = "okay";
+}; diff --git a/board/freescale/ls1012ardb/Kconfig b/board/freescale/ls1012ardb/Kconfig new file mode 100644 index 0000000..3f67c28 --- /dev/null +++ b/board/freescale/ls1012ardb/Kconfig @@ -0,0 +1,15 @@ +if TARGET_LS1012ARDB
+config SYS_BOARD
- default "ls1012ardb"
+config SYS_VENDOR
- default "freescale"
+config SYS_SOC
- default "fsl-layerscape"
+config SYS_CONFIG_NAME
- default "ls1012ardb"
+endif diff --git a/board/freescale/ls1012ardb/MAINTAINERS b/board/freescale/ls1012ardb/MAINTAINERS new file mode 100644 index 0000000..b3a1250 --- /dev/null +++ b/board/freescale/ls1012ardb/MAINTAINERS @@ -0,0 +1,6 @@ +LS1012ARDB BOARD +M: Prabhakar Kushwaha prabhakar.kushwaha@nxp.com +S: Maintained +F: board/freescale/ls1012ardb/ +F: include/configs/ls1012ardb.h +F: configs/ls1012ardb_defconfig diff --git a/board/freescale/ls1012ardb/Makefile b/board/freescale/ls1012ardb/Makefile new file mode 100644 index 0000000..05fa9d9 --- /dev/null +++ b/board/freescale/ls1012ardb/Makefile @@ -0,0 +1,7 @@ +# +# Copyright 2016 Freescale Semiconductor, Inc. +# +# SPDX-License-Identifier: GPL-2.0+ +#
+obj-y += ls1012ardb.o diff --git a/board/freescale/ls1012ardb/README b/board/freescale/ls1012ardb/README new file mode 100644 index 0000000..453b432 --- /dev/null +++ b/board/freescale/ls1012ardb/README @@ -0,0 +1,54 @@ +Overview +-------- +QorIQ LS1012A Reference Design System (LS1012ARDB) is a +high-performance development platform, with a complete debugging
environment.
+The LS1012ARDB board supports the QorIQ LS1012A processor and is +optimized to support the high-bandwidth DDR3L memory and a full +complement of high-speed SerDes ports.
+LS1012A SoC Overview +-------------------- +Please refer arch/arm/cpu/armv8/fsl-layerscape/doc/README.soc for +LS2080A SoC overview.
+LS1012ARDB board Overview +-----------------------
- SERDES Connections, 4 lanes supporting:
- PCI Express - 3.0- SGMII, SGMII 2.5- SATA 3.0
- DDR Controller
- 16-bit, 1 GB DDR3L SDRAM memory, running at data rates up to 1+GT/s
- -QSPI: A dual 1:3 switch, NX3L4357GM,115 (U35) drives the QSPI
+chip-select signals to
- QSPI NOR flash memory (2 virtual banks)
- the QSPI emulator.s
- USB 3.0
- one high-speed USB 2.0/3.0 port.
- Two enhanced secure digital host controllers:
- SDHC1 controller can be connected to onboard SDHC connector
- SDHC2 controller: Three dual 1:4 mux/demux devices,
- 74CBTLV3253DS (U30, U31, U33) drive the SDHC2 signals to eMMC,
- SDIO WiFi, SPI, and Ardiuno shield
- 2 I2C controllers
- One SATA onboard connectors
- UART
- The LS1012A processor consists of two UART controllers,
- out of which only UART1 is used on RDB.
- ARM JTAG support
+Booting Options +--------------- +a) QSPI Flash Emu Boot +b) QSPI Flash 1 +c) QSPI Flash 2
+QSPI flash map +-------------- +Images | Size |QSPI Flash Address +------------------------------------------ +RCW + PBI | 1MB | 0x4000_0000 +U-boot | 1MB | 0x4010_0000 +U-boot Env | 1MB | 0x4020_0000 +PPA FIT image | 2MB | 0x4050_0000 +Linux ITB | ~53MB | 0x40A0_0000 diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c new file mode 100644 index 0000000..d43deb3 --- /dev/null +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -0,0 +1,210 @@ +/*
- Copyright 2016 Freescale Semiconductor, Inc.
- SPDX-License-Identifier: GPL-2.0+
- */
+#include <common.h> +#include <i2c.h> +#include <asm/io.h> +#include <asm/arch/clock.h> +#include <asm/arch/fsl_serdes.h> +#include <asm/arch/soc.h> +#include <hwconfig.h> +#include <ahci.h> +#include <mmc.h> +#include <scsi.h> +#include <fsl_csu.h> +#include <fsl_esdhc.h> +#include <environment.h> +#include <fsl_mmdc.h> +#include <netdev.h>
+DECLARE_GLOBAL_DATA_PTR;
+static void set_wait_for_bits_clear(void *ptr, u32 value, u32 bits) {
- int timeout = 1000;
- out_be32(ptr, value);
- while (in_be32(ptr) & bits) {
udelay(100);timeout--;- }
- if (timeout <= 0)
puts("Error: wait for clear timeout.\n"); }+int checkboard(void) +{
- u8 in1;
- puts("Board: LS1012ARDB ");
- /* Initialize i2c early for Serial flash bank information */
- i2c_set_bus_num(0);
- if (i2c_read(I2C_MUX_IO1_ADDR, 1, 1, &in1, 1) < 0) {
printf("Error reading i2c boot information!\n");return 0; /* Don't want to hang() on this error */- }
- puts("Version");
- if ((in1 & (~__SW_REV_MASK)) == __SW_REV_A)
puts(": RevA");- else if ((in1 & (~__SW_REV_MASK)) == __SW_REV_B)
puts(": RevB");- else
puts(": unknown");- printf(", boot from QSPI");
- if ((in1 & (~__SW_BOOT_MASK)) == __SW_BOOT_EMU)
puts(": emu\n");- else if ((in1 & (~__SW_BOOT_MASK)) == __SW_BOOT_BANK1)
puts(": bank1\n");- else if ((in1 & (~__SW_BOOT_MASK)) == __SW_BOOT_BANK2)
puts(": bank2\n");- else
puts("unknown\n");- return 0;
+}
+void mmdc_init(void) +{
- struct mmdc_p_regs *mmdc =
(struct mmdc_p_regs *)CONFIG_SYS_FSL_DDR_ADDR;- /* Set MMDC_MDSCR[CON_REQ] */
- out_be32(&mmdc->mdscr, 0x00008000);
- /* configure timing parms */
- out_be32(&mmdc->mdotc, 0x12554000);
- out_be32(&mmdc->mdcfg0, 0xbabf7954);
- out_be32(&mmdc->mdcfg1, 0xff328f64);
- out_be32(&mmdc->mdcfg2, 0x01ff00db);
- /* other parms */
- out_be32(&mmdc->mdmisc, 0x00000680);
- out_be32(&mmdc->mpmur0, 0x00000800);
- out_be32(&mmdc->mdrwd, 0x00002000);
- out_be32(&mmdc->mpodtctrl, 0x0000022a);
- /* out of reset delays */
- out_be32(&mmdc->mdor, 0x00bf1023);
- /* physical parms */
- out_be32(&mmdc->mdctl, 0x05180000);
- out_be32(&mmdc->mdasp, 0x0000007f);
- /* Enable MMDC */
- out_be32(&mmdc->mdctl, 0x85180000);
- /* dram init sequence: update MRs */
- out_be32(&mmdc->mdscr, 0x00088032);
- out_be32(&mmdc->mdscr, 0x00008033);
- out_be32(&mmdc->mdscr, 0x00048031);
- out_be32(&mmdc->mdscr, 0x19308030);
- /* dram init sequence: ZQCL */
- out_be32(&mmdc->mdscr, 0x04008040);
- set_wait_for_bits_clear(&mmdc->mpzqhwctrl, 0xa1390003,
0x00010000);
- /* Calibrations now: wr lvl */
- out_be32(&mmdc->mdscr, 0x00848031);
- out_be32(&mmdc->mdscr, 0x00008200);
- set_wait_for_bits_clear(&mmdc->mpwlgcr, 0x00000001,
0x00000001);
- mdelay(1);
- out_be32(&mmdc->mdscr, 0x00048031);
- out_be32(&mmdc->mdscr, 0x00008000);
- mdelay(1);
- /* Calibrations now: Read DQS gating calibration */
- out_be32(&mmdc->mdscr, 0x04008050);
- out_be32(&mmdc->mdscr, 0x00048033);
- out_be32(&mmdc->mppdcmpr2, 0x00000001);
- out_be32(&mmdc->mprddlctl, 0x40404040);
- set_wait_for_bits_clear(&mmdc->mpdgctrl0, 0x10000000,
0x10000000);
- out_be32(&mmdc->mdscr, 0x00008033);
- /* Calibrations now: Read calibration */
- out_be32(&mmdc->mdscr, 0x04008050);
- out_be32(&mmdc->mdscr, 0x00048033);
- out_be32(&mmdc->mppdcmpr2, 0x00000001);
- set_wait_for_bits_clear(&mmdc->mprddlhwctl, 0x00000010,
0x00000010);
- out_be32(&mmdc->mdscr, 0x00008033);
- /* PD, SR */
- out_be32(&mmdc->mdpdc, 0x00030035);
- out_be32(&mmdc->mapsr, 0x00001067);
- /* refresh scheme */
- set_wait_for_bits_clear(&mmdc->mdref, 0x103e8000, 0x00000001);
- /* disable CON_REQ */
- out_be32(&mmdc->mdscr, 0x0);
+}
+int dram_init(void) +{
- mmdc_init();
- gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
- return 0;
+}
+int board_eth_init(bd_t *bis) +{
- return pci_eth_init(bis);
+}
+int board_early_init_f(void) +{
- fsl_lsch2_early_init_f();
- return 0;
+}
+int board_init(void) +{
- struct ccsr_cci400 *cci = (struct ccsr_cci400
*)CONFIG_SYS_CCI400_ADDR;
- /*
* Set CCI-400 control override register to enable barrier* transaction*/- out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER);
+#ifdef CONFIG_ENV_IS_NOWHERE
- gd->env_addr = (ulong)&default_environment[0]; #endif
+#ifdef CONFIG_LAYERSCAPE_NS_ACCESS
- enable_layerscape_ns_access();
+#endif
- return 0;
+}
+int ft_board_setup(void *blob, bd_t *bd) {
- u64 base[CONFIG_NR_DRAM_BANKS];
- u64 size[CONFIG_NR_DRAM_BANKS];
- /* fixup DT for the two DDR banks */
- base[0] = gd->bd->bi_dram[0].start;
- size[0] = gd->bd->bi_dram[0].size;
- base[1] = gd->bd->bi_dram[1].start;
- size[1] = gd->bd->bi_dram[1].size;
- fdt_fixup_memory_banks(blob, base, size, 2);
- ft_cpu_setup(blob, bd);
Is there any particular reason this code isn't working for you?
http://git.denx.de/?p=u-boot.git;a=blob;f=arch/arm/lib/bootm- fdt.c;hb=HEAD#l44
I will try this. If it works I will add in v4 patch
--prabhakar