Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
6ef71c61
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,发现更多精彩内容 >>
提交
6ef71c61
编写于
9月 23, 2017
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.denx.de/u-boot-fsl-qoriq
上级
91ebf300
09c6778d
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
49 addition
and
18 deletion
+49
-18
arch/arm/cpu/armv8/fsl-layerscape/soc.c
arch/arm/cpu/armv8/fsl-layerscape/soc.c
+7
-1
arch/arm/dts/fsl-ls2081a-rdb.dts
arch/arm/dts/fsl-ls2081a-rdb.dts
+2
-2
arch/arm/include/asm/arch-fsl-layerscape/cpu.h
arch/arm/include/asm/arch-fsl-layerscape/cpu.h
+10
-0
board/freescale/ls2080ardb/ls2080ardb.c
board/freescale/ls2080ardb/ls2080ardb.c
+12
-0
configs/ls1043ardb_sdcard_defconfig
configs/ls1043ardb_sdcard_defconfig
+0
-1
configs/ls1046ardb_sdcard_defconfig
configs/ls1046ardb_sdcard_defconfig
+0
-1
drivers/pci/pcie_layerscape_fixup.c
drivers/pci/pcie_layerscape_fixup.c
+14
-5
include/configs/ls1043a_common.h
include/configs/ls1043a_common.h
+1
-1
include/configs/ls2080ardb.h
include/configs/ls2080ardb.h
+2
-6
include/usb/ehci-ci.h
include/usb/ehci-ci.h
+1
-1
未找到文件。
arch/arm/cpu/armv8/fsl-layerscape/soc.c
浏览文件 @
6ef71c61
...
...
@@ -260,8 +260,8 @@ static void erratum_rcw_src(void)
#ifdef CONFIG_SYS_FSL_ERRATUM_A009203
static
void
erratum_a009203
(
void
)
{
u8
__iomem
*
ptr
;
#ifdef CONFIG_SYS_I2C
u8
__iomem
*
ptr
;
#ifdef I2C1_BASE_ADDR
ptr
=
(
u8
__iomem
*
)(
I2C1_BASE_ADDR
+
I2C_DEBUG_REG
);
...
...
@@ -297,7 +297,9 @@ void bypass_smmu(void)
void
fsl_lsch3_early_init_f
(
void
)
{
erratum_rcw_src
();
#ifdef CONFIG_FSL_IFC
init_early_memctl_regs
();
/* tighten IFC timing */
#endif
#ifdef CONFIG_SYS_FSL_ERRATUM_A009203
erratum_a009203
();
#endif
...
...
@@ -323,11 +325,14 @@ int sata_init(void)
{
struct
ccsr_ahci
__iomem
*
ccsr_ahci
;
#ifdef CONFIG_SYS_SATA2
ccsr_ahci
=
(
void
*
)
CONFIG_SYS_SATA2
;
out_le32
(
&
ccsr_ahci
->
ppcfg
,
AHCI_PORT_PHY_1_CFG
);
out_le32
(
&
ccsr_ahci
->
ptc
,
AHCI_PORT_TRANS_CFG
);
out_le32
(
&
ccsr_ahci
->
axicc
,
AHCI_PORT_AXICC_CFG
);
#endif
#ifdef CONFIG_SYS_SATA1
ccsr_ahci
=
(
void
*
)
CONFIG_SYS_SATA1
;
out_le32
(
&
ccsr_ahci
->
ppcfg
,
AHCI_PORT_PHY_1_CFG
);
out_le32
(
&
ccsr_ahci
->
ptc
,
AHCI_PORT_TRANS_CFG
);
...
...
@@ -335,6 +340,7 @@ int sata_init(void)
ahci_init
((
void
__iomem
*
)
CONFIG_SYS_SATA1
);
scsi_scan
(
false
);
#endif
return
0
;
}
...
...
arch/arm/dts/fsl-ls2081a-rdb.dts
浏览文件 @
6ef71c61
...
...
@@ -41,7 +41,7 @@
bus
-
num
=
<
0
>;
status
=
"okay"
;
qflash0
:
n25q512a
@
0
{
qflash0
:
s25fs512s
@
0
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
compatible
=
"spi-flash"
;
...
...
@@ -49,7 +49,7 @@
reg
=
<
0
>;
};
qflash1
:
n25q512a
@
1
{
qflash1
:
s25fs512s
@
1
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
compatible
=
"spi-flash"
;
...
...
arch/arm/include/asm/arch-fsl-layerscape/cpu.h
浏览文件 @
6ef71c61
...
...
@@ -106,6 +106,7 @@ static struct mm_region early_map[] = {
{
CONFIG_SYS_FSL_QSPI_BASE1
,
CONFIG_SYS_FSL_QSPI_BASE1
,
CONFIG_SYS_FSL_QSPI_SIZE1
,
PTE_BLOCK_MEMTYPE
(
MT_NORMAL
)
|
PTE_BLOCK_NON_SHARE
},
#ifdef CONFIG_FSL_IFC
/* For IFC Region #1, only the first 4MB is cache-enabled */
{
CONFIG_SYS_FSL_IFC_BASE1
,
CONFIG_SYS_FSL_IFC_BASE1
,
CONFIG_SYS_FSL_IFC_SIZE1_1
,
...
...
@@ -120,6 +121,7 @@ static struct mm_region early_map[] = {
CONFIG_SYS_FSL_IFC_SIZE1
,
PTE_BLOCK_MEMTYPE
(
MT_DEVICE_NGNRNE
)
|
PTE_BLOCK_NON_SHARE
},
#endif
{
CONFIG_SYS_FSL_DRAM_BASE1
,
CONFIG_SYS_FSL_DRAM_BASE1
,
CONFIG_SYS_FSL_DRAM_SIZE1
,
#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)
...
...
@@ -129,11 +131,13 @@ static struct mm_region early_map[] = {
#endif
PTE_BLOCK_OUTER_SHARE
|
PTE_BLOCK_NS
},
#ifdef CONFIG_FSL_IFC
/* Map IFC region #2 up to CONFIG_SYS_FLASH_BASE for NAND boot */
{
CONFIG_SYS_FSL_IFC_BASE2
,
CONFIG_SYS_FSL_IFC_BASE2
,
CONFIG_SYS_FLASH_BASE
-
CONFIG_SYS_FSL_IFC_BASE2
,
PTE_BLOCK_MEMTYPE
(
MT_DEVICE_NGNRNE
)
|
PTE_BLOCK_NON_SHARE
},
#endif
{
CONFIG_SYS_FSL_DCSR_BASE
,
CONFIG_SYS_FSL_DCSR_BASE
,
CONFIG_SYS_FSL_DCSR_SIZE
,
PTE_BLOCK_MEMTYPE
(
MT_DEVICE_NGNRNE
)
|
...
...
@@ -163,10 +167,12 @@ static struct mm_region early_map[] = {
CONFIG_SYS_FSL_QSPI_SIZE
,
PTE_BLOCK_MEMTYPE
(
MT_DEVICE_NGNRNE
)
|
PTE_BLOCK_NON_SHARE
},
#ifdef CONFIG_FSL_IFC
{
CONFIG_SYS_FSL_IFC_BASE
,
CONFIG_SYS_FSL_IFC_BASE
,
CONFIG_SYS_FSL_IFC_SIZE
,
PTE_BLOCK_MEMTYPE
(
MT_DEVICE_NGNRNE
)
|
PTE_BLOCK_NON_SHARE
},
#endif
{
CONFIG_SYS_FSL_DRAM_BASE1
,
CONFIG_SYS_FSL_DRAM_BASE1
,
CONFIG_SYS_FSL_DRAM_SIZE1
,
#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)
...
...
@@ -211,11 +217,13 @@ static struct mm_region final_map[] = {
PTE_BLOCK_MEMTYPE
(
MT_DEVICE_NGNRNE
)
|
PTE_BLOCK_NON_SHARE
|
PTE_BLOCK_PXN
|
PTE_BLOCK_UXN
},
#ifdef CONFIG_FSL_IFC
{
CONFIG_SYS_FSL_IFC_BASE2
,
CONFIG_SYS_FSL_IFC_BASE2
,
CONFIG_SYS_FSL_IFC_SIZE2
,
PTE_BLOCK_MEMTYPE
(
MT_DEVICE_NGNRNE
)
|
PTE_BLOCK_NON_SHARE
|
PTE_BLOCK_PXN
|
PTE_BLOCK_UXN
},
#endif
{
CONFIG_SYS_FSL_DCSR_BASE
,
CONFIG_SYS_FSL_DCSR_BASE
,
CONFIG_SYS_FSL_DCSR_SIZE
,
PTE_BLOCK_MEMTYPE
(
MT_DEVICE_NGNRNE
)
|
...
...
@@ -310,10 +318,12 @@ static struct mm_region final_map[] = {
PTE_BLOCK_MEMTYPE
(
MT_DEVICE_NGNRNE
)
|
PTE_BLOCK_NON_SHARE
|
PTE_BLOCK_PXN
|
PTE_BLOCK_UXN
},
#ifdef CONFIG_FSL_IFC
{
CONFIG_SYS_FSL_IFC_BASE
,
CONFIG_SYS_FSL_IFC_BASE
,
CONFIG_SYS_FSL_IFC_SIZE
,
PTE_BLOCK_MEMTYPE
(
MT_DEVICE_NGNRNE
)
|
PTE_BLOCK_NON_SHARE
},
#endif
{
CONFIG_SYS_FSL_DRAM_BASE1
,
CONFIG_SYS_FSL_DRAM_BASE1
,
CONFIG_SYS_FSL_DRAM_SIZE1
,
PTE_BLOCK_MEMTYPE
(
MT_NORMAL
)
|
...
...
board/freescale/ls2080ardb/ls2080ardb.c
浏览文件 @
6ef71c61
...
...
@@ -251,6 +251,8 @@ int misc_init_r(void)
char
*
env_hwconfig
;
u32
__iomem
*
dcfg_ccsr
=
(
u32
__iomem
*
)
DCFG_BASE
;
u32
val
;
struct
ccsr_gur
__iomem
*
gur
=
(
void
*
)(
CONFIG_SYS_FSL_GUTS_ADDR
);
u32
svr
=
gur_in32
(
&
gur
->
svr
);
val
=
in_le32
(
dcfg_ccsr
+
DCFG_RCWSR13
/
4
);
...
...
@@ -278,6 +280,16 @@ int misc_init_r(void)
if
(
adjust_vdd
(
0
))
printf
(
"Warning: Adjusting core voltage failed.
\n
"
);
/*
* Default value of board env is based on filename which is
* ls2080ardb. Modify board env for other supported SoCs
*/
if
((
SVR_SOC_VER
(
svr
)
==
SVR_LS2088A
)
||
(
SVR_SOC_VER
(
svr
)
==
SVR_LS2048A
))
env_set
(
"board"
,
"ls2088ardb"
);
else
if
((
SVR_SOC_VER
(
svr
)
==
SVR_LS2081A
)
||
(
SVR_SOC_VER
(
svr
)
==
SVR_LS2041A
))
env_set
(
"board"
,
"ls2081ardb"
);
return
0
;
}
...
...
configs/ls1043ardb_sdcard_defconfig
浏览文件 @
6ef71c61
...
...
@@ -3,7 +3,6 @@ CONFIG_TARGET_LS1043ARDB=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_FSL_LS_PPA=y
CONFIG_SPL_FSL_LS_PPA=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
...
...
configs/ls1046ardb_sdcard_defconfig
浏览文件 @
6ef71c61
CONFIG_ARM=y
CONFIG_TARGET_LS1046ARDB=y
CONFIG_FSL_LS_PPA=y
CONFIG_SPL_FSL_LS_PPA=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y
...
...
drivers/pci/pcie_layerscape_fixup.c
浏览文件 @
6ef71c61
...
...
@@ -130,19 +130,28 @@ static void fdt_pcie_set_iommu_map_entry(void *blob, struct ls_pcie *pcie,
u32
iommu_map
[
4
];
int
nodeoffset
;
int
lenp
;
uint
svr
;
char
*
compat
=
NULL
;
/* find pci controller node */
nodeoffset
=
fdt_node_offset_by_compat_reg
(
blob
,
"fsl,ls-pcie"
,
pcie
->
dbi_res
.
start
);
if
(
nodeoffset
<
0
)
{
#ifdef CONFIG_FSL_PCIE_COMPAT
/* Compatible with older version of dts node */
nodeoffset
=
fdt_node_offset_by_compat_reg
(
blob
,
CONFIG_FSL_PCIE_COMPAT
,
pcie
->
dbi_res
.
start
);
svr
=
(
get_svr
()
>>
SVR_VAR_PER_SHIFT
)
&
0xFFFFFE
;
if
(
svr
==
SVR_LS2088A
||
svr
==
SVR_LS2084A
||
svr
==
SVR_LS2048A
||
svr
==
SVR_LS2044A
||
svr
==
SVR_LS2081A
||
svr
==
SVR_LS2041A
)
compat
=
"fsl,ls2088a-pcie"
;
else
compat
=
CONFIG_FSL_PCIE_COMPAT
;
if
(
compat
)
nodeoffset
=
fdt_node_offset_by_compat_reg
(
blob
,
compat
,
pcie
->
dbi_res
.
start
);
#endif
if
(
nodeoffset
<
0
)
return
;
#else
return
;
#endif
}
/* get phandle to iommu controller */
...
...
include/configs/ls1043a_common.h
浏览文件 @
6ef71c61
...
...
@@ -22,7 +22,7 @@
#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_BOOT))
#define SPL_NO_MMC
#endif
#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT))
#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT
_QSPI
))
#define SPL_NO_IFC
#endif
...
...
include/configs/ls2080ardb.h
浏览文件 @
6ef71c61
...
...
@@ -18,7 +18,6 @@
#define CONFIG_QIXIS_I2C_ACCESS
#endif
#define CONFIG_SYS_I2C_EARLY_INIT
#define CONFIG_DISPLAY_BOARDINFO_LATE
#endif
#define I2C_MUX_CH_VOL_MONITOR 0xa
...
...
@@ -289,19 +288,15 @@ unsigned long get_board_sys_clk(void);
/* SPI */
#if defined(CONFIG_FSL_QSPI) || defined(CONFIG_FSL_DSPI)
#define CONFIG_SPI_FLASH
#ifdef CONFIG_FSL_
Q
SPI
#ifdef CONFIG_FSL_
D
SPI
#define CONFIG_SPI_FLASH_STMICRO
#endif
#ifdef CONFIG_FSL_QSPI
#ifdef CONFIG_TARGET_LS2081ARDB
#define CONFIG_SPI_FLASH_STMICRO
#else
#define CONFIG_SPI_FLASH_SPANSION
#endif
#define FSL_QSPI_FLASH_SIZE SZ_64M
/* 64MB */
#define FSL_QSPI_FLASH_NUM 2
#endif
#endif
/*
* RTC configuration
...
...
@@ -392,6 +387,7 @@ unsigned long get_board_sys_clk(void);
"load_addr=0xa0000000\0" \
"kernel_size=0x2800000\0" \
"console=ttyAMA0,38400n8\0" \
"mcmemsize=0x70000000\0" \
MC_INIT_CMD \
BOOTENV \
"boot_scripts=ls2088ardb_boot.scr\0" \
...
...
include/usb/ehci-ci.h
浏览文件 @
6ef71c61
...
...
@@ -156,7 +156,7 @@
#elif defined(CONFIG_MPC85xx)
#define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_MPC85xx_USB1_ADDR
#define CONFIG_SYS_FSL_USB2_ADDR CONFIG_SYS_MPC85xx_USB2_ADDR
#elif defined(CONFIG_
LS102X
A) || defined(CONFIG_ARCH_LS1012A)
#elif defined(CONFIG_
ARCH_LS1021
A) || defined(CONFIG_ARCH_LS1012A)
#define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_EHCI_USB1_ADDR
#define CONFIG_SYS_FSL_USB2_ADDR 0
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录