Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
e1541b1d
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,发现更多精彩内容 >>
提交
e1541b1d
编写于
3月 01, 2018
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.denx.de/u-boot-sh
上级
6256b02d
44c5580f
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
331 addition
and
6 deletion
+331
-6
Makefile
Makefile
+10
-0
arch/arm/dts/r8a7790-stout.dts
arch/arm/dts/r8a7790-stout.dts
+316
-6
include/configs/rcar-gen2-common.h
include/configs/rcar-gen2-common.h
+4
-0
include/configs/rcar-gen3-common.h
include/configs/rcar-gen3-common.h
+1
-0
未找到文件。
Makefile
浏览文件 @
e1541b1d
...
...
@@ -926,6 +926,16 @@ OBJCOPYFLAGS_u-boot.srec := -O srec
u-boot.hex u-boot.srec
:
u-boot FORCE
$(
call
if_changed,objcopy
)
OBJCOPYFLAGS_u-boot-elf.srec
:=
$
(
OBJCOPYFLAGS_u-boot.srec
)
u-boot-elf.srec
:
u-boot.elf FORCE
$(
call
if_changed,objcopy
)
OBJCOPYFLAGS_u-boot-spl.srec
=
$
(
OBJCOPYFLAGS_u-boot.srec
)
spl/u-boot-spl.srec
:
spl/u-boot-spl FORCE
$(
call
if_changed,objcopy
)
OBJCOPYFLAGS_u-boot-nodtb.bin
:=
-O
binary
\
$(
if
$(CONFIG_X86_16BIT_INIT)
,-R .start16
-R
.resetvec
)
...
...
arch/arm/dts/r8a7790-stout.dts
浏览文件 @
e1541b1d
...
...
@@ -8,19 +8,112 @@
/
dts
-
v1
/;
#
include
"r8a7790.dtsi"
#
include
<
dt
-
bindings
/
gpio
/
gpio
.
h
>
#
include
<
dt
-
bindings
/
input
/
input
.
h
>
/
{
model
=
"Stout"
;
compatible
=
"renesas,stout"
,
"renesas,r8a7790"
;
aliases
{
serial0
=
&
scif0
;
serial0
=
&
scifa0
;
};
chosen
{
bootargs
=
"ignore_loglevel rw root=/dev/nfs ip=dhcp"
;
stdout
-
path
=
"serial0:115200n8"
;
};
memory
@
40000000
{
device_type
=
"memory"
;
reg
=
<
0
0x40000000
0
0x40000000
>;
};
leds
{
compatible
=
"gpio-leds"
;
led1
{
gpios
=
<&
gpio4
22
GPIO_ACTIVE_LOW
>;
};
led2
{
gpios
=
<&
gpio4
23
GPIO_ACTIVE_LOW
>;
};
led3
{
gpios
=
<&
gpio5
17
GPIO_ACTIVE_LOW
>;
};
led5
{
gpios
=
<&
gpio4
24
GPIO_ACTIVE_LOW
>;
};
};
fixedregulator3v3
:
regulator
-
3
v3
{
compatible
=
"regulator-fixed"
;
regulator
-
name
=
"fixed-3.3V"
;
regulator
-
min
-
microvolt
=
<
3300000
>;
regulator
-
max
-
microvolt
=
<
3300000
>;
regulator
-
boot
-
on
;
regulator
-
always
-
on
;
};
vcc_sdhi0
:
regulator
-
vcc
-
sdhi0
{
compatible
=
"regulator-fixed"
;
regulator
-
name
=
"SDHI0 Vcc"
;
regulator
-
min
-
microvolt
=
<
3300000
>;
regulator
-
max
-
microvolt
=
<
3300000
>;
gpio
=
<&
gpio5
24
GPIO_ACTIVE_HIGH
>;
enable
-
active
-
high
;
};
hdmi
-
out
{
compatible
=
"hdmi-connector"
;
type
=
"a"
;
port
{
hdmi_con_out
:
endpoint
{
remote
-
endpoint
=
<&
adv7511_out
>;
};
};
};
osc1_clk
:
osc1
-
clock
{
compatible
=
"fixed-clock"
;
#
clock
-
cells
=
<
0
>;
clock
-
frequency
=
<
148500000
>;
};
osc4_clk
:
osc4
-
clock
{
compatible
=
"fixed-clock"
;
#
clock
-
cells
=
<
0
>;
clock
-
frequency
=
<
12000000
>;
};
};
&
du
{
pinctrl
-
0
=
<&
du_pins
>;
pinctrl
-
names
=
"default"
;
status
=
"okay"
;
clocks
=
<&
cpg
CPG_MOD
724
>,
<&
cpg
CPG_MOD
723
>,
<&
cpg
CPG_MOD
722
>,
<&
cpg
CPG_MOD
726
>,
<&
cpg
CPG_MOD
725
>,
<&
osc1_clk
>;
clock
-
names
=
"du.0"
,
"du.1"
,
"du.2"
,
"lvds.0"
,
"lvds.1"
,
"dclkin.0"
;
ports
{
port
@
0
{
endpoint
{
remote
-
endpoint
=
<&
adv7511_in
>;
};
};
port
@
1
{
lvds_connector0
:
endpoint
{
};
};
port
@
2
{
lvds_connector1
:
endpoint
{
};
};
};
};
&
extal_clk
{
...
...
@@ -28,22 +121,128 @@
};
&
pfc
{
pinctrl
-
0
=
<&
scif_clk_pins
>;
pinctrl
-
names
=
"default"
;
scif0_pins
:
scif0
{
groups
=
"scif0_data"
;
function
=
"scif0"
;
du_pins
:
du
{
groups
=
"du_rgb888"
,
"du_sync_1"
,
"du_clk_out_0"
;
function
=
"du"
;
};
scifa0_pins
:
scifa0
{
groups
=
"scifa0_data_b"
;
function
=
"scifa0"
;
};
scif_clk_pins
:
scif_clk
{
groups
=
"scif_clk"
;
function
=
"scif_clk"
;
};
ether_pins
:
ether
{
groups
=
"eth_link"
,
"eth_mdio"
,
"eth_rmii"
;
function
=
"eth"
;
};
phy1_pins
:
phy1
{
groups
=
"intc_irq1"
;
function
=
"intc"
;
};
sdhi0_pins
:
sd0
{
groups
=
"sdhi0_data4"
,
"sdhi0_ctrl"
;
function
=
"sdhi0"
;
power
-
source
=
<
3300
>;
};
qspi_pins
:
qspi
{
groups
=
"qspi_ctrl"
,
"qspi_data4"
;
function
=
"qspi"
;
};
iic2_pins
:
iic2
{
groups
=
"iic2_b"
;
function
=
"iic2"
;
};
iic3_pins
:
iic3
{
groups
=
"iic3"
;
function
=
"iic3"
;
};
usb0_pins
:
usb0
{
groups
=
"usb0"
;
function
=
"usb0"
;
};
};
&
scif0
{
pinctrl
-
0
=
<&
scif0_pins
>;
&
ether
{
pinctrl
-
0
=
<&
ether_pins
&
phy1_pins
>;
pinctrl
-
names
=
"default"
;
phy
-
handle
=
<&
phy1
>;
renesas
,
ether
-
link
-
active
-
low
;
status
=
"okay"
;
phy1
:
ethernet
-
phy
@
1
{
reg
=
<
1
>;
interrupt
-
parent
=
<&
irqc0
>;
interrupts
=
<
1
IRQ_TYPE_LEVEL_LOW
>;
micrel
,
led
-
mode
=
<
1
>;
};
};
&
cmt0
{
status
=
"okay"
;
};
&
qspi
{
pinctrl
-
0
=
<&
qspi_pins
>;
pinctrl
-
names
=
"default"
;
status
=
"okay"
;
flash
:
flash
@
0
{
compatible
=
"spansion,s25fl512s"
,
"jedec,spi-nor"
;
reg
=
<
0
>;
spi
-
max
-
frequency
=
<
30000000
>;
spi
-
tx
-
bus
-
width
=
<
4
>;
spi
-
rx
-
bus
-
width
=
<
4
>;
spi
-
cpha
;
spi
-
cpol
;
m25p
,
fast
-
read
;
partitions
{
compatible
=
"fixed-partitions"
;
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
partition
@
0
{
label
=
"loader"
;
reg
=
<
0x00000000
0x00080000
>;
read
-
only
;
};
partition
@
80000
{
label
=
"uboot"
;
reg
=
<
0x00080000
0x00040000
>;
read
-
only
;
};
partition
@
c0000
{
label
=
"uboot-env"
;
reg
=
<
0x000c0000
0x00040000
>;
read
-
only
;
};
partition
@
100000
{
label
=
"flash"
;
reg
=
<
0x00100000
0x03f00000
>;
};
};
};
};
&
scifa0
{
pinctrl
-
0
=
<&
scifa0_pins
>;
pinctrl
-
names
=
"default"
;
status
=
"okay"
;
...
...
@@ -52,3 +251,114 @@
&
scif_clk
{
clock
-
frequency
=
<
14745600
>;
};
&
sdhi0
{
pinctrl
-
0
=
<&
sdhi0_pins
>;
pinctrl
-
names
=
"default"
;
vmmc
-
supply
=
<&
vcc_sdhi0
>;
cd
-
gpios
=
<&
gpio3
6
GPIO_ACTIVE_LOW
>;
status
=
"okay"
;
};
&
cpu0
{
cpu0
-
supply
=
<&
vdd_dvfs
>;
};
&
iic2
{
status
=
"okay"
;
pinctrl
-
0
=
<&
iic2_pins
>;
pinctrl
-
names
=
"default"
;
clock
-
frequency
=
<
100000
>;
hdmi
@
39
{
compatible
=
"adi,adv7511w"
;
reg
=
<
0x39
>;
interrupt
-
parent
=
<&
gpio1
>;
interrupts
=
<
15
IRQ_TYPE_LEVEL_LOW
>;
clocks
=
<&
osc4_clk
>;
clock
-
names
=
"cec"
;
adi
,
input
-
depth
=
<
8
>;
adi
,
input
-
colorspace
=
"rgb"
;
adi
,
input
-
clock
=
"1x"
;
adi
,
input
-
style
=
<
1
>;
adi
,
input
-
justification
=
"evenly"
;
ports
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
0
>;
port
@
0
{
reg
=
<
0
>;
adv7511_in
:
endpoint
{
remote
-
endpoint
=
<&
du_out_rgb
>;
};
};
port
@
1
{
reg
=
<
1
>;
adv7511_out
:
endpoint
{
remote
-
endpoint
=
<&
hdmi_con_out
>;
};
};
};
};
};
&
iic3
{
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
iic3_pins
>;
status
=
"okay"
;
pmic
@
58
{
compatible
=
"dlg,da9063"
;
reg
=
<
0x58
>;
interrupt
-
parent
=
<&
irqc0
>;
interrupts
=
<
2
IRQ_TYPE_LEVEL_LOW
>;
interrupt
-
controller
;
rtc
{
compatible
=
"dlg,da9063-rtc"
;
};
wdt
{
compatible
=
"dlg,da9063-watchdog"
;
};
};
vdd_dvfs
:
regulator
@
68
{
compatible
=
"dlg,da9210"
;
reg
=
<
0x68
>;
interrupt
-
parent
=
<&
irqc0
>;
interrupts
=
<
2
IRQ_TYPE_LEVEL_LOW
>;
regulator
-
min
-
microvolt
=
<
1000000
>;
regulator
-
max
-
microvolt
=
<
1000000
>;
regulator
-
boot
-
on
;
regulator
-
always
-
on
;
};
vdd
:
regulator
@
70
{
compatible
=
"dlg,da9210"
;
reg
=
<
0x70
>;
interrupt
-
parent
=
<&
irqc0
>;
interrupts
=
<
2
IRQ_TYPE_LEVEL_LOW
>;
regulator
-
min
-
microvolt
=
<
1000000
>;
regulator
-
max
-
microvolt
=
<
1000000
>;
regulator
-
boot
-
on
;
regulator
-
always
-
on
;
};
};
&
pci0
{
status
=
"okay"
;
pinctrl
-
0
=
<&
usb0_pins
>;
pinctrl
-
names
=
"default"
;
};
&
usbphy
{
status
=
"okay"
;
};
include/configs/rcar-gen2-common.h
浏览文件 @
e1541b1d
...
...
@@ -15,6 +15,10 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#ifdef CONFIG_SPL
#define CONFIG_SPL_TARGET "spl/u-boot-spl.srec"
#endif
#undef CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_ARCH_CPU_INIT
...
...
include/configs/rcar-gen3-common.h
浏览文件 @
e1541b1d
...
...
@@ -13,6 +13,7 @@
#include <asm/arch/rmobile.h>
#define CONFIG_REMAKE_ELF
#define CONFIG_BUILD_TARGET "u-boot-elf.srec"
/* boot option */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录