All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 0/3] ARM: Zynq: Add ZYBO board
@ 2014-08-28 11:16 Peter Crosthwaite
  2014-08-28 11:16 ` [U-Boot] [PATCH 1/3] arm: dts: zynq: Add digilent ZYBO board dts Peter Crosthwaite
                   ` (4 more replies)
  0 siblings, 5 replies; 13+ messages in thread
From: Peter Crosthwaite @ 2014-08-28 11:16 UTC (permalink / raw)
  To: u-boot

Hi Michal, Steven,

This series adds the ZYBO board to u-boot. Some components were originally
contributed to the digilent u-boot tree (P2). Thanks to Steven Wang. The
original code had a custom u-boot env specific for Zybo but I have dropped
that. I have added DTS support - which in general seems to have appeared in
u-boot since the original digilent work (P1). The new configury is P3.

Regards,
Peter

Peter Crosthwaite (2):
  arm: dts: zynq: Add digilent ZYBO board dts
  kconfig: zynq: Add ZYBO board

Tinghui Wang (1):
  configs: zynq: Add config support for ZYBO

 arch/arm/Kconfig            |  3 +++
 arch/arm/dts/Makefile       |  1 +
 arch/arm/dts/zynq-zybo.dts  | 23 +++++++++++++++++++++++
 board/xilinx/zynq/Kconfig   | 24 ++++++++++++++++++++++++
 configs/zynq_zybo_defconfig |  3 +++
 include/configs/zynq_zybo.h | 31 +++++++++++++++++++++++++++++++
 6 files changed, 85 insertions(+)
 create mode 100644 arch/arm/dts/zynq-zybo.dts
 create mode 100644 configs/zynq_zybo_defconfig
 create mode 100644 include/configs/zynq_zybo.h

-- 
1.9.1

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 1/3] arm: dts: zynq: Add digilent ZYBO board dts
  2014-08-28 11:16 [U-Boot] [PATCH 0/3] ARM: Zynq: Add ZYBO board Peter Crosthwaite
@ 2014-08-28 11:16 ` Peter Crosthwaite
  2014-08-28 11:44   ` Jagan Teki
  2014-08-28 11:16 ` [U-Boot] [PATCH 2/3] configs: zynq: Add config support for ZYBO Peter Crosthwaite
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 13+ messages in thread
From: Peter Crosthwaite @ 2014-08-28 11:16 UTC (permalink / raw)
  To: u-boot

It's a Zynq board similar in design to the currently supported ones.
512MB of RAM and UART1 is used.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
 arch/arm/dts/Makefile      |  1 +
 arch/arm/dts/zynq-zybo.dts | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 arch/arm/dts/zynq-zybo.dts

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 6e2e313..6da68ac 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -28,6 +28,7 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
 dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \
 	zynq-zc706.dtb \
 	zynq-zed.dtb \
+	zynq-zybo.dtb \
 	zynq-microzed.dtb \
 	zynq-zc770-xm010.dtb \
 	zynq-zc770-xm012.dtb \
diff --git a/arch/arm/dts/zynq-zybo.dts b/arch/arm/dts/zynq-zybo.dts
new file mode 100644
index 0000000..20e0386
--- /dev/null
+++ b/arch/arm/dts/zynq-zybo.dts
@@ -0,0 +1,23 @@
+/*
+ * Digilent ZYBO board DTS
+ *
+ * Copyright (C) 2013 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	model = "Zynq ZYBO Board";
+	compatible = "xlnx,zynq-zybo", "xlnx,zynq-7000";
+
+	aliases {
+		serial0 = &uart1;
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0 0x20000000>;
+	};
+};
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 2/3] configs: zynq: Add config support for ZYBO
  2014-08-28 11:16 [U-Boot] [PATCH 0/3] ARM: Zynq: Add ZYBO board Peter Crosthwaite
  2014-08-28 11:16 ` [U-Boot] [PATCH 1/3] arm: dts: zynq: Add digilent ZYBO board dts Peter Crosthwaite
@ 2014-08-28 11:16 ` Peter Crosthwaite
  2014-08-28 11:39   ` Jagan Teki
  2014-08-28 11:16 ` [U-Boot] [PATCH 3/3] kconfig: zynq: Add ZYBO board Peter Crosthwaite
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 13+ messages in thread
From: Peter Crosthwaite @ 2014-08-28 11:16 UTC (permalink / raw)
  To: u-boot

From: Tinghui Wang <steven.wang@digilentinc.com>

This patch adds config support needed for ZYBO target and has
been tested on Rev. B ZYBO hardware.

Signed-off-by: Tinghui Wang <steven.wang@digilentinc.com>
[PC changes:
 * Dropped boards.cfg change (rebase conflict)
 * Dropped custom u-boot env
 * Added DTS
 * Misc forward-porting changes
]
Signed-off-by: Peter Crosthwiate <crosthwaite.peter@gmail.com>

---
I have dropped the custom u-boot env from the original patch,
as I'm not sure what the purpose was and I didn't need it for ZYBO SPL.
---
 include/configs/zynq_zybo.h | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 include/configs/zynq_zybo.h

diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
new file mode 100644
index 0000000..c167207
--- /dev/null
+++ b/include/configs/zynq_zybo.h
@@ -0,0 +1,31 @@
+/*
+ * (C) Copyright 2012 Xilinx
+ * (C) Copyright 2014 Digilent Inc.
+ *
+ * Configuration for Zynq Development Board - ZYBO
+ * See zynq_common.h for Zynq common configs
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_ZYNQ_ZYBO_H
+#define __CONFIG_ZYNQ_ZYBO_H
+
+#define CONFIG_SYS_SDRAM_SIZE (512 * 1024 * 1024)
+
+#define CONFIG_ZYNQ_SERIAL_UART1
+#define CONFIG_ZYNQ_GEM0
+#define CONFIG_ZYNQ_GEM_PHY_ADDR0	0
+
+#define CONFIG_SYS_NO_FLASH
+
+#define CONFIG_ZYNQ_SDHCI0
+#define CONFIG_ZYNQ_BOOT_FREEBSD
+#define CONFIG_DEFAULT_DEVICE_TREE	zynq-zybo
+
+/* Define ZYBO PS Clock Frequency to 50MHz */
+#define CONFIG_ZYNQ_PS_CLK_FREQ	50000000UL
+
+#include <configs/zynq-common.h>
+
+#endif /* __CONFIG_ZYNQ_ZYBO_H */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 3/3] kconfig: zynq: Add ZYBO board
  2014-08-28 11:16 [U-Boot] [PATCH 0/3] ARM: Zynq: Add ZYBO board Peter Crosthwaite
  2014-08-28 11:16 ` [U-Boot] [PATCH 1/3] arm: dts: zynq: Add digilent ZYBO board dts Peter Crosthwaite
  2014-08-28 11:16 ` [U-Boot] [PATCH 2/3] configs: zynq: Add config support for ZYBO Peter Crosthwaite
@ 2014-08-28 11:16 ` Peter Crosthwaite
  2014-08-28 11:45   ` Jagan Teki
  2014-09-01  2:25   ` Masahiro Yamada
  2014-08-29 11:07 ` [U-Boot] [PATCH 0/3] ARM: Zynq: " Michal Simek
       [not found] ` <OFC44BD889.84CD4704-ON86257D43.0024CD41-86257D43.0024CD47@ni.com>
  4 siblings, 2 replies; 13+ messages in thread
From: Peter Crosthwaite @ 2014-08-28 11:16 UTC (permalink / raw)
  To: u-boot

Add a defconfig and Kconfigury for the Digilent ZYBO board.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
 arch/arm/Kconfig            |  3 +++
 board/xilinx/zynq/Kconfig   | 24 ++++++++++++++++++++++++
 configs/zynq_zybo_defconfig |  3 +++
 3 files changed, 30 insertions(+)
 create mode 100644 configs/zynq_zybo_defconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e385eda..e04a2b9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -671,6 +671,9 @@ config TARGET_ZYNQ_ZC770
 config TARGET_ZYNQ_ZED
 	bool "Support zynq_zed"
 
+config TARGET_ZYNQ_ZYBO
+	bool "Support zynq_zybo"
+
 config TARGET_MEDCOM_WIDE
 	bool "Support medcom-wide"
 
diff --git a/board/xilinx/zynq/Kconfig b/board/xilinx/zynq/Kconfig
index 3b72a5f..151279c 100644
--- a/board/xilinx/zynq/Kconfig
+++ b/board/xilinx/zynq/Kconfig
@@ -93,3 +93,27 @@ config SYS_CONFIG_NAME
 	default "zynq_zed"
 
 endif
+
+if TARGET_ZYNQ_ZYBO
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_BOARD
+	string
+	default "zynq"
+
+config SYS_VENDOR
+	string
+	default "xilinx"
+
+config SYS_SOC
+	string
+	default "zynq"
+
+config SYS_CONFIG_NAME
+	string
+	default "zynq_zybo"
+
+endif
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
new file mode 100644
index 0000000..973ebc1
--- /dev/null
+++ b/configs/zynq_zybo_defconfig
@@ -0,0 +1,3 @@
+CONFIG_SPL=y
++S:CONFIG_ARM=y
++S:CONFIG_TARGET_ZYNQ_ZYBO=y
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 2/3] configs: zynq: Add config support for ZYBO
  2014-08-28 11:16 ` [U-Boot] [PATCH 2/3] configs: zynq: Add config support for ZYBO Peter Crosthwaite
@ 2014-08-28 11:39   ` Jagan Teki
  0 siblings, 0 replies; 13+ messages in thread
From: Jagan Teki @ 2014-08-28 11:39 UTC (permalink / raw)
  To: u-boot

On 28 August 2014 16:46, Peter Crosthwaite <crosthwaitepeter@gmail.com> wrote:
> From: Tinghui Wang <steven.wang@digilentinc.com>
>
> This patch adds config support needed for ZYBO target and has
> been tested on Rev. B ZYBO hardware.
>
> Signed-off-by: Tinghui Wang <steven.wang@digilentinc.com>
> [PC changes:
>  * Dropped boards.cfg change (rebase conflict)
>  * Dropped custom u-boot env
>  * Added DTS
>  * Misc forward-porting changes
> ]
> Signed-off-by: Peter Crosthwiate <crosthwaite.peter@gmail.com>
>
> ---
> I have dropped the custom u-boot env from the original patch,
> as I'm not sure what the purpose was and I didn't need it for ZYBO SPL.
> ---
>  include/configs/zynq_zybo.h | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>  create mode 100644 include/configs/zynq_zybo.h
>
> diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
> new file mode 100644
> index 0000000..c167207
> --- /dev/null
> +++ b/include/configs/zynq_zybo.h
> @@ -0,0 +1,31 @@
> +/*
> + * (C) Copyright 2012 Xilinx
> + * (C) Copyright 2014 Digilent Inc.
> + *
> + * Configuration for Zynq Development Board - ZYBO
> + * See zynq_common.h for Zynq common configs

typo - it's zynq-common.h

> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef __CONFIG_ZYNQ_ZYBO_H
> +#define __CONFIG_ZYNQ_ZYBO_H
> +
> +#define CONFIG_SYS_SDRAM_SIZE (512 * 1024 * 1024)
> +
> +#define CONFIG_ZYNQ_SERIAL_UART1
> +#define CONFIG_ZYNQ_GEM0
> +#define CONFIG_ZYNQ_GEM_PHY_ADDR0      0
> +
> +#define CONFIG_SYS_NO_FLASH
> +
> +#define CONFIG_ZYNQ_SDHCI0
> +#define CONFIG_ZYNQ_BOOT_FREEBSD
> +#define CONFIG_DEFAULT_DEVICE_TREE     zynq-zybo
> +
> +/* Define ZYBO PS Clock Frequency to 50MHz */
> +#define CONFIG_ZYNQ_PS_CLK_FREQ        50000000UL
> +
> +#include <configs/zynq-common.h>
> +
> +#endif /* __CONFIG_ZYNQ_ZYBO_H */
> --
> 1.9.1

thanks!
-- 
Jagan.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 1/3] arm: dts: zynq: Add digilent ZYBO board dts
  2014-08-28 11:16 ` [U-Boot] [PATCH 1/3] arm: dts: zynq: Add digilent ZYBO board dts Peter Crosthwaite
@ 2014-08-28 11:44   ` Jagan Teki
  0 siblings, 0 replies; 13+ messages in thread
From: Jagan Teki @ 2014-08-28 11:44 UTC (permalink / raw)
  To: u-boot

On 28 August 2014 16:46, Peter Crosthwaite <crosthwaitepeter@gmail.com> wrote:
> It's a Zynq board similar in design to the currently supported ones.
> 512MB of RAM and UART1 is used.
>
> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> ---
>  arch/arm/dts/Makefile      |  1 +
>  arch/arm/dts/zynq-zybo.dts | 23 +++++++++++++++++++++++
>  2 files changed, 24 insertions(+)
>  create mode 100644 arch/arm/dts/zynq-zybo.dts

Acked-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>

>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 6e2e313..6da68ac 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -28,6 +28,7 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
>  dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \
>         zynq-zc706.dtb \
>         zynq-zed.dtb \
> +       zynq-zybo.dtb \
>         zynq-microzed.dtb \
>         zynq-zc770-xm010.dtb \
>         zynq-zc770-xm012.dtb \
> diff --git a/arch/arm/dts/zynq-zybo.dts b/arch/arm/dts/zynq-zybo.dts
> new file mode 100644
> index 0000000..20e0386
> --- /dev/null
> +++ b/arch/arm/dts/zynq-zybo.dts
> @@ -0,0 +1,23 @@
> +/*
> + * Digilent ZYBO board DTS
> + *
> + * Copyright (C) 2013 Xilinx, Inc.
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +/dts-v1/;
> +#include "zynq-7000.dtsi"
> +
> +/ {
> +       model = "Zynq ZYBO Board";
> +       compatible = "xlnx,zynq-zybo", "xlnx,zynq-7000";
> +
> +       aliases {
> +               serial0 = &uart1;
> +       };
> +
> +       memory {
> +               device_type = "memory";
> +               reg = <0 0x20000000>;
> +       };
> +};
> --
> 1.9.1

thanks!
-- 
Jagan.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 3/3] kconfig: zynq: Add ZYBO board
  2014-08-28 11:16 ` [U-Boot] [PATCH 3/3] kconfig: zynq: Add ZYBO board Peter Crosthwaite
@ 2014-08-28 11:45   ` Jagan Teki
  2014-09-01  2:25   ` Masahiro Yamada
  1 sibling, 0 replies; 13+ messages in thread
From: Jagan Teki @ 2014-08-28 11:45 UTC (permalink / raw)
  To: u-boot

On 28 August 2014 16:46, Peter Crosthwaite <crosthwaitepeter@gmail.com> wrote:
> Add a defconfig and Kconfigury for the Digilent ZYBO board.
>
> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> ---
>  arch/arm/Kconfig            |  3 +++
>  board/xilinx/zynq/Kconfig   | 24 ++++++++++++++++++++++++
>  configs/zynq_zybo_defconfig |  3 +++
>  3 files changed, 30 insertions(+)
>  create mode 100644 configs/zynq_zybo_defconfig

Acked-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>

>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index e385eda..e04a2b9 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -671,6 +671,9 @@ config TARGET_ZYNQ_ZC770
>  config TARGET_ZYNQ_ZED
>         bool "Support zynq_zed"
>
> +config TARGET_ZYNQ_ZYBO
> +       bool "Support zynq_zybo"
> +
>  config TARGET_MEDCOM_WIDE
>         bool "Support medcom-wide"
>
> diff --git a/board/xilinx/zynq/Kconfig b/board/xilinx/zynq/Kconfig
> index 3b72a5f..151279c 100644
> --- a/board/xilinx/zynq/Kconfig
> +++ b/board/xilinx/zynq/Kconfig
> @@ -93,3 +93,27 @@ config SYS_CONFIG_NAME
>         default "zynq_zed"
>
>  endif
> +
> +if TARGET_ZYNQ_ZYBO
> +
> +config SYS_CPU
> +       string
> +       default "armv7"
> +
> +config SYS_BOARD
> +       string
> +       default "zynq"
> +
> +config SYS_VENDOR
> +       string
> +       default "xilinx"
> +
> +config SYS_SOC
> +       string
> +       default "zynq"
> +
> +config SYS_CONFIG_NAME
> +       string
> +       default "zynq_zybo"
> +
> +endif
> diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
> new file mode 100644
> index 0000000..973ebc1
> --- /dev/null
> +++ b/configs/zynq_zybo_defconfig
> @@ -0,0 +1,3 @@
> +CONFIG_SPL=y
> ++S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_ZYNQ_ZYBO=y
> --

thanks!
-- 
Jagan.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 2/3] configs: zynq: Add config support for ZYBO
       [not found] ` <OFC44BD889.84CD4704-ON86257D43.0024CD41-86257D43.0024CD47@ni.com>
@ 2014-08-29 10:34   ` Michal Simek
  2014-08-30  1:42   ` Peter Crosthwaite
  1 sibling, 0 replies; 13+ messages in thread
From: Michal Simek @ 2014-08-29 10:34 UTC (permalink / raw)
  To: u-boot

Hi,

On 08/29/2014 08:41 AM, Steve Wang wrote:
> Hi, Peter,
> 
> In ZYBO, there is an on-board eeprom that contains a unique MAC address for each 
> board.
> In FSBL (before u-boot), the MAC address is read out from EEPROM and write to 
> the corresponding registers in ETH controller.
> So, in u-boot env, mac-skip should be defined so that it will not over-write the 
> unique MAC address.
> 
> So, I wonder if it should be done in dts file or there is other ways to do that.

It can be done in as follow up patch.
U-Boot also supports SPL. It means if you want to read this address from EEPROM you
should solve it just in u-boot. There should be some ways how to do it.

Thanks,
Michal




-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140829/6f55b114/attachment.pgp>

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 0/3] ARM: Zynq: Add ZYBO board
  2014-08-28 11:16 [U-Boot] [PATCH 0/3] ARM: Zynq: Add ZYBO board Peter Crosthwaite
                   ` (2 preceding siblings ...)
  2014-08-28 11:16 ` [U-Boot] [PATCH 3/3] kconfig: zynq: Add ZYBO board Peter Crosthwaite
@ 2014-08-29 11:07 ` Michal Simek
  2014-08-30  1:29   ` Peter Crosthwaite
       [not found] ` <OFC44BD889.84CD4704-ON86257D43.0024CD41-86257D43.0024CD47@ni.com>
  4 siblings, 1 reply; 13+ messages in thread
From: Michal Simek @ 2014-08-29 11:07 UTC (permalink / raw)
  To: u-boot

On 08/28/2014 01:16 PM, Peter Crosthwaite wrote:
> Hi Michal, Steven,
> 
> This series adds the ZYBO board to u-boot. Some components were originally
> contributed to the digilent u-boot tree (P2). Thanks to Steven Wang. The
> original code had a custom u-boot env specific for Zybo but I have dropped
> that. I have added DTS support - which in general seems to have appeared in
> u-boot since the original digilent work (P1). The new configury is P3.
> 
> Regards,
> Peter
> 
> Peter Crosthwaite (2):
>   arm: dts: zynq: Add digilent ZYBO board dts
>   kconfig: zynq: Add ZYBO board
> 
> Tinghui Wang (1):
>   configs: zynq: Add config support for ZYBO
> 
>  arch/arm/Kconfig            |  3 +++
>  arch/arm/dts/Makefile       |  1 +
>  arch/arm/dts/zynq-zybo.dts  | 23 +++++++++++++++++++++++
>  board/xilinx/zynq/Kconfig   | 24 ++++++++++++++++++++++++
>  configs/zynq_zybo_defconfig |  3 +++
>  include/configs/zynq_zybo.h | 31 +++++++++++++++++++++++++++++++
>  6 files changed, 85 insertions(+)
>  create mode 100644 arch/arm/dts/zynq-zybo.dts
>  create mode 100644 configs/zynq_zybo_defconfig
>  create mode 100644 include/configs/zynq_zybo.h
> 

Applied all with that small fix in 2/3 reported by Jagan.
I have also tested it on real HW.

Thanks,
Michal

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140829/083e9422/attachment.pgp>

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 0/3] ARM: Zynq: Add ZYBO board
  2014-08-29 11:07 ` [U-Boot] [PATCH 0/3] ARM: Zynq: " Michal Simek
@ 2014-08-30  1:29   ` Peter Crosthwaite
  0 siblings, 0 replies; 13+ messages in thread
From: Peter Crosthwaite @ 2014-08-30  1:29 UTC (permalink / raw)
  To: u-boot

On Fri, Aug 29, 2014 at 9:07 PM, Michal Simek <michal.simek@xilinx.com> wrote:
> On 08/28/2014 01:16 PM, Peter Crosthwaite wrote:
>> Hi Michal, Steven,
>>
>> This series adds the ZYBO board to u-boot. Some components were originally
>> contributed to the digilent u-boot tree (P2). Thanks to Steven Wang. The
>> original code had a custom u-boot env specific for Zybo but I have dropped
>> that. I have added DTS support - which in general seems to have appeared in
>> u-boot since the original digilent work (P1). The new configury is P3.
>>
>> Regards,
>> Peter
>>
>> Peter Crosthwaite (2):
>>   arm: dts: zynq: Add digilent ZYBO board dts
>>   kconfig: zynq: Add ZYBO board
>>
>> Tinghui Wang (1):
>>   configs: zynq: Add config support for ZYBO
>>
>>  arch/arm/Kconfig            |  3 +++
>>  arch/arm/dts/Makefile       |  1 +
>>  arch/arm/dts/zynq-zybo.dts  | 23 +++++++++++++++++++++++
>>  board/xilinx/zynq/Kconfig   | 24 ++++++++++++++++++++++++
>>  configs/zynq_zybo_defconfig |  3 +++
>>  include/configs/zynq_zybo.h | 31 +++++++++++++++++++++++++++++++
>>  6 files changed, 85 insertions(+)
>>  create mode 100644 arch/arm/dts/zynq-zybo.dts
>>  create mode 100644 configs/zynq_zybo_defconfig
>>  create mode 100644 include/configs/zynq_zybo.h
>>
>
> Applied all with that small fix in 2/3 reported by Jagan.

Thanks,

Regards,
Peter

> I have also tested it on real HW.
>
> Thanks,
> Michal
>

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 2/3] configs: zynq: Add config support for ZYBO
       [not found] ` <OFC44BD889.84CD4704-ON86257D43.0024CD41-86257D43.0024CD47@ni.com>
  2014-08-29 10:34   ` [U-Boot] [PATCH 2/3] configs: zynq: Add config support for ZYBO Michal Simek
@ 2014-08-30  1:42   ` Peter Crosthwaite
  1 sibling, 0 replies; 13+ messages in thread
From: Peter Crosthwaite @ 2014-08-30  1:42 UTC (permalink / raw)
  To: u-boot

On Fri, Aug 29, 2014 at 4:41 PM, Steve Wang <steven.wang@digilentinc.com> wrote:
> Hi, Peter,
>
> In ZYBO, there is an on-board eeprom that contains a unique MAC address for
> each board.
> In FSBL (before u-boot), the MAC address is read out from EEPROM and write
> to the corresponding registers in ETH controller.
> So, in u-boot env, mac-skip should be defined so that it will not over-write
> the unique MAC address.
>

Is this condition auto-detectable? If an earlier boot stage has set
the MAC address that should be visible to the driver. Then the env is
given the concept of a "weak" mac address - one that is set if the
hardware is not initialised already.

This EEPROM MAC pre-init concept is also applicable to other Zynq
boards that contain EEPROM such as 70x so I think its more general
than ZYBO.

> So, I wonder if it should be done in dts file or there is other ways to do
> that.
>

DTS might work, is it a "chosen" perhaps? If the value is absent, then
u-boot will do nothing and assume other boot stages will do MAC addr
init.

Regards,
Peter

> Thanks indeed!
> Regards,
> Steve
>
>
> -----Peter Crosthwaite <crosthwaitepeter@gmail.com> wrote: -----
> To: u-boot at lists.denx.de
> From: Peter Crosthwaite <crosthwaitepeter@gmail.com>
> Date: 08/28/2014 04:16AM
> Cc: michals at xilinx.com, steven.wang at digilentinc.com
> Subject: [PATCH 2/3] configs: zynq: Add config support for ZYBO
>
>
> From: Tinghui Wang <steven.wang@digilentinc.com>
>
> This patch adds config support needed for ZYBO target and has
> been tested on Rev. B ZYBO hardware.
>
> Signed-off-by: Tinghui Wang <steven.wang@digilentinc.com>
> [PC changes:
>  * Dropped boards.cfg change (rebase conflict)
>  * Dropped custom u-boot env
>  * Added DTS
>  * Misc forward-porting changes
> ]
> Signed-off-by: Peter Crosthwiate <crosthwaite.peter@gmail.com>
>
> ---
> I have dropped the custom u-boot env from the original patch,
> as I'm not sure what the purpose was and I didn't need it for ZYBO SPL.
> ---
>  include/configs/zynq_zybo.h | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>  create mode 100644 include/configs/zynq_zybo.h
>
> diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
> new file mode 100644
> index 0000000..c167207
> --- /dev/null
> +++ b/include/configs/zynq_zybo.h
> @@ -0,0 +1,31 @@
> +/*
> + * (C) Copyright 2012 Xilinx
> + * (C) Copyright 2014 Digilent Inc.
> + *
> + * Configuration for Zynq Development Board - ZYBO
> + * See zynq_common.h for Zynq common configs
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#ifndef __CONFIG_ZYNQ_ZYBO_H
> +#define __CONFIG_ZYNQ_ZYBO_H
> +
> +#define CONFIG_SYS_SDRAM_SIZE (512 * 1024 * 1024)
> +
> +#define CONFIG_ZYNQ_SERIAL_UART1
> +#define CONFIG_ZYNQ_GEM0
> +#define CONFIG_ZYNQ_GEM_PHY_ADDR0 0
> +
> +#define CONFIG_SYS_NO_FLASH
> +
> +#define CONFIG_ZYNQ_SDHCI0
> +#define CONFIG_ZYNQ_BOOT_FREEBSD
> +#define CONFIG_DEFAULT_DEVICE_TREE zynq-zybo
> +
> +/* Define ZYBO PS Clock Frequency to 50MHz */
> +#define CONFIG_ZYNQ_PS_CLK_FREQ 50000000UL
> +
> +#include <configs/zynq-common.h>
> +
> +#endif /* __CONFIG_ZYNQ_ZYBO_H */
> --
> 1.9.1
>

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 3/3] kconfig: zynq: Add ZYBO board
  2014-08-28 11:16 ` [U-Boot] [PATCH 3/3] kconfig: zynq: Add ZYBO board Peter Crosthwaite
  2014-08-28 11:45   ` Jagan Teki
@ 2014-09-01  2:25   ` Masahiro Yamada
  2014-09-01 11:00     ` Michal Simek
  1 sibling, 1 reply; 13+ messages in thread
From: Masahiro Yamada @ 2014-09-01  2:25 UTC (permalink / raw)
  To: u-boot

Hi Peter,

Sorry, this patch no longer applies on the mainline.
Could you rebase and repost this patch, please?

(You need to touch arch/arm/cpu/armv7/zynq/Kconfig,
intead of arch/arm/Kconfig, board/xilinx/zynq/Kconfig)


Best Regards
Masahiro Yamada

On Thu, 28 Aug 2014 21:16:41 +1000
Peter Crosthwaite <crosthwaitepeter@gmail.com> wrote:

> Add a defconfig and Kconfigury for the Digilent ZYBO board.
> 
> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> ---
>  arch/arm/Kconfig            |  3 +++
>  board/xilinx/zynq/Kconfig   | 24 ++++++++++++++++++++++++
>  configs/zynq_zybo_defconfig |  3 +++
>  3 files changed, 30 insertions(+)
>  create mode 100644 configs/zynq_zybo_defconfig
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index e385eda..e04a2b9 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -671,6 +671,9 @@ config TARGET_ZYNQ_ZC770
>  config TARGET_ZYNQ_ZED
>  	bool "Support zynq_zed"
>  
> +config TARGET_ZYNQ_ZYBO
> +	bool "Support zynq_zybo"
> +
>  config TARGET_MEDCOM_WIDE
>  	bool "Support medcom-wide"
>  
> diff --git a/board/xilinx/zynq/Kconfig b/board/xilinx/zynq/Kconfig
> index 3b72a5f..151279c 100644
> --- a/board/xilinx/zynq/Kconfig
> +++ b/board/xilinx/zynq/Kconfig
> @@ -93,3 +93,27 @@ config SYS_CONFIG_NAME
>  	default "zynq_zed"
>  
>  endif
> +
> +if TARGET_ZYNQ_ZYBO
> +
> +config SYS_CPU
> +	string
> +	default "armv7"
> +
> +config SYS_BOARD
> +	string
> +	default "zynq"
> +
> +config SYS_VENDOR
> +	string
> +	default "xilinx"
> +
> +config SYS_SOC
> +	string
> +	default "zynq"
> +
> +config SYS_CONFIG_NAME
> +	string
> +	default "zynq_zybo"
> +
> +endif
> diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
> new file mode 100644
> index 0000000..973ebc1
> --- /dev/null
> +++ b/configs/zynq_zybo_defconfig
> @@ -0,0 +1,3 @@
> +CONFIG_SPL=y
> ++S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_ZYNQ_ZYBO=y
> -- 
> 1.9.1
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [U-Boot] [PATCH 3/3] kconfig: zynq: Add ZYBO board
  2014-09-01  2:25   ` Masahiro Yamada
@ 2014-09-01 11:00     ` Michal Simek
  0 siblings, 0 replies; 13+ messages in thread
From: Michal Simek @ 2014-09-01 11:00 UTC (permalink / raw)
  To: u-boot

Hi Peter and Masahiro,

On 09/01/2014 04:25 AM, Masahiro Yamada wrote:
> Hi Peter,
> 
> Sorry, this patch no longer applies on the mainline.
> Could you rebase and repost this patch, please?
> 
> (You need to touch arch/arm/cpu/armv7/zynq/Kconfig,
> intead of arch/arm/Kconfig, board/xilinx/zynq/Kconfig)
> 


I have rebased that patches on the top of Tom's tree.
Here is v2 patch:
https://patchwork.ozlabs.org/patch/384762/

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140901/c2998e45/attachment.pgp>

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2014-09-01 11:00 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-28 11:16 [U-Boot] [PATCH 0/3] ARM: Zynq: Add ZYBO board Peter Crosthwaite
2014-08-28 11:16 ` [U-Boot] [PATCH 1/3] arm: dts: zynq: Add digilent ZYBO board dts Peter Crosthwaite
2014-08-28 11:44   ` Jagan Teki
2014-08-28 11:16 ` [U-Boot] [PATCH 2/3] configs: zynq: Add config support for ZYBO Peter Crosthwaite
2014-08-28 11:39   ` Jagan Teki
2014-08-28 11:16 ` [U-Boot] [PATCH 3/3] kconfig: zynq: Add ZYBO board Peter Crosthwaite
2014-08-28 11:45   ` Jagan Teki
2014-09-01  2:25   ` Masahiro Yamada
2014-09-01 11:00     ` Michal Simek
2014-08-29 11:07 ` [U-Boot] [PATCH 0/3] ARM: Zynq: " Michal Simek
2014-08-30  1:29   ` Peter Crosthwaite
     [not found] ` <OFC44BD889.84CD4704-ON86257D43.0024CD41-86257D43.0024CD47@ni.com>
2014-08-29 10:34   ` [U-Boot] [PATCH 2/3] configs: zynq: Add config support for ZYBO Michal Simek
2014-08-30  1:42   ` Peter Crosthwaite

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.