Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
9f03247e
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9f03247e
编写于
7月 22, 2016
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://www.denx.de/git/u-boot-microblaze
上级
89ca873e
766d2609
变更
37
隐藏空白更改
内联
并排
Showing
37 changed file
with
119 addition
and
180 deletion
+119
-180
api/api_net.c
api/api_net.c
+1
-1
arch/arm/Kconfig
arch/arm/Kconfig
+2
-0
arch/arm/cpu/armv8/zynqmp/clk.c
arch/arm/cpu/armv8/zynqmp/clk.c
+0
-16
arch/arm/include/asm/arch-zynqmp/clk.h
arch/arm/include/asm/arch-zynqmp/clk.h
+0
-1
arch/arm/lib/spl.c
arch/arm/lib/spl.c
+1
-1
common/Kconfig
common/Kconfig
+6
-0
common/spl/spl_fat.c
common/spl/spl_fat.c
+2
-1
configs/xilinx_zynqmp_ep_defconfig
configs/xilinx_zynqmp_ep_defconfig
+5
-3
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
+5
-3
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
+5
-3
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
+5
-3
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
+5
-3
configs/xilinx_zynqmp_zcu102_defconfig
configs/xilinx_zynqmp_zcu102_defconfig
+5
-3
configs/xilinx_zynqmp_zcu102_revB_defconfig
configs/xilinx_zynqmp_zcu102_revB_defconfig
+5
-3
configs/zynq_microzed_defconfig
configs/zynq_microzed_defconfig
+5
-2
configs/zynq_picozed_defconfig
configs/zynq_picozed_defconfig
+5
-2
configs/zynq_zc702_defconfig
configs/zynq_zc702_defconfig
+4
-1
configs/zynq_zc706_defconfig
configs/zynq_zc706_defconfig
+4
-1
configs/zynq_zc770_xm010_defconfig
configs/zynq_zc770_xm010_defconfig
+2
-2
configs/zynq_zc770_xm011_defconfig
configs/zynq_zc770_xm011_defconfig
+2
-2
configs/zynq_zc770_xm012_defconfig
configs/zynq_zc770_xm012_defconfig
+1
-2
configs/zynq_zc770_xm013_defconfig
configs/zynq_zc770_xm013_defconfig
+2
-2
configs/zynq_zed_defconfig
configs/zynq_zed_defconfig
+5
-2
configs/zynq_zybo_defconfig
configs/zynq_zybo_defconfig
+4
-1
drivers/clk/clk-uclass.c
drivers/clk/clk-uclass.c
+1
-27
drivers/mmc/sdhci.c
drivers/mmc/sdhci.c
+1
-1
drivers/serial/serial_zynq.c
drivers/serial/serial_zynq.c
+27
-1
drivers/usb/host/Kconfig
drivers/usb/host/Kconfig
+7
-0
include/configs/microblaze-generic.h
include/configs/microblaze-generic.h
+0
-4
include/configs/xilinx_zynqmp_ep.h
include/configs/xilinx_zynqmp_ep.h
+1
-0
include/configs/zynq-common.h
include/configs/zynq-common.h
+1
-4
include/configs/zynq_microzed.h
include/configs/zynq_microzed.h
+0
-19
include/configs/zynq_picozed.h
include/configs/zynq_picozed.h
+0
-19
include/configs/zynq_zc70x.h
include/configs/zynq_zc70x.h
+0
-3
include/configs/zynq_zc770.h
include/configs/zynq_zc770.h
+0
-22
include/configs/zynq_zed.h
include/configs/zynq_zed.h
+0
-19
include/configs/zynq_zybo.h
include/configs/zynq_zybo.h
+0
-3
未找到文件。
api/api_net.c
浏览文件 @
9f03247e
...
...
@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define errf(fmt, args...) do { printf("ERROR @ %s(): ", __func__); printf(fmt, ##args); } while (0)
#if
def CONFIG_CMD_NET
#if
defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
static
int
dev_valid_net
(
void
*
cookie
)
{
...
...
arch/arm/Kconfig
浏览文件 @
9f03247e
...
...
@@ -669,6 +669,8 @@ config ARCH_ZYNQMP
select OF_CONTROL
select DM_SERIAL
select SUPPORT_SPL
select CLK
select SPL_CLK
config TEGRA
bool "NVIDIA Tegra"
...
...
arch/arm/cpu/armv8/zynqmp/clk.c
浏览文件 @
9f03247e
...
...
@@ -12,22 +12,6 @@
DECLARE_GLOBAL_DATA_PTR
;
unsigned
long
get_uart_clk
(
int
dev_id
)
{
u32
ver
=
zynqmp_get_silicon_version
();
switch
(
ver
)
{
case
ZYNQMP_CSU_VERSION_VELOCE
:
return
48000
;
case
ZYNQMP_CSU_VERSION_EP108
:
return
25000000
;
case
ZYNQMP_CSU_VERSION_QEMU
:
return
133000000
;
}
return
100000000
;
}
unsigned
long
zynqmp_get_system_timer_freq
(
void
)
{
u32
ver
=
zynqmp_get_silicon_version
();
...
...
arch/arm/include/asm/arch-zynqmp/clk.h
浏览文件 @
9f03247e
...
...
@@ -8,7 +8,6 @@
#ifndef _ASM_ARCH_CLK_H_
#define _ASM_ARCH_CLK_H_
unsigned
long
get_uart_clk
(
int
dev_id
);
unsigned
long
zynqmp_get_system_timer_freq
(
void
);
#endif
/* _ASM_ARCH_CLK_H_ */
arch/arm/lib/spl.c
浏览文件 @
9f03247e
...
...
@@ -60,7 +60,7 @@ void __noreturn jump_to_image_linux(void *arg)
typedef
void
(
*
image_entry_arg_t
)(
int
,
int
,
void
*
)
__attribute__
((
noreturn
));
image_entry_arg_t
image_entry
=
(
image_entry_arg_t
)
spl_image
.
entry_point
;
(
image_entry_arg_t
)
(
uintptr_t
)
spl_image
.
entry_point
;
cleanup_before_linux
();
image_entry
(
0
,
machid
,
arg
);
}
...
...
common/Kconfig
浏览文件 @
9f03247e
...
...
@@ -197,3 +197,9 @@ config CONSOLE_RECORD_IN_SIZE
tstc() and getc() will use this in preference to real device input.
The buffer is allocated immediately after the malloc() region is
ready.
config SYS_NO_FLASH
bool "Disable support for parallel NOR flash"
default n
help
This option is used to disable support for parallel NOR flash.
common/spl/spl_fat.c
浏览文件 @
9f03247e
...
...
@@ -88,7 +88,8 @@ int spl_load_image_fat(struct blk_desc *block_dev,
if
(
err
)
goto
end
;
err
=
file_fat_read
(
filename
,
(
u8
*
)
spl_image
.
load_addr
,
0
);
err
=
file_fat_read
(
filename
,
(
u8
*
)(
uintptr_t
)
spl_image
.
load_addr
,
0
);
}
end:
...
...
configs/xilinx_zynqmp_ep_defconfig
浏览文件 @
9f03247e
...
...
@@ -2,15 +2,17 @@ CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_ep"
CONFIG_ARCH_ZYNQMP=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y
CONFIG_DM_I2C=y
CONFIG_DM_GPIO=y
CONFIG_ZYNQMP_USB=y
CONFIG_SYS_TEXT_BASE=0x8000000
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep108"
CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_CONSOLE is not set
...
...
@@ -41,10 +43,10 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CLK=y
CONFIG_SPL_CLK=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_DM_MMC=y
CONFIG_ZYNQ_SDHCI=y
...
...
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
浏览文件 @
9f03247e
...
...
@@ -2,15 +2,17 @@ CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm015_dc1"
CONFIG_ARCH_ZYNQMP=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y
CONFIG_DM_I2C=y
CONFIG_DM_GPIO=y
CONFIG_ZYNQMP_USB=y
CONFIG_SYS_TEXT_BASE=0x8000000
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm015-dc1"
CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
...
...
@@ -32,10 +34,10 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CLK=y
CONFIG_SPL_CLK=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_DM_MMC=y
CONFIG_ZYNQ_SDHCI=y
...
...
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
浏览文件 @
9f03247e
...
...
@@ -2,15 +2,17 @@ CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm016_dc2"
CONFIG_ARCH_ZYNQMP=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y
CONFIG_DM_I2C=y
CONFIG_DM_GPIO=y
CONFIG_ZYNQMP_USB=y
CONFIG_SYS_TEXT_BASE=0x8000000
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm016-dc2"
CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
...
...
@@ -32,10 +34,10 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CLK=y
CONFIG_SPL_CLK=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_DM_MMC=y
CONFIG_NAND_ARASAN=y
...
...
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
浏览文件 @
9f03247e
...
...
@@ -2,14 +2,16 @@ CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm018_dc4"
CONFIG_ARCH_ZYNQMP=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y
CONFIG_DM_I2C=y
CONFIG_DM_GPIO=y
CONFIG_SYS_TEXT_BASE=0x8000000
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm018-dc4"
CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
...
...
@@ -28,10 +30,10 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CLK=y
CONFIG_SPL_CLK=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_DM_MMC=y
CONFIG_ZYNQ_SDHCI=y
...
...
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
浏览文件 @
9f03247e
...
...
@@ -2,14 +2,16 @@ CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm019_dc5"
CONFIG_ARCH_ZYNQMP=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y
CONFIG_DM_I2C=y
CONFIG_DM_GPIO=y
CONFIG_SYS_TEXT_BASE=0x8000000
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm019-dc5"
CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
...
...
@@ -28,9 +30,9 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_CLK=y
CONFIG_SPL_CLK=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_DM_MMC=y
CONFIG_ZYNQ_SDHCI=y
...
...
configs/xilinx_zynqmp_zcu102_defconfig
浏览文件 @
9f03247e
...
...
@@ -2,14 +2,16 @@ CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102"
CONFIG_ARCH_ZYNQMP=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y
CONFIG_DM_GPIO=y
CONFIG_ZYNQMP_USB=y
CONFIG_SYS_TEXT_BASE=0x8000000
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102"
CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
...
...
@@ -31,10 +33,10 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CLK=y
CONFIG_SPL_CLK=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_DM_MMC=y
CONFIG_ZYNQ_SDHCI=y
CONFIG_SPI_FLASH=y
...
...
configs/xilinx_zynqmp_zcu102_revB_defconfig
浏览文件 @
9f03247e
...
...
@@ -2,14 +2,16 @@ CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102"
CONFIG_ARCH_ZYNQMP=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y
CONFIG_DM_GPIO=y
CONFIG_ZYNQMP_USB=y
CONFIG_SYS_TEXT_BASE=0x8000000
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-revB"
CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_IMLS is not set
...
...
@@ -31,10 +33,10 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_CLK=y
CONFIG_SPL_CLK=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_DM_MMC=y
CONFIG_ZYNQ_SDHCI=y
CONFIG_SPI_FLASH=y
...
...
configs/zynq_microzed_defconfig
浏览文件 @
9f03247e
CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq
_microzed
"
CONFIG_SYS_CONFIG_NAME="zynq
-common
"
CONFIG_ARCH_ZYNQ=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_SYS_NO_FLASH=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y
...
...
@@ -38,9 +38,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_QSPI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI=y
CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Xilinx"
...
...
configs/zynq_picozed_defconfig
浏览文件 @
9f03247e
CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq
_picozed
"
CONFIG_SYS_CONFIG_NAME="zynq
-common
"
CONFIG_ARCH_ZYNQ=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
CONFIG_SPL=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_SYS_NO_FLASH=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y
...
...
@@ -28,9 +28,12 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_ZYNQ_SDHCI=y
CONFIG_ZYNQ_GEM=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI=y
CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Xilinx"
...
...
configs/zynq_zc702_defconfig
浏览文件 @
9f03247e
...
...
@@ -6,9 +6,9 @@ CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_SYS_NO_FLASH=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y
...
...
@@ -43,9 +43,12 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
CONFIG_DEBUG_UART_CLOCK=50000000
CONFIG_ZYNQ_QSPI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI=y
CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Xilinx"
...
...
configs/zynq_zc706_defconfig
浏览文件 @
9f03247e
...
...
@@ -6,9 +6,9 @@ CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_SYS_NO_FLASH=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y
...
...
@@ -39,9 +39,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_QSPI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI=y
CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Xilinx"
...
...
configs/zynq_zc770_xm010_defconfig
浏览文件 @
9f03247e
CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq
_zc770
"
CONFIG_SYS_CONFIG_NAME="zynq
-common
"
CONFIG_ARCH_ZYNQ=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
CONFIG_SPL=y
...
...
@@ -7,9 +7,9 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_SYS_NO_FLASH=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y
...
...
configs/zynq_zc770_xm011_defconfig
浏览文件 @
9f03247e
CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq
_zc770
"
CONFIG_SYS_CONFIG_NAME="zynq
-common
"
CONFIG_ARCH_ZYNQ=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm011"
CONFIG_SPL=y
...
...
@@ -7,9 +7,9 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011"
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_SYS_NO_FLASH=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y
...
...
configs/zynq_zc770_xm012_defconfig
浏览文件 @
9f03247e
CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq
_zc770
"
CONFIG_SYS_CONFIG_NAME="zynq
-common
"
CONFIG_ARCH_ZYNQ=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
CONFIG_SPL=y
...
...
@@ -7,7 +7,6 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_CMD_GPIO=y
...
...
configs/zynq_zc770_xm013_defconfig
浏览文件 @
9f03247e
CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq
_zc770
"
CONFIG_SYS_CONFIG_NAME="zynq
-common
"
CONFIG_ARCH_ZYNQ=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
CONFIG_SPL=y
...
...
@@ -7,9 +7,9 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_SYS_NO_FLASH=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y
...
...
configs/zynq_zed_defconfig
浏览文件 @
9f03247e
CONFIG_ARM=y
CONFIG_SYS_CONFIG_NAME="zynq
_zed
"
CONFIG_SYS_CONFIG_NAME="zynq
-common
"
CONFIG_ARCH_ZYNQ=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_SYS_NO_FLASH=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y
...
...
@@ -38,9 +38,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_QSPI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI=y
CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Xilinx"
...
...
configs/zynq_zybo_defconfig
浏览文件 @
9f03247e
...
...
@@ -6,9 +6,9 @@ CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Zynq> "
CONFIG_SYS_NO_FLASH=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y
...
...
@@ -41,9 +41,12 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
CONFIG_DEBUG_UART_CLOCK=50000000
CONFIG_ZYNQ_QSPI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI=y
CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
CONFIG_USB_STORAGE=y
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Xilinx"
...
...
drivers/clk/clk-uclass.c
浏览文件 @
9f03247e
...
...
@@ -21,7 +21,6 @@ static inline struct clk_ops *clk_dev_ops(struct udevice *dev)
}
#if CONFIG_IS_ENABLED(OF_CONTROL)
#ifdef CONFIG_SPL_BUILD
# if CONFIG_IS_ENABLED(OF_PLATDATA)
int
clk_get_by_index_platdata
(
struct
udevice
*
dev
,
int
index
,
struct
phandle_2_cell
*
cells
,
struct
clk
*
clk
)
...
...
@@ -38,31 +37,6 @@ int clk_get_by_index_platdata(struct udevice *dev, int index,
return
0
;
}
# else
int
clk_get_by_index
(
struct
udevice
*
dev
,
int
index
,
struct
clk
*
clk
)
{
int
ret
;
u32
cell
[
2
];
if
(
index
!=
0
)
return
-
ENOSYS
;
assert
(
clk
);
ret
=
uclass_get_device
(
UCLASS_CLK
,
0
,
&
clk
->
dev
);
if
(
ret
)
return
ret
;
ret
=
fdtdec_get_int_array
(
gd
->
fdt_blob
,
dev
->
of_offset
,
"clocks"
,
cell
,
2
);
if
(
ret
)
return
ret
;
clk
->
id
=
cell
[
1
];
return
0
;
}
# endif
/* OF_PLATDATA */
int
clk_get_by_name
(
struct
udevice
*
dev
,
const
char
*
name
,
struct
clk
*
clk
)
{
return
-
ENOSYS
;
}
#else
static
int
clk_of_xlate_default
(
struct
clk
*
clk
,
struct
fdtdec_phandle_args
*
args
)
{
...
...
@@ -119,6 +93,7 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk)
return
clk_request
(
dev_clk
,
clk
);
}
# endif
/* OF_PLATDATA */
int
clk_get_by_name
(
struct
udevice
*
dev
,
const
char
*
name
,
struct
clk
*
clk
)
{
...
...
@@ -135,7 +110,6 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
return
clk_get_by_index
(
dev
,
index
,
clk
);
}
#endif
/* CONFIG_SPL_BUILD */
#endif
/* OF_CONTROL */
int
clk_request
(
struct
udevice
*
dev
,
struct
clk
*
clk
)
...
...
drivers/mmc/sdhci.c
浏览文件 @
9f03247e
...
...
@@ -313,7 +313,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
}
reg
=
sdhci_readw
(
host
,
SDHCI_CLOCK_CONTROL
);
reg
&=
~
SDHCI_CLOCK_CARD_EN
;
reg
&=
~
(
SDHCI_CLOCK_CARD_EN
|
SDHCI_CLOCK_INT_EN
)
;
sdhci_writew
(
host
,
reg
,
SDHCI_CLOCK_CONTROL
);
if
(
clock
==
0
)
...
...
drivers/serial/serial_zynq.c
浏览文件 @
9f03247e
...
...
@@ -5,6 +5,7 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#include <clk.h>
#include <common.h>
#include <debug_uart.h>
#include <dm.h>
...
...
@@ -108,8 +109,33 @@ static int _uart_zynq_serial_putc(struct uart_zynq *regs, const char c)
int
zynq_serial_setbrg
(
struct
udevice
*
dev
,
int
baudrate
)
{
struct
zynq_uart_priv
*
priv
=
dev_get_priv
(
dev
);
unsigned
long
clock
=
get_uart_clk
(
0
)
;
unsigned
long
clock
;
#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
int
ret
;
struct
clk
clk
;
ret
=
clk_get_by_index
(
dev
,
0
,
&
clk
);
if
(
ret
<
0
)
{
dev_err
(
dev
,
"failed to get clock
\n
"
);
return
ret
;
}
clock
=
clk_get_rate
(
&
clk
);
if
(
IS_ERR_VALUE
(
clock
))
{
dev_err
(
dev
,
"failed to get rate
\n
"
);
return
clock
;
}
debug
(
"%s: CLK %ld
\n
"
,
__func__
,
clock
);
ret
=
clk_enable
(
&
clk
);
if
(
ret
&&
ret
!=
-
ENOSYS
)
{
dev_err
(
dev
,
"failed to enable clock
\n
"
);
return
ret
;
}
#else
clock
=
get_uart_clk
(
0
);
#endif
_uart_zynq_serial_setbrg
(
priv
->
regs
,
clock
,
baudrate
);
return
0
;
...
...
drivers/usb/host/Kconfig
浏览文件 @
9f03247e
...
...
@@ -85,6 +85,13 @@ config USB_EHCI_MSM
This driver supports combination of Chipidea USB controller
and Synapsys USB PHY in host mode only.
config USB_EHCI_ZYNQ
bool "Support for Xilinx Zynq on-chip EHCI USB controller"
depends on ARCH_ZYNQ
default y
---help---
Enable support for Zynq on-chip EHCI USB controller
config USB_EHCI_GENERIC
bool "Support for generic EHCI USB controller"
depends on OF_CONTROL
...
...
include/configs/microblaze-generic.h
浏览文件 @
9f03247e
...
...
@@ -175,10 +175,6 @@
#define CONFIG_CMD_IRQ
#define CONFIG_CMD_MFSL
#if defined(CONFIG_DCACHE) || defined(CONFIG_ICACHE)
#else
#endif
#if defined(FLASH)
# define CONFIG_CMD_JFFS2
# define CONFIG_CMD_UBI
...
...
include/configs/xilinx_zynqmp_ep.h
浏览文件 @
9f03247e
...
...
@@ -17,6 +17,7 @@
#define CONFIG_ZYNQ_SDHCI_MIN_FREQ (CONFIG_ZYNQ_SDHCI_MAX_FREQ << 9)
#define CONFIG_ZYNQ_EEPROM
#define CONFIG_AHCI
#define CONFIG_SATA_CEVA
#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \
ZYNQMP_USB1_XHCI_BASEADDR}
...
...
include/configs/zynq-common.h
浏览文件 @
9f03247e
...
...
@@ -86,10 +86,7 @@
# define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000
#endif
#ifdef CONFIG_ZYNQ_USB
# define CONFIG_USB_EHCI
# define CONFIG_USB_STORAGE
# define CONFIG_USB_EHCI_ZYNQ
#ifdef CONFIG_USB_EHCI_ZYNQ
# define CONFIG_EHCI_IS_TDI
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
...
...
include/configs/zynq_microzed.h
已删除
100644 → 0
浏览文件 @
89ca873e
/*
* (C) Copyright 2013 Xilinx, Inc.
*
* Configuration for Micro Zynq Evaluation and Development Board - MicroZedBoard
* See zynq-common.h for Zynq common configs
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQ_MICROZED_H
#define __CONFIG_ZYNQ_MICROZED_H
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ZYNQ_USB
#include <configs/zynq-common.h>
#endif
/* __CONFIG_ZYNQ_MICROZED_H */
include/configs/zynq_picozed.h
已删除
100644 → 0
浏览文件 @
89ca873e
/*
* (C) Copyright 2015 Xilinx, Inc.
*
* Configuration for PicoZed
* See zynq-common.h for Zynq common configs
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQ_PICOZED_H
#define __CONFIG_ZYNQ_PICOZED_H
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ZYNQ_USB
#include <configs/zynq-common.h>
#endif
/* __CONFIG_ZYNQ_PICOZED_H */
include/configs/zynq_zc70x.h
浏览文件 @
9f03247e
...
...
@@ -10,9 +10,6 @@
#ifndef __CONFIG_ZYNQ_ZC70X_H
#define __CONFIG_ZYNQ_ZC70X_H
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ZYNQ_USB
#define CONFIG_ZYNQ_I2C0
#define CONFIG_ZYNQ_EEPROM
...
...
include/configs/zynq_zc770.h
已删除
100644 → 0
浏览文件 @
89ca873e
/*
* (C) Copyright 2013 Xilinx, Inc.
*
* Configuration settings for the Xilinx Zynq ZC770 board.
* See zynq-common.h for Zynq common configs
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQ_ZC770_H
#define __CONFIG_ZYNQ_ZC770_H
#define CONFIG_SYS_NO_FLASH
#if defined(CONFIG_ZC770_XM012)
# undef CONFIG_SYS_NO_FLASH
#endif
#include <configs/zynq-common.h>
#endif
/* __CONFIG_ZYNQ_ZC770_H */
include/configs/zynq_zed.h
已删除
100644 → 0
浏览文件 @
89ca873e
/*
* (C) Copyright 2013 Xilinx, Inc.
*
* Configuration for Zynq Evaluation and Development Board - ZedBoard
* See zynq-common.h for Zynq common configs
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQ_ZED_H
#define __CONFIG_ZYNQ_ZED_H
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ZYNQ_USB
#include <configs/zynq-common.h>
#endif
/* __CONFIG_ZYNQ_ZED_H */
include/configs/zynq_zybo.h
浏览文件 @
9f03247e
...
...
@@ -11,9 +11,6 @@
#ifndef __CONFIG_ZYNQ_ZYBO_H
#define __CONFIG_ZYNQ_ZYBO_H
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ZYNQ_USB
#define CONFIG_ZYNQ_I2C0
#define CONFIG_ZYNQ_I2C1
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录