brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-30 08:30:50 +09:00
Code Issues Projects Releases Wiki Activity

x86: ivybridge: Rename bd82x6x_init()

Browse Source 
Rename the existing bd82x6x_init() to bd82x6x_init_extra(). We will remove
this in a later patch.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2016-01-17 16:11:13 -07:00 committed by Bin Meng
parent fe40bd4d8f
commit 858361b174
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/cpu/ivybridge/bd82x6x.c
View File

@ -102,7 +102,7 @@ static int bd82x6x_probe(struct udevice *dev)
}
/* TODO(sjg@chromium.org): Move this to the PCH init() method */
int bd82x6x_init(void)
int bd82x6x_init_extra(void)
{
const void *blob = gd->fdt_blob;
int sata_node;

8
arch/x86/cpu/ivybridge/cpu.c
View File

@ -15,6 +15,7 @@
#include <dm.h>
#include <errno.h>
#include <fdtdec.h>
#include <pch.h>
#include <asm/cpu.h>
#include <asm/io.h>
#include <asm/lapic.h>
@ -211,6 +212,7 @@ int print_cpuinfo(void)
{
enum pei_boot_mode_t boot_mode = PEI_BOOT_NONE;
char processor_name[CPU_MAX_NAME_LEN];
struct udevice *dev;
const char *name;
uint32_t pm1_cnt;
uint16_t pm1_sts;
@ -241,6 +243,12 @@ int print_cpuinfo(void)
}
/* Early chipset init required before RAM init can work */
ret = uclass_first_device(UCLASS_PCH, &dev);
if (ret)
return ret;
if (!dev)
return -ENODEV;
sandybridge_early_init(SANDYBRIDGE_MOBILE);
/* Check PM1_STS[15] to see if we are waking from Sx */

2
arch/x86/cpu/ivybridge/pci.c
View File

@ -26,7 +26,7 @@ static int pci_ivybridge_probe(struct udevice *bus)
if (!(gd->flags & GD_FLG_RELOC))
return 0;
post_code(0x50);
bd82x6x_init();
bd82x6x_init_extra();
post_code(0x51);
reg16 = 0xff;

2
arch/x86/include/asm/arch-ivybridge/bd82x6x.h
View File

@ -13,7 +13,7 @@ void bd82x6x_pci_init(pci_dev_t dev);
void bd82x6x_usb_ehci_init(pci_dev_t dev);
void bd82x6x_usb_xhci_init(pci_dev_t dev);
int gma_func0_init(struct udevice *dev, const void *blob, int node);
int bd82x6x_init(void);
int bd82x6x_init_extra(void);
/**
* struct x86_cpu_priv - Information about a single CPU