Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
f1554b28
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,发现更多精彩内容 >>
提交
f1554b28
编写于
1月 30, 2018
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.denx.de/u-boot-x86
上级
eef11ace
e21b04fe
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
48 addition
and
17 deletion
+48
-17
arch/x86/cpu/quark/smc.c
arch/x86/cpu/quark/smc.c
+4
-9
arch/x86/include/asm/acpi_table.h
arch/x86/include/asm/acpi_table.h
+9
-0
arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
+1
-1
arch/x86/include/asm/bootparam.h
arch/x86/include/asm/bootparam.h
+1
-0
arch/x86/lib/acpi_table.c
arch/x86/lib/acpi_table.c
+10
-2
arch/x86/lib/zimage.c
arch/x86/lib/zimage.c
+11
-4
board/google/Kconfig
board/google/Kconfig
+0
-1
cmd/bdinfo.c
cmd/bdinfo.c
+2
-0
drivers/misc/qfw.c
drivers/misc/qfw.c
+8
-0
include/configs/x86-common.h
include/configs/x86-common.h
+2
-0
未找到文件。
arch/x86/cpu/quark/smc.c
浏览文件 @
f1554b28
...
...
@@ -17,15 +17,6 @@
#include "hte.h"
#include "smc.h"
/* t_rfc values (in picoseconds) per density */
static
const
uint32_t
t_rfc
[
5
]
=
{
90000
,
/* 512Mb */
110000
,
/* 1Gb */
160000
,
/* 2Gb */
300000
,
/* 4Gb */
350000
,
/* 8Gb */
};
/* t_ck clock period in picoseconds per speed index 800, 1066, 1333 */
static
const
uint32_t
t_ck
[
3
]
=
{
2500
,
...
...
@@ -35,8 +26,12 @@ static const uint32_t t_ck[3] = {
/* Global variables */
static
const
uint16_t
ddr_wclk
[]
=
{
193
,
158
};
#ifdef BACKUP_WCTL
static
const
uint16_t
ddr_wctl
[]
=
{
1
,
217
};
#endif
#ifdef BACKUP_WCMD
static
const
uint16_t
ddr_wcmd
[]
=
{
1
,
220
};
#endif
#ifdef BACKUP_RCVN
static
const
uint16_t
ddr_rcvn
[]
=
{
129
,
498
};
...
...
arch/x86/include/asm/acpi_table.h
浏览文件 @
f1554b28
...
...
@@ -329,6 +329,15 @@ void acpi_create_gnvs(struct acpi_global_nvs *gnvs);
void
enter_acpi_mode
(
int
pm1_cnt
);
ulong
write_acpi_tables
(
ulong
start
);
/**
* acpi_get_rsdp_addr() - get ACPI RSDP table address
*
* This routine returns the ACPI RSDP table address in the system memory.
*
* @return: ACPI RSDP table address
*/
ulong
acpi_get_rsdp_addr
(
void
);
/**
* acpi_find_fadt() - find ACPI FADT table in the sytem memory
*
...
...
arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
浏览文件 @
f1554b28
...
...
@@ -284,7 +284,7 @@ Device (PCI0)
Return (STA_VISIBLE)
}
Method (_CRS, 0,
Not
Serialized)
Method (_CRS, 0, Serialized)
{
Name (RBUF, ResourceTemplate ()
{
...
...
arch/x86/include/asm/bootparam.h
浏览文件 @
f1554b28
...
...
@@ -66,6 +66,7 @@ struct setup_header {
__u64
pref_address
;
__u32
init_size
;
__u32
handover_offset
;
__u64
acpi_rsdp_addr
;
}
__attribute__
((
packed
));
struct
sys_desc_table
{
...
...
arch/x86/lib/acpi_table.c
浏览文件 @
f1554b28
...
...
@@ -27,6 +27,9 @@
*/
extern
const
unsigned
char
AmlCode
[];
/* ACPI RSDP address to be used in boot parameters */
static
ulong
acpi_rsdp_addr
;
static
void
acpi_write_rsdp
(
struct
acpi_rsdp
*
rsdp
,
struct
acpi_rsdt
*
rsdt
,
struct
acpi_xsdt
*
xsdt
)
{
...
...
@@ -357,8 +360,7 @@ void enter_acpi_mode(int pm1_cnt)
}
/*
* QEMU's version of write_acpi_tables is defined in
* arch/x86/cpu/qemu/acpi_table.c
* QEMU's version of write_acpi_tables is defined in drivers/misc/qfw.c
*/
ulong
write_acpi_tables
(
ulong
start
)
{
...
...
@@ -461,6 +463,7 @@ ulong write_acpi_tables(ulong start)
debug
(
"current = %x
\n
"
,
current
);
acpi_rsdp_addr
=
(
unsigned
long
)
rsdp
;
debug
(
"ACPI: done
\n
"
);
/* Don't touch ACPI hardware on HW reduced platforms */
...
...
@@ -476,6 +479,11 @@ ulong write_acpi_tables(ulong start)
return
current
;
}
ulong
acpi_get_rsdp_addr
(
void
)
{
return
acpi_rsdp_addr
;
}
static
struct
acpi_rsdp
*
acpi_valid_rsdp
(
struct
acpi_rsdp
*
rsdp
)
{
if
(
strncmp
((
char
*
)
rsdp
,
RSDP_SIG
,
sizeof
(
RSDP_SIG
)
-
1
)
!=
0
)
...
...
arch/x86/lib/zimage.c
浏览文件 @
f1554b28
...
...
@@ -14,6 +14,7 @@
*/
#include <common.h>
#include <asm/acpi_table.h>
#include <asm/io.h>
#include <asm/ptrace.h>
#include <asm/zimage.h>
...
...
@@ -246,14 +247,20 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
hdr
->
setup_move_size
=
0x9100
;
}
#if defined(CONFIG_INTEL_MID)
hdr
->
hardware_subarch
=
X86_SUBARCH_INTEL_MID
;
#endif
/* build command line at COMMAND_LINE_OFFSET */
build_command_line
(
cmd_line
,
auto_boot
);
}
#ifdef CONFIG_INTEL_MID
if
(
bootproto
>=
0x0207
)
hdr
->
hardware_subarch
=
X86_SUBARCH_INTEL_MID
;
#endif
#ifdef CONFIG_GENERATE_ACPI_TABLE
if
(
bootproto
>=
0x020e
)
hdr
->
acpi_rsdp_addr
=
acpi_get_rsdp_addr
();
#endif
setup_video
(
&
setup_base
->
screen_info
);
return
0
;
...
...
board/google/Kconfig
浏览文件 @
f1554b28
...
...
@@ -31,7 +31,6 @@ config TARGET_CHROMEBOOK_LINK64
config TARGET_CHROMEBOX_PANTHER
bool "Chromebox panther (not available)"
select n
help
Note: At present this must be used with coreboot. See README.x86
for instructions.
...
...
cmd/bdinfo.c
浏览文件 @
f1554b28
...
...
@@ -377,6 +377,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_bi_dram
(
bd
);
print_num
(
"relocaddr"
,
gd
->
relocaddr
);
print_num
(
"reloc off"
,
gd
->
reloc_off
);
#if defined(CONFIG_CMD_NET)
print_eth_ip_addr
();
print_mhz
(
"ethspeed"
,
bd
->
bi_ethspeed
);
...
...
drivers/misc/qfw.c
浏览文件 @
f1554b28
...
...
@@ -222,6 +222,14 @@ out:
free
(
table_loader
);
return
addr
;
}
ulong
acpi_get_rsdp_addr
(
void
)
{
struct
fw_file
*
file
;
file
=
qemu_fwcfg_find_file
(
"etc/acpi/rsdp"
);
return
file
->
addr
;
}
#endif
/* Read configuration item using fw_cfg PIO interface */
...
...
include/configs/x86-common.h
浏览文件 @
f1554b28
...
...
@@ -62,8 +62,10 @@
* Command line configuration.
*/
#ifndef CONFIG_BOOTCOMMAND
#define CONFIG_BOOTCOMMAND \
"ext2load scsi 0:3 01000000 /boot/vmlinuz; zboot 01000000"
#endif
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 115200
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录