Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
7967290f
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,发现更多精彩内容 >>
提交
7967290f
编写于
8月 31, 2019
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '2019-08-30-master-imports'
- Assorted bug fixes
上级
877294b5
47e8ee6b
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
34 addition
and
93 deletion
+34
-93
Makefile
Makefile
+2
-2
arch/arm/Kconfig
arch/arm/Kconfig
+0
-10
arch/arm/lib/cache.c
arch/arm/lib/cache.c
+1
-0
board/armltd/vexpress64/Kconfig
board/armltd/vexpress64/Kconfig
+1
-1
board/armltd/vexpress64/MAINTAINERS
board/armltd/vexpress64/MAINTAINERS
+0
-5
board/siemens/common/board.c
board/siemens/common/board.c
+1
-4
common/board_f.c
common/board_f.c
+12
-3
common/board_r.c
common/board_r.c
+4
-0
configs/am43xx_evm_qspiboot_defconfig
configs/am43xx_evm_qspiboot_defconfig
+1
-0
configs/am43xx_evm_rtconly_defconfig
configs/am43xx_evm_rtconly_defconfig
+1
-0
configs/am43xx_hs_evm_defconfig
configs/am43xx_hs_evm_defconfig
+1
-0
configs/mt7623n_bpir2_defconfig
configs/mt7623n_bpir2_defconfig
+0
-1
configs/vexpress_aemv8a_dram_defconfig
configs/vexpress_aemv8a_dram_defconfig
+0
-39
drivers/block/blk-uclass.c
drivers/block/blk-uclass.c
+2
-12
drivers/mmc/mmc-uclass.c
drivers/mmc/mmc-uclass.c
+6
-1
include/configs/vexpress_aemv8a.h
include/configs/vexpress_aemv8a.h
+2
-15
未找到文件。
Makefile
浏览文件 @
7967290f
...
...
@@ -1700,7 +1700,7 @@ define filechk_defaultenv.h
(grep
-v
'^#'
|
\
grep
-v
'^$$'
|
\
tr
'\n'
'\0'
|
\
sed
-e
's/\\\x0/\n/'
|
\
sed
-e
's/\\\x0/\n/
g
'
|
\
xxd
-i
;
echo
", 0x00"
;
)
endef
...
...
@@ -1852,7 +1852,7 @@ clean: $(clean-dirs)
-o
-name
'dsdt.aml'
-o
-name
'dsdt.asl.tmp'
-o
-name
'dsdt.c'
\
-o
-name
'*.efi'
-o
-name
'*.gcno'
-o
-name
'*.so'
\)
\
-type
f
-print
| xargs
rm
-f
\
bl31.c bl31.elf bl31_
*
.bin image.map
bl31.c bl31.elf bl31_
*
.bin image.map
tispl.bin
*
# mrproper - Delete all generated files, including .config
#
...
...
arch/arm/Kconfig
浏览文件 @
7967290f
...
...
@@ -1066,16 +1066,6 @@ config TARGET_VEXPRESS64_BASE_FVP
select PL01X_SERIAL
select SEMIHOSTING
config TARGET_VEXPRESS64_BASE_FVP_DRAM
bool "Support Versatile Express ARMv8a FVP BASE model booting from DRAM"
select ARM64
select PL01X_SERIAL
help
This target is derived from TARGET_VEXPRESS64_BASE_FVP and over-rides
the default config to allow the user to load the images directly into
DRAM using model parameters rather than by using semi-hosting to load
the files from the host filesystem.
config TARGET_VEXPRESS64_JUNO
bool "Support Versatile Express Juno Development Platform"
select ARM64
...
...
arch/arm/lib/cache.c
浏览文件 @
7967290f
...
...
@@ -77,6 +77,7 @@ void noncached_init(void)
phys_addr_t
start
,
end
;
size_t
size
;
/* If this calculation changes, update board_f.c:reserve_noncached() */
end
=
ALIGN
(
mem_malloc_start
,
MMU_SECTION_SIZE
)
-
MMU_SECTION_SIZE
;
size
=
ALIGN
(
CONFIG_SYS_NONCACHED_MEMORY
,
MMU_SECTION_SIZE
);
start
=
end
-
size
;
...
...
board/armltd/vexpress64/Kconfig
浏览文件 @
7967290f
if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO
|| TARGET_VEXPRESS64_BASE_FVP_DRAM
if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO
config SYS_BOARD
default "vexpress64"
...
...
board/armltd/vexpress64/MAINTAINERS
浏览文件 @
7967290f
...
...
@@ -10,11 +10,6 @@ M: Linus Walleij <linus.walleij@linaro.org>
S: Maintained
F: configs/vexpress_aemv8a_semi_defconfig
VEXPRESS_AEMV8A_DRAM BOARD
M: Ryan Harkin <ryan.harkin@linaro.org>
S: Maintained
F: configs/vexpress_aemv8a_dram_defconfig
JUNO DEVELOPMENT PLATFORM BOARD
M: Linus Walleij <linus.walleij@linaro.org>
S: Maintained
...
...
board/siemens/common/board.c
浏览文件 @
7967290f
...
...
@@ -189,14 +189,11 @@ void set_env_gpios(unsigned char state)
{
char
*
ptr_env
;
char
str_tmp
[
5
];
/* must contain "ledX"*/
char
num
[
1
];
unsigned
char
i
,
idx
,
pos1
,
pos2
,
ccount
;
unsigned
char
gpio_n
,
gpio_s0
,
gpio_s1
;
for
(
i
=
0
;
i
<
MAX_NR_LEDS
;
i
++
)
{
strcpy
(
str_tmp
,
"led"
);
sprintf
(
num
,
"%d"
,
i
);
strcat
(
str_tmp
,
num
);
sprintf
(
str_tmp
,
"led%d"
,
i
);
/* If env var is not found we stop */
ptr_env
=
env_get
(
str_tmp
);
...
...
common/board_f.c
浏览文件 @
7967290f
...
...
@@ -470,9 +470,18 @@ static int reserve_uboot(void)
#ifdef CONFIG_SYS_NONCACHED_MEMORY
static
int
reserve_noncached
(
void
)
{
/* round down to SECTION SIZE (typicaly 1MB) limit */
gd
->
start_addr_sp
&=
~
(
MMU_SECTION_SIZE
-
1
);
gd
->
start_addr_sp
-=
CONFIG_SYS_NONCACHED_MEMORY
;
/*
* The value of gd->start_addr_sp must match the value of malloc_start
* calculated in boatrd_f.c:initr_malloc(), which is passed to
* board_r.c:mem_malloc_init() and then used by
* cache.c:noncached_init()
*
* These calculations must match the code in cache.c:noncached_init()
*/
gd
->
start_addr_sp
=
ALIGN
(
gd
->
start_addr_sp
,
MMU_SECTION_SIZE
)
-
MMU_SECTION_SIZE
;
gd
->
start_addr_sp
-=
ALIGN
(
CONFIG_SYS_NONCACHED_MEMORY
,
MMU_SECTION_SIZE
);
debug
(
"Reserving %dM for noncached_alloc() at: %08lx
\n
"
,
CONFIG_SYS_NONCACHED_MEMORY
>>
20
,
gd
->
start_addr_sp
);
...
...
common/board_r.c
浏览文件 @
7967290f
...
...
@@ -247,6 +247,10 @@ static int initr_malloc(void)
gd
->
malloc_ptr
/
1024
);
#endif
/* The malloc area is immediately below the monitor copy in DRAM */
/*
* This value MUST match the value of gd->start_addr_sp in board_f.c:
* reserve_noncached().
*/
malloc_start
=
gd
->
relocaddr
-
TOTAL_MALLOC_LEN
;
mem_malloc_init
((
ulong
)
map_sysmem
(
malloc_start
,
TOTAL_MALLOC_LEN
),
TOTAL_MALLOC_LEN
);
...
...
configs/am43xx_evm_qspiboot_defconfig
浏览文件 @
7967290f
...
...
@@ -50,6 +50,7 @@ CONFIG_SYS_NS16550=y
CONFIG_SPI=y
CONFIG_TI_QSPI=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
...
...
configs/am43xx_evm_rtconly_defconfig
浏览文件 @
7967290f
...
...
@@ -49,6 +49,7 @@ CONFIG_TI_QSPI=y
CONFIG_TIMER=y
CONFIG_OMAP_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
...
...
configs/am43xx_hs_evm_defconfig
浏览文件 @
7967290f
...
...
@@ -59,6 +59,7 @@ CONFIG_TI_QSPI=y
CONFIG_TIMER=y
CONFIG_OMAP_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
...
...
configs/mt7623n_bpir2_defconfig
浏览文件 @
7967290f
...
...
@@ -31,7 +31,6 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_REGMAP=y
CONFIG_SYSCON=y
# CONFIG_BLOCK_CACHE is not set
CONFIG_CLK=y
CONFIG_DM_MMC=y
# CONFIG_MMC_QUIRKS is not set
...
...
configs/vexpress_aemv8a_dram_defconfig
已删除
100644 → 0
浏览文件 @
877294b5
CONFIG_ARM=y
CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM=y
CONFIG_SYS_TEXT_BASE=0x88000000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_NR_DRAM_BANKS=1
CONFIG_IDENT_STRING=" vexpress_aemv8a"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=1
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda2 rw rootwait loglevel=9"
# CONFIG_USE_BOOTCOMMAND is not set
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="VExpress64# "
# CONFIG_CMD_CONSOLE is not set
# CONFIG_CMD_XIMG is not set
# CONFIG_CMD_EDITENV is not set
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_ARMFLASH=y
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_ITEST is not set
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set
CONFIG_CMD_CACHE=y
# CONFIG_CMD_MISC is not set
CONFIG_CMD_UBI=y
# CONFIG_ISO_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y
CONFIG_MTD_DEVICE=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
CONFIG_SYS_FLASH_PROTECTION=y
CONFIG_SYS_FLASH_CFI=y
CONFIG_DM_SERIAL=y
CONFIG_OF_LIBFDT=y
drivers/block/blk-uclass.c
浏览文件 @
7967290f
...
...
@@ -208,11 +208,7 @@ int blk_select_hwpart_devnum(enum if_type if_type, int devnum, int hwpart)
if
(
ret
)
return
ret
;
ret
=
blk_select_hwpart
(
dev
,
hwpart
);
if
(
!
ret
)
blkcache_invalidate
(
if_type
,
devnum
);
return
ret
;
return
blk_select_hwpart
(
dev
,
hwpart
);
}
int
blk_list_part
(
enum
if_type
if_type
)
...
...
@@ -352,13 +348,7 @@ int blk_select_hwpart(struct udevice *dev, int hwpart)
int
blk_dselect_hwpart
(
struct
blk_desc
*
desc
,
int
hwpart
)
{
int
ret
;
ret
=
blk_select_hwpart
(
desc
->
bdev
,
hwpart
);
if
(
!
ret
)
blkcache_invalidate
(
desc
->
if_type
,
desc
->
devnum
);
return
ret
;
return
blk_select_hwpart
(
desc
->
bdev
,
hwpart
);
}
int
blk_first_device
(
int
if_type
,
struct
udevice
**
devp
)
...
...
drivers/mmc/mmc-uclass.c
浏览文件 @
7967290f
...
...
@@ -360,6 +360,7 @@ static int mmc_select_hwpart(struct udevice *bdev, int hwpart)
struct
udevice
*
mmc_dev
=
dev_get_parent
(
bdev
);
struct
mmc
*
mmc
=
mmc_get_mmc_dev
(
mmc_dev
);
struct
blk_desc
*
desc
=
dev_get_uclass_platdata
(
bdev
);
int
ret
;
if
(
desc
->
hwpart
==
hwpart
)
return
0
;
...
...
@@ -367,7 +368,11 @@ static int mmc_select_hwpart(struct udevice *bdev, int hwpart)
if
(
mmc
->
part_config
==
MMCPART_NOAVAILABLE
)
return
-
EMEDIUMTYPE
;
return
mmc_switch_part
(
mmc
,
hwpart
);
ret
=
mmc_switch_part
(
mmc
,
hwpart
);
if
(
!
ret
)
blkcache_invalidate
(
desc
->
if_type
,
desc
->
devnum
);
return
ret
;
}
static
int
mmc_blk_probe
(
struct
udevice
*
dev
)
...
...
include/configs/vexpress_aemv8a.h
浏览文件 @
7967290f
...
...
@@ -16,8 +16,7 @@
#define CONFIG_REMAKE_ELF
/* Link Definitions */
#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM)
#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
/* ATF loads u-boot here for BASE_FVP model */
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000)
#elif CONFIG_TARGET_VEXPRESS64_JUNO
...
...
@@ -83,8 +82,7 @@
#define GICR_BASE (0x2f100000)
#else
#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM)
#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
#define GICD_BASE (0x2f000000)
#define GICC_BASE (0x2c000000)
#elif CONFIG_TARGET_VEXPRESS64_JUNO
...
...
@@ -191,17 +189,6 @@
"booti $kernel_addr - $fdt_addr"
#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM
#define CONFIG_EXTRA_ENV_SETTINGS \
"kernel_addr=0x80080000\0" \
"initrd_addr=0x84000000\0" \
"fdt_addr=0x83000000\0" \
"fdt_high=0xffffffffffffffff\0" \
"initrd_high=0xffffffffffffffff\0"
#define CONFIG_BOOTCOMMAND "booti $kernel_addr $initrd_addr $fdt_addr"
#endif
/* Monitor Command Prompt */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录