Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
b16f6804
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,发现更多精彩内容 >>
提交
b16f6804
编写于
2月 11, 2017
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.denx.de/u-boot-rockchip
上级
f1cc9776
6f279764
变更
22
隐藏空白更改
内联
并排
Showing
22 changed file
with
96 addition
and
112 deletion
+96
-112
arch/arm/dts/Makefile
arch/arm/dts/Makefile
+1
-1
arch/arm/dts/rk3288-tinker.dts
arch/arm/dts/rk3288-tinker.dts
+58
-0
arch/arm/dts/rk3288-tinker.dtsi
arch/arm/dts/rk3288-tinker.dtsi
+0
-0
arch/arm/mach-rockchip/rk3288-board.c
arch/arm/mach-rockchip/rk3288-board.c
+1
-1
arch/arm/mach-rockchip/rk3288/Kconfig
arch/arm/mach-rockchip/rk3288/Kconfig
+5
-5
board/google/veyron/MAINTAINERS
board/google/veyron/MAINTAINERS
+2
-2
board/rockchip/miniarm_rk3288/MAINTAINERS
board/rockchip/miniarm_rk3288/MAINTAINERS
+0
-6
board/rockchip/tinker_rk3288/Kconfig
board/rockchip/tinker_rk3288/Kconfig
+3
-3
board/rockchip/tinker_rk3288/MAINTAINERS
board/rockchip/tinker_rk3288/MAINTAINERS
+6
-0
board/rockchip/tinker_rk3288/Makefile
board/rockchip/tinker_rk3288/Makefile
+1
-1
board/rockchip/tinker_rk3288/tinker-rk3288.c
board/rockchip/tinker_rk3288/tinker-rk3288.c
+0
-0
configs/firefly-rk3288_defconfig
configs/firefly-rk3288_defconfig
+2
-1
configs/tinker-rk3288_defconfig
configs/tinker-rk3288_defconfig
+2
-2
doc/README.rockchip
doc/README.rockchip
+1
-1
include/configs/evb_rk3288.h
include/configs/evb_rk3288.h
+0
-14
include/configs/fennec_rk3288.h
include/configs/fennec_rk3288.h
+0
-14
include/configs/firefly-rk3288.h
include/configs/firefly-rk3288.h
+0
-5
include/configs/kylin_rk3036.h
include/configs/kylin_rk3036.h
+0
-14
include/configs/popmetal_rk3288.h
include/configs/popmetal_rk3288.h
+0
-14
include/configs/rock2.h
include/configs/rock2.h
+0
-14
include/configs/rockchip-common.h
include/configs/rockchip-common.h
+14
-0
include/configs/tinker_rk3288.h
include/configs/tinker_rk3288.h
+0
-14
未找到文件。
arch/arm/dts/Makefile
浏览文件 @
b16f6804
...
...
@@ -36,7 +36,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
rk3288-rock2-square.dtb
\
rk3288-evb.dtb
\
rk3288-fennec.dtb
\
rk3288-
miniarm
.dtb
\
rk3288-
tinker
.dtb
\
rk3288-popmetal.dtb
\
rk3399-evb.dtb
dtb-$(CONFIG_ARCH_MESON)
+=
\
...
...
arch/arm/dts/rk3288-
miniarm
.dts
→
arch/arm/dts/rk3288-
tinker
.dts
浏览文件 @
b16f6804
...
...
@@ -5,11 +5,11 @@
*/
/
dts
-
v1
/;
#
include
"rk3288-
miniarm
.dtsi"
#
include
"rk3288-
tinker
.dtsi"
/
{
model
=
"
Miniarm
-RK3288"
;
compatible
=
"rockchip,rk3288-
miniarm
"
,
"rockchip,rk3288"
;
model
=
"
Tinker
-RK3288"
;
compatible
=
"rockchip,rk3288-
tinker
"
,
"rockchip,rk3288"
;
chosen
{
stdout
-
path
=
&
uart2
;
...
...
@@ -17,14 +17,14 @@
};
&
dmc
{
rockchip
,
pctl
-
timing
=
<
0x2
9a
0xc8
0x1f8
0x42
0x4e
0x4
0xea
0xa
0x
5
0x0
0xa
0x7
0x19
0x24
0xa
0x7
0x
5
0xa
0x5
0x200
0x5
0x10
0x4
0
0x0
0x1
0x
7
0x7
0x4
0xc
0x43
0x100
0x0
0x
5
0x0
>;
rockchip
,
phy
-
timing
=
<
0x48
f9aab4
0xea0910
0x1002c200
0x
a60
0x40
0x10
0x0
>;
rockchip
,
sdram
-
params
=
<
0x
30B25564
0x627
3
666000000
3
9
1
>;
rockchip
,
pctl
-
timing
=
<
0x2
15
0xc8
0x0
0x35
0x26
0x2
0x70
0x2000d
0x
6
0x0
0x8
0x4
0x17
0x24
0xd
0x6
0x
4
0x8
0x4
0x76
0x4
0x0
0x3
0
0x0
0x1
0x
2
0x2
0x4
0x0
0x0
0xc0
0x4
0x
8
0x1f4
>;
rockchip
,
phy
-
timing
=
<
0x48
d7dd93
0x187008d8
0x121076
0x
0
0xc3
0x6
0x2
>;
rockchip
,
sdram
-
params
=
<
0x
20d266a4
0x5b6
2
533000000
6
9
0
>;
};
...
...
arch/arm/dts/rk3288-
miniarm
.dtsi
→
arch/arm/dts/rk3288-
tinker
.dtsi
浏览文件 @
b16f6804
文件已移动
arch/arm/mach-rockchip/rk3288-board.c
浏览文件 @
b16f6804
...
...
@@ -60,7 +60,7 @@ int rk3288_qos_init(void)
writel
(
val
,
CPU_AXI_QOS_PRIORITY
+
VIO1_VOP_QOS
);
if
(
!
fdt_node_check_compatible
(
gd
->
fdt_blob
,
0
,
"rockchip,rk3288-
miniarm
"
))
"rockchip,rk3288-
tinker
"
))
{
/* set isp qos to higher priority */
writel
(
val
,
CPU_AXI_QOS_PRIORITY
+
VIO1_ISP_R_QOS
);
...
...
arch/arm/mach-rockchip/rk3288/Kconfig
浏览文件 @
b16f6804
...
...
@@ -37,11 +37,11 @@ config TARGET_POPMETAL_RK3288
2GB DDR3. Expansion connectors provide access to I2C, SPI, UART,
GPIOs and display interface.
config TARGET_
MINIARM
_RK3288
bool "
miniarm
-RK3288"
select BOARD_LATE_INIT
config TARGET_
TINKER
_RK3288
bool "
Tinker
-RK3288"
select BOARD_LATE_INIT
help
Miniarm
is a RK3288-based development board with 2 USB ports, HDMI,
Tinker
is a RK3288-based development board with 2 USB ports, HDMI,
micro-SD card, audio, Gigabit Ethernet. It also includes on-board
8GB eMMC and 2GB of SDRAM. Expansion connectors provide access to
I2C, SPI, UART, GPIOs.
...
...
@@ -124,6 +124,6 @@ source "board/rockchip/evb_rk3288/Kconfig"
source "board/rockchip/fennec_rk3288/Kconfig"
source "board/rockchip/
miniarm
_rk3288/Kconfig"
source "board/rockchip/
tinker
_rk3288/Kconfig"
endif
board/google/veyron/MAINTAINERS
浏览文件 @
b16f6804
...
...
@@ -12,9 +12,9 @@ F: board/google/veyron/
F: include/configs/veyron.h
F: configs/chromebit_mickey_defconfig
CHROMEB
IT
MINNIE BOARD
CHROMEB
OOK
MINNIE BOARD
M: Simon Glass <sjg@chromium.org>
S: Maintained
F: board/google/veyron/
F: include/configs/veyron.h
F: configs/chromeb
it
_minnie_defconfig
F: configs/chromeb
ook
_minnie_defconfig
board/rockchip/miniarm_rk3288/MAINTAINERS
已删除
100644 → 0
浏览文件 @
f1cc9776
MINIARM-RK3288
M: Lin Huang <hl@rock-chips.com>
S: Maintained
F: board/rockchip/miniarm_rk3288
F: include/configs/miniarm_rk3288.h
F: configs/miniarm-rk3288_defconfig
board/rockchip/
miniarm
_rk3288/Kconfig
→
board/rockchip/
tinker
_rk3288/Kconfig
浏览文件 @
b16f6804
if TARGET_
MINIARM
_RK3288
if TARGET_
TINKER
_RK3288
config SYS_BOARD
default "
miniarm
_rk3288"
default "
tinker
_rk3288"
config SYS_VENDOR
default "rockchip"
config SYS_CONFIG_NAME
default "
miniarm
_rk3288"
default "
tinker
_rk3288"
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
...
...
board/rockchip/tinker_rk3288/MAINTAINERS
0 → 100644
浏览文件 @
b16f6804
TINKER-RK3288
M: Lin Huang <hl@rock-chips.com>
S: Maintained
F: board/rockchip/tinker_rk3288
F: include/configs/tinker_rk3288.h
F: configs/tinker-rk3288_defconfig
board/rockchip/
miniarm
_rk3288/Makefile
→
board/rockchip/
tinker
_rk3288/Makefile
浏览文件 @
b16f6804
...
...
@@ -4,4 +4,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
obj-y
+=
miniarm
-rk3288.o
obj-y
+=
tinker
-rk3288.o
board/rockchip/
miniarm_rk3288/miniarm
-rk3288.c
→
board/rockchip/
tinker_rk3288/tinker
-rk3288.c
浏览文件 @
b16f6804
文件已移动
configs/firefly-rk3288_defconfig
浏览文件 @
b16f6804
...
...
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ROCKCHIP_RK3288=y
CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
CONFIG_TARGET_FIREFLY_RK3288=y
CONFIG_SPL_STACK_R_ADDR=0x80000
CONFIG_DEFAULT_DEVICE_TREE="rk3288-firefly"
...
...
@@ -28,6 +29,7 @@ CONFIG_SPL_PARTITION_UUIDS=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
CONFIG_SPL_OF_PLATDATA=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_REGMAP=y
CONFIG_SPL_REGMAP=y
CONFIG_SYSCON=y
...
...
@@ -70,4 +72,3 @@ CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
# CONFIG_SPL_OF_LIBFDT is not set
configs/
miniarm
-rk3288_defconfig
→
configs/
tinker
-rk3288_defconfig
浏览文件 @
b16f6804
...
...
@@ -3,9 +3,9 @@ CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ROCKCHIP_RK3288=y
CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
CONFIG_TARGET_
MINIARM
_RK3288=y
CONFIG_TARGET_
TINKER
_RK3288=y
CONFIG_SPL_STACK_R_ADDR=0x80000
CONFIG_DEFAULT_DEVICE_TREE="rk3288-
miniarm
"
CONFIG_DEFAULT_DEVICE_TREE="rk3288-
tinker
"
CONFIG_SILENT_CONSOLE=y
CONFIG_CONSOLE_MUX=y
# CONFIG_DISPLAY_CPUINFO is not set
...
...
doc/README.rockchip
浏览文件 @
b16f6804
...
...
@@ -42,7 +42,7 @@ At present seven RK3288 boards are supported:
- Fennec RK3288 - use fennec-rk3288 configuration
- Firefly RK3288 - use firefly-rk3288 configuration
- Hisense Chromebook - use chromebook_jerry configuration
-
Miniarm RK3288 - use miniarm
-rk3288 configuration
-
Tinker RK3288 - use tinker
-rk3288 configuration
- PopMetal RK3288 - use popmetal-rk3288 configuration
- Radxa Rock 2 - use rock2 configuration
...
...
include/configs/evb_rk3288.h
浏览文件 @
b16f6804
...
...
@@ -13,20 +13,6 @@
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 1
#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
/* SPL @ 32k for 34k
* u-boot directly after @ 68k for 400k or so
* ENV @ 992k
*/
#define CONFIG_ENV_OFFSET ((1024-32) * 1024)
#else
/* SPL @ 32k for ~36k
* ENV @ 96k
* u-boot @ 128K
*/
#define CONFIG_ENV_OFFSET (96 * 1024)
#endif
#define CONFIG_SYS_WHITE_ON_BLACK
#endif
include/configs/fennec_rk3288.h
浏览文件 @
b16f6804
...
...
@@ -13,20 +13,6 @@
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 1
#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
/* SPL @ 32k for 34k
* u-boot directly after @ 68k for 400k or so
* ENV @ 992k
*/
#define CONFIG_ENV_OFFSET ((1024-32) * 1024)
#else
/* SPL @ 32k for ~36k
* ENV @ 96k
* u-boot @ 128K
*/
#define CONFIG_ENV_OFFSET (96 * 1024)
#endif
#define CONFIG_SYS_WHITE_ON_BLACK
#endif
include/configs/firefly-rk3288.h
浏览文件 @
b16f6804
...
...
@@ -16,11 +16,6 @@
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
/* SPL @ 32k for ~36k
* ENV @ 96k
* u-boot @ 128K
*/
#define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_SYS_WHITE_ON_BLACK
...
...
include/configs/kylin_rk3036.h
浏览文件 @
b16f6804
...
...
@@ -20,20 +20,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
/* emmc */
#define CONFIG_SYS_MMC_ENV_PART 0
/* user area */
#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
/* SPL @ 32k for 34k
* u-boot directly after @ 68k for 400k or so
* ENV @ 992k
*/
#define CONFIG_ENV_OFFSET ((1024-32) * 1024)
#else
/* SPL @ 32k for ~36k
* ENV @ 96k
* u-boot @ 128K
*/
#define CONFIG_ENV_OFFSET (96 * 1024)
#endif
#endif
#endif
include/configs/popmetal_rk3288.h
浏览文件 @
b16f6804
...
...
@@ -13,20 +13,6 @@
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 1
#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
/* SPL @ 32k for 34k
* u-boot directly after @ 68k for 400k or so
* ENV @ 992k
*/
#define CONFIG_ENV_OFFSET ((1024-32) * 1024)
#else
/* SPL @ 32k for ~36k
* ENV @ 96k
* u-boot @ 128K
*/
#define CONFIG_ENV_OFFSET (96 * 1024)
#endif
#define CONFIG_SYS_WHITE_ON_BLACK
#endif
include/configs/rock2.h
浏览文件 @
b16f6804
...
...
@@ -17,20 +17,6 @@
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
/* SPL @ 32k for 34k
* u-boot directly after @ 68k for 400k or so
* ENV @ 992k
*/
#define CONFIG_ENV_OFFSET ((1024-32) * 1024)
#else
/* SPL @ 32k for ~36k
* ENV @ 96k
* u-boot @ 128K
*/
#define CONFIG_ENV_OFFSET (96 * 1024)
#endif
#define CONFIG_SYS_WHITE_ON_BLACK
#endif
include/configs/rockchip-common.h
浏览文件 @
b16f6804
...
...
@@ -31,4 +31,18 @@
#endif
#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
/* SPL @ 32k for 34k
* u-boot directly after @ 68k for 400k or so
* ENV @ 992k
*/
#define CONFIG_ENV_OFFSET ((1024-32) * 1024)
#else
/* SPL @ 32k for ~36k
* ENV @ 96k
* u-boot @ 128K
*/
#define CONFIG_ENV_OFFSET (96 * 1024)
#endif
#endif
/* _ROCKCHIP_COMMON_H_ */
include/configs/
miniarm
_rk3288.h
→
include/configs/
tinker
_rk3288.h
浏览文件 @
b16f6804
...
...
@@ -18,20 +18,6 @@
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
/* SPL @ 32k for 34k
* u-boot directly after @ 68k for 400k or so
* ENV @ 992k
*/
#define CONFIG_ENV_OFFSET ((1024-32) * 1024)
#else
/* SPL @ 32k for ~36k
* ENV @ 96k
* u-boot @ 128K
*/
#define CONFIG_ENV_OFFSET (96 * 1024)
#endif
#define CONFIG_SYS_WHITE_ON_BLACK
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录