leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-x86

Browse Source
This commit is contained in:
Tom Rini 2017-04-18 10:31:46 -04:00
commit 9481f186d0
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/cpu/cpu_x86.c
View File

@ -41,10 +41,14 @@ int cpu_x86_get_vendor(struct udevice *dev, char *buf, int size)
int cpu_x86_get_desc(struct udevice *dev, char *buf, int size) int cpu_x86_get_desc(struct udevice *dev, char *buf, int size)
{ {
char *ptr;
if (size < CPU_MAX_NAME_LEN) if (size < CPU_MAX_NAME_LEN)
return -ENOSPC; return -ENOSPC;
cpu_get_name(buf); ptr = cpu_get_name(buf);
if (ptr != buf)
strcpy(buf, ptr);
return 0; return 0;
} }

3
arch/x86/lib/spl.c
View File

@ -37,8 +37,6 @@ static int x86_spl_init(void)
debug("%s: spl_init() failed\n", __func__); debug("%s: spl_init() failed\n", __func__);
return ret; return ret;
} }
preloader_console_init();
ret = arch_cpu_init(); ret = arch_cpu_init();
if (ret) { if (ret) {
debug("%s: arch_cpu_init() failed\n", __func__); debug("%s: arch_cpu_init() failed\n", __func__);
@ -49,6 +47,7 @@ static int x86_spl_init(void)
debug("%s: arch_cpu_init_dm() failed\n", __func__); debug("%s: arch_cpu_init_dm() failed\n", __func__);
return ret; return ret;
} }
preloader_console_init();
ret = print_cpuinfo(); ret = print_cpuinfo();
if (ret) { if (ret) {
debug("%s: print_cpuinfo() failed\n", __func__); debug("%s: print_cpuinfo() failed\n", __func__);

1
configs/chromebook_link64_defconfig
View File

@ -86,4 +86,5 @@ CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
CONFIG_VIDEO_IVYBRIDGE_IGD=y CONFIG_VIDEO_IVYBRIDGE_IGD=y
CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_TPM=y CONFIG_TPM=y

1
configs/chromebook_link_defconfig
View File

@ -69,4 +69,5 @@ CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
CONFIG_VIDEO_IVYBRIDGE_IGD=y CONFIG_VIDEO_IVYBRIDGE_IGD=y
CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_TPM=y CONFIG_TPM=y