Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
bb3d9ed3
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,发现更多精彩内容 >>
提交
bb3d9ed3
编写于
10月 27, 2017
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.denx.de/u-boot-fsl-qoriq
上级
33fe2712
9b3f40ad
变更
30
隐藏空白更改
内联
并排
Showing
30 changed file
with
182 addition
and
132 deletion
+182
-132
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+7
-0
arch/arm/cpu/armv8/fsl-layerscape/ppa.c
arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+13
-3
arch/arm/cpu/armv8/sec_firmware.c
arch/arm/cpu/armv8/sec_firmware.c
+88
-4
arch/arm/dts/fsl-ls1088a.dtsi
arch/arm/dts/fsl-ls1088a.dtsi
+14
-0
arch/arm/include/asm/arch-fsl-layerscape/config.h
arch/arm/include/asm/arch-fsl-layerscape/config.h
+1
-1
arch/arm/include/asm/armv8/sec_firmware.h
arch/arm/include/asm/armv8/sec_firmware.h
+3
-1
arch/powerpc/cpu/mpc85xx/release.S
arch/powerpc/cpu/mpc85xx/release.S
+6
-0
board/freescale/ls1088a/eth_ls1088aqds.c
board/freescale/ls1088a/eth_ls1088aqds.c
+1
-0
configs/ls1088aqds_qspi_defconfig
configs/ls1088aqds_qspi_defconfig
+9
-0
configs/ls1088ardb_qspi_defconfig
configs/ls1088ardb_qspi_defconfig
+9
-0
drivers/net/fsl-mc/mc.c
drivers/net/fsl-mc/mc.c
+21
-18
drivers/net/ldpaa_eth/ls1088a.c
drivers/net/ldpaa_eth/ls1088a.c
+2
-2
drivers/usb/host/Kconfig
drivers/usb/host/Kconfig
+6
-0
include/configs/ls1012a_common.h
include/configs/ls1012a_common.h
+1
-1
include/configs/ls1012afrdm.h
include/configs/ls1012afrdm.h
+0
-10
include/configs/ls1012aqds.h
include/configs/ls1012aqds.h
+0
-8
include/configs/ls1012ardb.h
include/configs/ls1012ardb.h
+0
-9
include/configs/ls1021aiot.h
include/configs/ls1021aiot.h
+0
-8
include/configs/ls1021aqds.h
include/configs/ls1021aqds.h
+0
-8
include/configs/ls1021atwr.h
include/configs/ls1021atwr.h
+0
-8
include/configs/ls1043aqds.h
include/configs/ls1043aqds.h
+0
-7
include/configs/ls1043ardb.h
include/configs/ls1043ardb.h
+0
-9
include/configs/ls1046aqds.h
include/configs/ls1046aqds.h
+0
-7
include/configs/ls1046ardb.h
include/configs/ls1046ardb.h
+0
-9
include/configs/ls1088aqds.h
include/configs/ls1088aqds.h
+0
-1
include/configs/ls1088ardb.h
include/configs/ls1088ardb.h
+0
-1
include/configs/ls2080aqds.h
include/configs/ls2080aqds.h
+0
-7
include/configs/ls2080ardb.h
include/configs/ls2080ardb.h
+0
-7
include/linux/usb/xhci-fsl.h
include/linux/usb/xhci-fsl.h
+1
-1
scripts/config_whitelist.txt
scripts/config_whitelist.txt
+0
-2
未找到文件。
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
浏览文件 @
bb3d9ed3
...
...
@@ -490,3 +490,10 @@ config SYS_MC_RSV_MEM_ALIGN
config SPL_LDSCRIPT
default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARCH_LS1043A || ARCH_LS1046A || ARCH_LS2080A
config HAS_FSL_XHCI_USB
bool
default y if ARCH_LS1043A || ARCH_LS1046A
help
For some SoC(such as LS1043A and LS1046A), USB and QE-HDLC multiplex use
pins, select it when the pins are assigned to USB.
arch/arm/cpu/armv8/fsl-layerscape/ppa.c
浏览文件 @
bb3d9ed3
...
...
@@ -35,6 +35,7 @@ int ppa_init(void)
unsigned
int
el
=
current_el
();
void
*
ppa_fit_addr
;
u32
*
boot_loc_ptr_l
,
*
boot_loc_ptr_h
;
u32
*
loadable_l
,
*
loadable_h
;
int
ret
;
#ifdef CONFIG_CHAIN_OF_TRUST
...
...
@@ -240,9 +241,9 @@ int ppa_init(void)
PPA_KEY_HASH
,
&
ppa_img_addr
);
if
(
ret
!=
0
)
printf
(
"
PPA
validation failed
\n
"
);
printf
(
"
SEC firmware(s)
validation failed
\n
"
);
else
printf
(
"
PPA
validation Successful
\n
"
);
printf
(
"
SEC firmware(s)
validation Successful
\n
"
);
}
#if defined(CONFIG_SYS_LS_PPA_FW_IN_MMC) || \
defined(CONFIG_SYS_LS_PPA_FW_IN_NAND)
...
...
@@ -254,15 +255,24 @@ int ppa_init(void)
struct
ccsr_gur
__iomem
*
gur
=
(
void
*
)(
CONFIG_SYS_FSL_GUTS_ADDR
);
boot_loc_ptr_l
=
&
gur
->
bootlocptrl
;
boot_loc_ptr_h
=
&
gur
->
bootlocptrh
;
/* Assign addresses to loadable ptrs */
loadable_l
=
&
gur
->
scratchrw
[
4
];
loadable_h
=
&
gur
->
scratchrw
[
5
];
#elif defined(CONFIG_FSL_LSCH2)
struct
ccsr_scfg
__iomem
*
scfg
=
(
void
*
)(
CONFIG_SYS_FSL_SCFG_ADDR
);
boot_loc_ptr_l
=
&
scfg
->
scratchrw
[
1
];
boot_loc_ptr_h
=
&
scfg
->
scratchrw
[
0
];
/* Assign addresses to loadable ptrs */
loadable_l
=
&
scfg
->
scratchrw
[
2
];
loadable_h
=
&
scfg
->
scratchrw
[
3
];
#endif
debug
(
"fsl-ppa: boot_loc_ptr_l = 0x%p, boot_loc_ptr_h =0x%p
\n
"
,
boot_loc_ptr_l
,
boot_loc_ptr_h
);
ret
=
sec_firmware_init
(
ppa_fit_addr
,
boot_loc_ptr_l
,
boot_loc_ptr_h
);
ret
=
sec_firmware_init
(
ppa_fit_addr
,
boot_loc_ptr_l
,
boot_loc_ptr_h
,
loadable_l
,
loadable_h
);
#if defined(CONFIG_SYS_LS_PPA_FW_IN_MMC) || \
defined(CONFIG_SYS_LS_PPA_FW_IN_NAND)
...
...
arch/arm/cpu/armv8/sec_firmware.c
浏览文件 @
bb3d9ed3
...
...
@@ -105,6 +105,74 @@ static int sec_firmware_parse_image(const void *sec_firmware_img,
return
0
;
}
/*
* SEC Firmware FIT image parser to check if any loadable is
* present. If present, verify integrity of the loadable and
* copy loadable to address provided in (loadable_h, loadable_l).
*
* Returns 0 on success and a negative errno on error task fail.
*/
static
int
sec_firmware_check_copy_loadable
(
const
void
*
sec_firmware_img
,
u32
*
loadable_l
,
u32
*
loadable_h
)
{
phys_addr_t
sec_firmware_loadable_addr
=
0
;
int
conf_node_off
,
ld_node_off
;
char
*
conf_node_name
=
NULL
;
const
void
*
data
;
size_t
size
;
ulong
load
;
conf_node_name
=
SEC_FIRMEWARE_FIT_CNF_NAME
;
conf_node_off
=
fit_conf_get_node
(
sec_firmware_img
,
conf_node_name
);
if
(
conf_node_off
<
0
)
{
printf
(
"SEC Firmware: %s: no such config
\n
"
,
conf_node_name
);
return
-
ENOENT
;
}
ld_node_off
=
fit_conf_get_prop_node
(
sec_firmware_img
,
conf_node_off
,
FIT_LOADABLE_PROP
);
if
(
ld_node_off
>=
0
)
{
printf
(
"SEC Firmware: '%s' present in config
\n
"
,
FIT_LOADABLE_PROP
);
/* Verify secure firmware image */
if
(
!
(
fit_image_verify
(
sec_firmware_img
,
ld_node_off
)))
{
printf
(
"SEC Loadable: Bad loadable image (bad CRC)
\n
"
);
return
-
EINVAL
;
}
if
(
fit_image_get_data
(
sec_firmware_img
,
ld_node_off
,
&
data
,
&
size
))
{
printf
(
"SEC Loadable: Can't get subimage data/size"
);
return
-
ENOENT
;
}
/* Get load address, treated as load offset to secure memory */
if
(
fit_image_get_load
(
sec_firmware_img
,
ld_node_off
,
&
load
))
{
printf
(
"SEC Loadable: Can't get subimage load"
);
return
-
ENOENT
;
}
/* Compute load address for loadable in secure memory */
sec_firmware_loadable_addr
=
(
sec_firmware_addr
-
gd
->
arch
.
tlb_size
)
+
load
;
/* Copy loadable to secure memory and flush dcache */
debug
(
"%s copied to address 0x%p
\n
"
,
FIT_LOADABLE_PROP
,
(
void
*
)
sec_firmware_loadable_addr
);
memcpy
((
void
*
)
sec_firmware_loadable_addr
,
data
,
size
);
flush_dcache_range
(
sec_firmware_loadable_addr
,
sec_firmware_loadable_addr
+
size
);
}
/* Populate address ptrs for loadable image with loadbale addr */
out_le32
(
loadable_l
,
(
sec_firmware_loadable_addr
&
WORD_MASK
));
out_le32
(
loadable_h
,
(
sec_firmware_loadable_addr
>>
WORD_SHIFT
));
return
0
;
}
static
int
sec_firmware_copy_image
(
const
char
*
title
,
u64
image_addr
,
u32
image_size
,
u64
sec_firmware
)
{
...
...
@@ -117,9 +185,11 @@ static int sec_firmware_copy_image(const char *title,
/*
* This function will parse the SEC Firmware image, and then load it
* to secure memory.
* to secure memory. Also load any loadable if present along with SEC
* Firmware image.
*/
static
int
sec_firmware_load_image
(
const
void
*
sec_firmware_img
)
static
int
sec_firmware_load_image
(
const
void
*
sec_firmware_img
,
u32
*
loadable_l
,
u32
*
loadable_h
)
{
const
void
*
raw_image_addr
;
size_t
raw_image_size
=
0
;
...
...
@@ -172,6 +242,15 @@ static int sec_firmware_load_image(const void *sec_firmware_img)
if
(
ret
)
goto
out
;
/*
* Check if any loadable are present along with firmware image, if
* present load them.
*/
ret
=
sec_firmware_check_copy_loadable
(
sec_firmware_img
,
loadable_l
,
loadable_h
);
if
(
ret
)
goto
out
;
sec_firmware_addr
|=
SEC_FIRMWARE_LOADED
;
debug
(
"SEC Firmware: Entry point: 0x%llx
\n
"
,
sec_firmware_addr
&
SEC_FIRMWARE_ADDR_MASK
);
...
...
@@ -289,17 +368,22 @@ int sec_firmware_get_random(uint8_t *rand, int bytes)
* @sec_firmware_img: the SEC Firmware image address
* @eret_hold_l: the address to hold exception return address low
* @eret_hold_h: the address to hold exception return address high
* @loadable_l: the address to hold loadable address low
* @loadable_h: the address to hold loadable address high
*/
int
sec_firmware_init
(
const
void
*
sec_firmware_img
,
u32
*
eret_hold_l
,
u32
*
eret_hold_h
)
u32
*
eret_hold_h
,
u32
*
loadable_l
,
u32
*
loadable_h
)
{
int
ret
;
if
(
!
sec_firmware_is_valid
(
sec_firmware_img
))
return
-
EINVAL
;
ret
=
sec_firmware_load_image
(
sec_firmware_img
);
ret
=
sec_firmware_load_image
(
sec_firmware_img
,
loadable_l
,
loadable_h
);
if
(
ret
)
{
printf
(
"SEC Firmware: Failed to load image
\n
"
);
return
ret
;
...
...
arch/arm/dts/fsl-ls1088a.dtsi
浏览文件 @
bb3d9ed3
...
...
@@ -76,6 +76,20 @@
num-cs = <4>;
};
usb0: usb3@3100000 {
compatible = "fsl,layerscape-dwc3";
reg = <0x0 0x3100000 0x0 0x10000>;
interrupts = <0 80 0x4>; /* Level high type */
dr_mode = "host";
};
usb1: usb3@3110000 {
compatible = "fsl,layerscape-dwc3";
reg = <0x0 0x3110000 0x0 0x10000>;
interrupts = <0 81 0x4>; /* Level high type */
dr_mode = "host";
};
pcie@3400000 {
compatible = "fsl,ls-pcie", "snps,dw-pcie";
reg = <0x00 0x03400000 0x0 0x80000 /* dbi registers */
...
...
arch/arm/include/asm/arch-fsl-layerscape/config.h
浏览文件 @
bb3d9ed3
...
...
@@ -16,7 +16,7 @@
* Reserve secure memory
* To be aligned with MMU block size
*/
#define CONFIG_SYS_MEM_RESERVE_SECURE (
2048 * 1024)
/* 2
MB */
#define CONFIG_SYS_MEM_RESERVE_SECURE (
66 * 1024 * 1024)
/* 66
MB */
#define SPL_TLB_SETBACK 0x1000000
/* 16MB under effective memory top */
#ifdef CONFIG_ARCH_LS2080A
...
...
arch/arm/include/asm/armv8/sec_firmware.h
浏览文件 @
bb3d9ed3
...
...
@@ -9,8 +9,10 @@
#define PSCI_INVALID_VER 0xffffffff
#define SEC_JR3_OFFSET 0x40000
#define WORD_MASK 0xffffffff
#define WORD_SHIFT 32
int
sec_firmware_init
(
const
void
*
,
u32
*
,
u32
*
);
int
sec_firmware_init
(
const
void
*
,
u32
*
,
u32
*
,
u32
*
,
u32
*
);
int
_sec_firmware_entry
(
const
void
*
,
u32
*
,
u32
*
);
bool
sec_firmware_is_valid
(
const
void
*
);
bool
sec_firmware_support_hwrng
(
void
);
...
...
arch/powerpc/cpu/mpc85xx/release.S
浏览文件 @
bb3d9ed3
...
...
@@ -184,12 +184,18 @@ __secondary_start_page:
mtspr
SPRN_PIR
,
r4
/*
write
to
PIR
register
*/
#ifdef CONFIG_SYS_FSL_ERRATUM_A007907
mfspr
r8
,
L1CSR2
clrrwi
r8
,
r8
,
10
/*
clear
bit
[
54
-
63
]
DCSTASHID
*/
mtspr
L1CSR2
,
r8
#else
#ifdef CONFIG_SYS_CACHE_STASHING
/
*
set
stash
id
to
(
coreID
)
*
2
+
32
+
L1
CT
(
0
)
*/
slwi
r8
,
r4
,
1
addi
r8
,
r8
,
32
mtspr
L1CSR2
,
r8
#endif
#endif /* CONFIG_SYS_FSL_ERRATUM_A007907 */
#if defined(CONFIG_SYS_P4080_ERRATUM_CPU22) || \
defined
(
CONFIG_SYS_FSL_ERRATUM_NMG_CPU_A011
)
...
...
board/freescale/ls1088a/eth_ls1088aqds.c
浏览文件 @
bb3d9ed3
...
...
@@ -634,6 +634,7 @@ int board_eth_init(bd_t *bis)
for
(
i
=
WRIOP1_DPMAC1
;
i
<
NUM_WRIOP_PORTS
;
i
++
)
{
switch
(
wriop_get_enet_if
(
i
))
{
case
PHY_INTERFACE_MODE_RGMII
:
case
PHY_INTERFACE_MODE_RGMII_ID
:
ls1088a_handle_phy_interface_rgmii
(
i
);
break
;
case
PHY_INTERFACE_MODE_QSGMII
:
...
...
configs/ls1088aqds_qspi_defconfig
浏览文件 @
bb3d9ed3
...
...
@@ -30,3 +30,12 @@ CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y
CONFIG_FSL_DSPI=y
CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
CONFIG_CMD_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
CONFIG_USB_STORAGE=y
configs/ls1088ardb_qspi_defconfig
浏览文件 @
bb3d9ed3
...
...
@@ -30,3 +30,12 @@ CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y
CONFIG_FSL_DSPI=y
CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
CONFIG_CMD_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
CONFIG_USB_STORAGE=y
drivers/net/fsl-mc/mc.c
浏览文件 @
bb3d9ed3
...
...
@@ -725,9 +725,9 @@ int mc_init(u64 mc_fw_addr, u64 mc_dpc_addr)
* Initialize the global default MC portal
* And check that the MC firmware is responding portal commands:
*/
root_mc_io
=
(
struct
fsl_mc_io
*
)
malloc
(
sizeof
(
struct
fsl_mc_io
)
);
root_mc_io
=
(
struct
fsl_mc_io
*
)
calloc
(
sizeof
(
struct
fsl_mc_io
),
1
);
if
(
!
root_mc_io
)
{
printf
(
" No memory:
m
alloc() failed
\n
"
);
printf
(
" No memory:
c
alloc() failed
\n
"
);
return
-
ENOMEM
;
}
...
...
@@ -879,11 +879,12 @@ static int dpio_init(void)
struct
dpio_cfg
dpio_cfg
;
int
err
=
0
;
dflt_dpio
=
(
struct
fsl_dpio_obj
*
)
malloc
(
sizeof
(
struct
fsl_dpio_obj
));
dflt_dpio
=
(
struct
fsl_dpio_obj
*
)
calloc
(
sizeof
(
struct
fsl_dpio_obj
),
1
);
if
(
!
dflt_dpio
)
{
printf
(
"No memory:
m
alloc() failed
\n
"
);
printf
(
"No memory:
c
alloc() failed
\n
"
);
err
=
-
ENOMEM
;
goto
err_
m
alloc
;
goto
err_
c
alloc
;
}
dpio_cfg
.
channel_mode
=
DPIO_LOCAL_CHANNEL
;
...
...
@@ -948,7 +949,7 @@ err_get_attr:
dpio_destroy
(
dflt_mc_io
,
MC_CMD_NO_FLAGS
,
dflt_dpio
->
dpio_handle
);
err_create:
free
(
dflt_dpio
);
err_
m
alloc:
err_
c
alloc:
return
err
;
}
...
...
@@ -1030,11 +1031,11 @@ static int dprc_init(void)
goto
err_create
;
}
dflt_mc_io
=
(
struct
fsl_mc_io
*
)
malloc
(
sizeof
(
struct
fsl_mc_io
)
);
dflt_mc_io
=
(
struct
fsl_mc_io
*
)
calloc
(
sizeof
(
struct
fsl_mc_io
),
1
);
if
(
!
dflt_mc_io
)
{
err
=
-
ENOMEM
;
printf
(
" No memory:
m
alloc() failed
\n
"
);
goto
err_
m
alloc
;
printf
(
" No memory:
c
alloc() failed
\n
"
);
goto
err_
c
alloc
;
}
child_portal_id
=
MC_PORTAL_OFFSET_TO_PORTAL_ID
(
mc_portal_offset
);
...
...
@@ -1059,7 +1060,7 @@ static int dprc_init(void)
return
0
;
err_child_open:
free
(
dflt_mc_io
);
err_
m
alloc:
err_
c
alloc:
dprc_destroy_container
(
root_mc_io
,
MC_CMD_NO_FLAGS
,
root_dprc_handle
,
child_dprc_id
);
err_create:
...
...
@@ -1110,11 +1111,12 @@ static int dpbp_init(void)
struct
dpbp_attr
dpbp_attr
;
struct
dpbp_cfg
dpbp_cfg
;
dflt_dpbp
=
(
struct
fsl_dpbp_obj
*
)
malloc
(
sizeof
(
struct
fsl_dpbp_obj
));
dflt_dpbp
=
(
struct
fsl_dpbp_obj
*
)
calloc
(
sizeof
(
struct
fsl_dpbp_obj
),
1
);
if
(
!
dflt_dpbp
)
{
printf
(
"No memory:
m
alloc() failed
\n
"
);
printf
(
"No memory:
c
alloc() failed
\n
"
);
err
=
-
ENOMEM
;
goto
err_
m
alloc
;
goto
err_
c
alloc
;
}
dpbp_cfg
.
options
=
512
;
...
...
@@ -1164,7 +1166,7 @@ err_get_attr:
dpbp_close
(
dflt_mc_io
,
MC_CMD_NO_FLAGS
,
dflt_dpbp
->
dpbp_handle
);
dpbp_destroy
(
dflt_mc_io
,
MC_CMD_NO_FLAGS
,
dflt_dpbp
->
dpbp_handle
);
err_create:
err_
m
alloc:
err_
c
alloc:
return
err
;
}
...
...
@@ -1206,11 +1208,12 @@ static int dpni_init(void)
struct
dpni_extended_cfg
dpni_extended_cfg
;
struct
dpni_cfg
dpni_cfg
;
dflt_dpni
=
(
struct
fsl_dpni_obj
*
)
malloc
(
sizeof
(
struct
fsl_dpni_obj
));
dflt_dpni
=
(
struct
fsl_dpni_obj
*
)
calloc
(
sizeof
(
struct
fsl_dpni_obj
),
1
);
if
(
!
dflt_dpni
)
{
printf
(
"No memory:
m
alloc() failed
\n
"
);
printf
(
"No memory:
c
alloc() failed
\n
"
);
err
=
-
ENOMEM
;
goto
err_
m
alloc
;
goto
err_
c
alloc
;
}
memset
(
&
dpni_extended_cfg
,
0
,
sizeof
(
dpni_extended_cfg
));
...
...
@@ -1272,7 +1275,7 @@ err_get_attr:
err_create:
err_prepare_extended_cfg:
free
(
dflt_dpni
);
err_
m
alloc:
err_
c
alloc:
return
err
;
}
...
...
drivers/net/ldpaa_eth/ls1088a.c
浏览文件 @
bb3d9ed3
...
...
@@ -99,7 +99,7 @@ void fsl_rgmii_init(void)
ec
>>=
FSL_CHASSIS3_RCWSR25_EC1_PRTCL_SHIFT
;
if
(
!
ec
)
wriop_init_dpmac_enet_if
(
4
,
PHY_INTERFACE_MODE_RGMII
);
wriop_init_dpmac_enet_if
(
4
,
PHY_INTERFACE_MODE_RGMII
_ID
);
#endif
#ifdef CONFIG_SYS_FSL_EC2
...
...
@@ -108,7 +108,7 @@ void fsl_rgmii_init(void)
ec
>>=
FSL_CHASSIS3_RCWSR25_EC2_PRTCL_SHIFT
;
if
(
!
ec
)
wriop_init_dpmac_enet_if
(
5
,
PHY_INTERFACE_MODE_RGMII
);
wriop_init_dpmac_enet_if
(
5
,
PHY_INTERFACE_MODE_RGMII
_ID
);
#endif
}
#endif
drivers/usb/host/Kconfig
浏览文件 @
bb3d9ed3
...
...
@@ -71,6 +71,12 @@ config USB_XHCI_DRA7XX_INDEX
Select the DRA7XX xHCI USB index.
Current supported values: 0, 1.
config USB_XHCI_FSL
bool "Support for NXP Layerscape on-chip xHCI USB controller"
default y if ARCH_LS1021A || FSL_LSCH3 || FSL_LSCH2
depends on !SPL_NO_USB
help
Enables support for the on-chip xHCI controller on NXP Layerscape SoCs.
endif # USB_XHCI_HCD
config USB_EHCI_HCD
...
...
include/configs/ls1012a_common.h
浏览文件 @
bb3d9ed3
...
...
@@ -32,7 +32,7 @@
#define CONFIG_SYS_DDR_BLOCK2_BASE 0x880000000ULL
/* Generic Timer Definitions */
#define COUNTER_FREQUENCY
CONFIG_SYS_CLK_FREQ/4
/* 25MHz */
#define COUNTER_FREQUENCY
25000000
/* 25MHz */
/* CSU */
#define CONFIG_LAYERSCAPE_NS_ACCESS
...
...
include/configs/ls1012afrdm.h
浏览文件 @
bb3d9ed3
...
...
@@ -31,16 +31,6 @@
"kernel_load=0x96000000\0" \
"kernel_size=0x2800000\0"
/*
* USB
*/
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
#define CONFIG_CMD_MEMINFO
#define CONFIG_CMD_MEMTEST
#define CONFIG_SYS_MEMTEST_START 0x80000000
...
...
include/configs/ls1012aqds.h
浏览文件 @
bb3d9ed3
...
...
@@ -118,14 +118,6 @@
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#endif
/*XHCI Support - enabled by default*/
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
/* MMC */
#ifdef CONFIG_MMC
#define CONFIG_FSL_ESDHC
...
...
include/configs/ls1012ardb.h
浏览文件 @
bb3d9ed3
...
...
@@ -19,15 +19,6 @@
#define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END 0x9fffffff
/*
* USB
*/
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
/*
* I2C IO expander
...
...
include/configs/ls1021aiot.h
浏览文件 @
bb3d9ed3
...
...
@@ -19,14 +19,6 @@
#define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE
/* XHCI Support - enabled by default */
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
#define CONFIG_SYS_CLK_FREQ 100000000
#define CONFIG_DDR_CLK_FREQ 100000000
...
...
include/configs/ls1021aqds.h
浏览文件 @
bb3d9ed3
...
...
@@ -404,14 +404,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#endif
/*XHCI Support - enabled by default*/
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
/*
* Video
*/
...
...
include/configs/ls1021atwr.h
浏览文件 @
bb3d9ed3
...
...
@@ -44,14 +44,6 @@
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#endif
/* XHCI Support - enabled by default */
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif
#define CONFIG_SYS_CLK_FREQ 100000000
#define CONFIG_DDR_CLK_FREQ 100000000
...
...
include/configs/ls1043aqds.h
浏览文件 @
bb3d9ed3
...
...
@@ -370,13 +370,6 @@ unsigned long get_board_ddr_clk(void);
#endif
#endif
/* USB */
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#endif
/*
* Miscellaneous configurable options
*/
...
...
include/configs/ls1043ardb.h
浏览文件 @
bb3d9ed3
...
...
@@ -284,15 +284,6 @@
#endif
#endif
/* USB */
#ifndef SPL_NO_USB
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#endif
#endif
/* SATA */
#ifndef SPL_NO_SATA
#define CONFIG_LIBATA
...
...
include/configs/ls1046aqds.h
浏览文件 @
bb3d9ed3
...
...
@@ -136,13 +136,6 @@ unsigned long get_board_ddr_clk(void);
#define CFG_LPUART_EN 0x2
#endif
/* USB */
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#endif
/* SATA */
#define CONFIG_LIBATA
#define CONFIG_SCSI_AHCI
...
...
include/configs/ls1046ardb.h
浏览文件 @
bb3d9ed3
...
...
@@ -209,15 +209,6 @@
#endif
#endif
/* USB */
#ifndef SPL_NO_USB
#define CONFIG_HAS_FSL_XHCI_USB
#ifdef CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#endif
#endif
/* SATA */
#ifndef SPL_NO_SATA
#define CONFIG_LIBATA
...
...
include/configs/ls1088aqds.h
浏览文件 @
bb3d9ed3
...
...
@@ -20,7 +20,6 @@ unsigned long get_board_ddr_clk(void);
#if defined(CONFIG_QSPI_BOOT)
#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE 0x2000
/* 8KB */
#define CONFIG_ENV_OFFSET 0x300000
/* 3MB */
#define CONFIG_ENV_SECT_SIZE 0x40000
...
...
include/configs/ls1088ardb.h
浏览文件 @
bb3d9ed3
...
...
@@ -12,7 +12,6 @@
#define CONFIG_DISPLAY_BOARDINFO_LATE
#if defined(CONFIG_QSPI_BOOT)
#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE 0x2000
/* 8KB */
#define CONFIG_ENV_OFFSET 0x300000
/* 3MB */
#define CONFIG_ENV_SECT_SIZE 0x40000
...
...
include/configs/ls2080aqds.h
浏览文件 @
bb3d9ed3
...
...
@@ -435,13 +435,6 @@ unsigned long get_board_ddr_clk(void);
#endif
/*
* USB
*/
#define CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#include <asm/fsl_secure_boot.h>
#endif
/* __LS2_QDS_H */
include/configs/ls2080ardb.h
浏览文件 @
bb3d9ed3
...
...
@@ -333,13 +333,6 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_MISC_INIT_R
/*
* USB
*/
#define CONFIG_HAS_FSL_XHCI_USB
#define CONFIG_USB_XHCI_FSL
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#undef CONFIG_CMDLINE_EDITING
#include <config_distro_defaults.h>
...
...
include/linux/usb/xhci-fsl.h
浏览文件 @
bb3d9ed3
...
...
@@ -58,7 +58,7 @@ struct fsl_xhci {
#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR
#define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0
#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0
#elif defined(CONFIG_ARCH_LS2080A)
#elif defined(CONFIG_ARCH_LS2080A)
|| defined(CONFIG_ARCH_LS1088A)
#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR
#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR
#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0
...
...
scripts/config_whitelist.txt
浏览文件 @
bb3d9ed3
...
...
@@ -873,7 +873,6 @@ CONFIG_HAS_ETH7
CONFIG_HAS_FEC
CONFIG_HAS_FSL_DR_USB
CONFIG_HAS_FSL_MPH_USB
CONFIG_HAS_FSL_XHCI_USB
CONFIG_HAS_POST
CONFIG_HCLK_FREQ
CONFIG_HDBOOT
...
...
@@ -5027,7 +5026,6 @@ CONFIG_USB_TTY
CONFIG_USB_TUSB_OMAP_DMA
CONFIG_USB_ULPI_TIMEOUT
CONFIG_USB_XHCI_EXYNOS
CONFIG_USB_XHCI_FSL
CONFIG_USB_XHCI_KEYSTONE
CONFIG_USB_XHCI_OMAP
CONFIG_USER_LOWLEVEL_INIT
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录