Skip to contentSkip to conversation

Zynq changes

GIT PULL New Michal Simek 2 participants 5 messages Dec 7, 2015

lore
Share & tools
lore
#0 lore raw

Hi Tom,

please pull these changes. It is moving GEM to DM and fixes problems with SPL. The last three patches are fixing MANUAL_RELOC and enabling SPL_SIMPLE_BUS by default.

Thanks,
Michal

The following changes since commit 75507d5d5496a691aecb731f87d4d8d5cdf62b77:

am33xx: Update serial pdata (2015-12-06 16:38:05 -0500)

are available in the git repository at:

git://www.denx.de/git/u-boot-microblaze.git zynq

for you to fetch changes up to 8bebf03c73cd0830cb2cd234021004cde67c6412:

dm: core: Enable SPL_SIMPLE_BUS by default (2015-12-07 10:14:30 +0100)

----------------------------------------------------------------
Michal Simek (27):
ARM: zynq: Remove PHYLIB from config to defconfig
ARM: zynq: Remove CONFIG_API
net: gem: Do not continue if phy is not found
net: gem: Change mdio_wait prototype to pass regs
net: gem: Change mii function not to use eth_device structure
net: gem: Remove phydev variable
net: gem: Extract phy init code
net: gem: Check if priv->phydev is valid
net: gem: Enable MDIO bus earlier
net: gem: Remove zynq_gem_of_init()
net: gem: Fix miiphy_read name
net: gem: Move driver to DM
net: gem: Read information about interface from DT
net: gem: Move gem to Kconfig
net: gem: Enable CTRL+C in wait_for_bit
ARM64: zynqmp: Enable FIT config option via Kconfig
ARM: zynq: Enable debug console for zc702
ARM: zynq: Fix location of stack and malloc areas
ARM: zynq: Extend malloc size
ARM: zynq: Remove unused SERIAL macros for serial_zynq
zynq: sdhci: Remove zynq_sdhci_of_init()
zynq: sdhci: Move driver to DM
serial: zynq: Fix incorrect reference to s5p driver
serial: zynq: Remove duplicated header
i2c: cmd: Relocate subcommands when MANUAL_RELOC
dm: cmd: Relocate subcommands when MANUAL_RELOC
dm: core: Enable SPL_SIMPLE_BUS by default

Siva Durga Prasad Paladugu (1):
zynq: sdhci: Calculate minimum frequency based on max frequency

 arch/arm/Kconfig                             |   4 +++
 arch/arm/dts/zynq-zc702.dts                  |   3 ++
 arch/arm/include/asm/arch-zynqmp/hardware.h  |   6 ----
 arch/arm/include/asm/arch-zynqmp/sys_proto.h |   1 -
 arch/arm/mach-zynq/include/mach/hardware.h   |   4 ---
 arch/arm/mach-zynq/include/mach/sys_proto.h  |   3 --
 board/xilinx/zynq/board.c                    |  30 ----------------
 board/xilinx/zynqmp/zynqmp.c                 |  47 ------------------------
 common/cmd_i2c.c                             |  16 ++++++---
 configs/xilinx_zynqmp_ep_defconfig           |   3 ++
 configs/zynq_microzed_defconfig              |   2 ++
 configs/zynq_picozed_defconfig               |   2 ++
 configs/zynq_zc702_defconfig                 |   6 ++++
 configs/zynq_zc706_defconfig                 |   2 ++
 configs/zynq_zc770_xm010_defconfig           |   2 ++
 configs/zynq_zc770_xm011_defconfig           |   2 ++
 configs/zynq_zc770_xm012_defconfig           |   2 ++
 configs/zynq_zc770_xm013_defconfig           |   2 ++
 configs/zynq_zed_defconfig                   |   2 ++
 configs/zynq_zybo_defconfig                  |   2 ++
 drivers/core/Kconfig                         |   2 +-
 drivers/mmc/zynq_sdhci.c                     |  67
++++++++++++++++------------------
 drivers/net/Kconfig                          |   6 ++++
 drivers/net/zynq_gem.c                       | 314
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------
 drivers/serial/Kconfig                       |   2 +-
 drivers/serial/serial_zynq.c                 |   5 +--
 include/configs/xilinx_zynqmp.h              |   7 +---
 include/configs/xilinx_zynqmp_ep.h           |   3 --
 include/configs/zynq-common.h                |  29 ++++++---------
 include/configs/zynq_microzed.h              |   3 --
 include/configs/zynq_picozed.h               |   3 --
 include/configs/zynq_zc70x.h                 |   3 --
 include/configs/zynq_zc770.h                 |   4 ---
 include/configs/zynq_zed.h                   |   3 --
 include/configs/zynq_zybo.h                  |   3 --
 include/netdev.h                             |   3 --
 test/dm/cmd_dm.c                             |  14 ++++++++
 37 files changed, 285 insertions(+), 327 deletions(-)
Signature · 14 lines
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: 181 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151207/bbf4728e/attachment.sig>
#1 lore raw

PATCH 1/1 CONFIG_NEEDS_MANUAL_RELOC: Fix warnings when not set

Now that we may compile (but not link) code calling fixup_cmdtable when this is not set, we need to always have the declaration available. We should also make sure that anyone calling the function includes <command.h> as that's where the function declaration is.

---
 common/board_r.c  |    1 +
 include/command.h |    2 --
 test/dm/cmd_dm.c  |    1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
common/board_r.c +1 -0
index 5af32dd..75ee43e 100644
@@ -15,6 +15,7 @@
 #if defined(CONFIG_CMD_BEDBUG)
 #include <bedbug/type.h>
 #endif
+#include <command.h>
 #include <console.h>
 #ifdef CONFIG_HAS_DATAFLASH
 #include <dataflash.h>
include/command.h +0 -2
index 6c04cd9..07ae525 100644
@@ -179,8 +179,6 @@ int cmd_process(int flag, int argc, char * const argv[],
 #define U_BOOT_CMD(_name, _maxargs, _rep, _cmd, _usage, _help)		\
 	U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, NULL)
 
-#if defined(CONFIG_NEEDS_MANUAL_RELOC)
 void fixup_cmdtable(cmd_tbl_t *cmdtp, int size);
-#endif
 
 #endif	/* __COMMAND_H */
test/dm/cmd_dm.c +1 -0
index b6e7109..a3c5971 100644
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <dm.h>
 #include <malloc.h>
 #include <mapmem.h>
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/1 CONFIG_NEEDS_MANUAL_RELOC: Fix warnings when not set

In reply to Michal Simek

Now that we may compile (but not link) code calling fixup_cmdtable when this is not set, we need to always have the declaration available. We should also make sure that anyone calling the function includes <command.h> as that's where the function declaration is.

---
Changes in v2:
- Move declaration up to be under the current __ASSEMBLY__ test.

---
 common/board_r.c  |    1 +
 include/command.h |    5 +----
 test/dm/cmd_dm.c  |    1 +
 3 files changed, 3 insertions(+), 4 deletions(-)
common/board_r.c +1 -0
index 5af32dd..75ee43e 100644
@@ -15,6 +15,7 @@
 #if defined(CONFIG_CMD_BEDBUG)
 #include <bedbug/type.h>
 #endif
+#include <command.h>
 #include <console.h>
 #ifdef CONFIG_HAS_DATAFLASH
 #include <dataflash.h>
include/command.h +1 -4
index 6c04cd9..2ae9b6c 100644
@@ -142,6 +142,7 @@ enum command_ret_t {
 int cmd_process(int flag, int argc, char * const argv[],
 			       int *repeatable, unsigned long *ticks);
 
+void fixup_cmdtable(cmd_tbl_t *cmdtp, int size);
 #endif	/* __ASSEMBLY__ */
 
 /*
@@ -179,8 +180,4 @@ int cmd_process(int flag, int argc, char * const argv[],
 #define U_BOOT_CMD(_name, _maxargs, _rep, _cmd, _usage, _help)		\
 	U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, NULL)
 
-#if defined(CONFIG_NEEDS_MANUAL_RELOC)
-void fixup_cmdtable(cmd_tbl_t *cmdtp, int size);
-#endif
-
 #endif	/* __COMMAND_H */
test/dm/cmd_dm.c +1 -0
index b6e7109..a3c5971 100644
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <dm.h>
 #include <malloc.h>
 #include <mapmem.h>
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 1/1 CONFIG_NEEDS_MANUAL_RELOC: Fix warnings when not set

Quoted 7 lines · Tom Rini

Now that we may compile (but not link) code calling fixup_cmdtable when this is not set, we need to always have the declaration available. We should also make sure that anyone calling the function includes <command.h> as that's where the function declaration is.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151207/91272476/attachment.sig>
#4 lore raw
In reply to Michal Simek
Quoted 13 lines · Michal Simek

Hi Tom,

please pull these changes. It is moving GEM to DM and fixes problems with SPL. The last three patches are fixing MANUAL_RELOC and enabling SPL_SIMPLE_BUS by default.

Thanks,
Michal

The following changes since commit 75507d5d5496a691aecb731f87d4d8d5cdf62b77:

am33xx: Update serial pdata (2015-12-06 16:38:05 -0500)

Quoted 8 lines

are available in the git repository at:

git://www.denx.de/git/u-boot-microblaze.git zynq

for you to fetch changes up to 8bebf03c73cd0830cb2cd234021004cde67c6412:

dm: core: Enable SPL_SIMPLE_BUS by default (2015-12-07 10:14:30 +0100)

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151207/09c90144/attachment.sig>