Skip to content

pistachio: don't fail boot due to TPM missing #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikhil-zinjurde-imgtec merged 1 commit into from
Jan 2, 2017
Merged

pistachio: don't fail boot due to TPM missing #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions board/imgtec/pistachio_bub/pistachio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,23 @@
*/

#include <common.h>
#include <dm.h>
#include <dwmmc.h>
#include <fdtdec.h>
#include <miiphy.h>
#include <malloc.h>
#include <netdev.h>
#include <serial.h>
#include <watchdog.h>
#include <winbond-otp.h>
#include <tpm.h>

#include <asm/addrspace.h>
#include <asm/io.h>
#include <asm/mmu.h>
#include <asm/mipsregs.h>
#include <asm/pistachio.h>
#include <asm-generic/sections.h>
#include <watchdog.h>
#include <tpm.h>
#include <winbond-otp.h>
#include "mfio.h"
#include "otp.h"

Expand Down Expand Up @@ -197,17 +198,30 @@ int board_early_init_f(void)
int board_late_init(void)
{
#ifdef CONFIG_TPM
struct udevice *dev;
char buf[80];
int err;
uint32_t result;

/* reset the tpm */
mfio_setup_tpm();
udelay(10000);
tpm_init();

/* If a TPM can be found then initialise and start it */
puts("TPM: ");
err = tpm_init();
if (err < 0) {
puts("none\n");
return 0;
}
uclass_first_device(UCLASS_TPM, &dev);
tpm_get_desc(dev, buf, sizeof(buf));
printf("%s\n", buf);
result = tpm_startup(TPM_ST_CLEAR);
if (result != 0) {
printf("tpm startup failed with 0x%x\n", result);
return 1;
if (result) {
printf("WARNING: failed to startup TPM (%d)\n", result);
return 0;
}
printf("TPM: Infineon (1.2)\n");
#endif
return 0;
}
Expand Down