mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
arm, am335x: siemens boards add FIT support
add FIT support and set "boardid" from factoryset records "DEV/id" and "COMP/ver". "boardid" is used for selecting which fit configuration gets booted on the board. Signed-off-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
parent
4ac32b9c4d
commit
0c331ebcc6
8 changed files with 83 additions and 19 deletions
|
@ -96,15 +96,6 @@ const struct dpll_params *get_dpll_ddr_params(void)
|
|||
return &dpll_ddr;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_BOARD_LATE_INIT
|
||||
int board_late_init(void)
|
||||
{
|
||||
omap_nand_switch_ecc(1, 8);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#if defined(BOARD_DFU_BUTTON_GPIO)
|
||||
/*
|
||||
|
|
|
@ -220,15 +220,6 @@ int factoryset_read_eeprom(int i2c_addr)
|
|||
printf("DFU USB: VID = 0x%4x, PID = 0x%4x\n", factory_dat.usb_vendor_id,
|
||||
factory_dat.usb_product_id);
|
||||
#endif
|
||||
if (0 <= get_factory_record_val(cp, size, (uchar *)"DEV",
|
||||
(uchar *)"id", buf,
|
||||
MAX_STRING_LENGTH)) {
|
||||
if (strncmp((const char *)buf, "PXM50", 5) == 0)
|
||||
factory_dat.pxm50 = 1;
|
||||
else
|
||||
factory_dat.pxm50 = 0;
|
||||
}
|
||||
debug("PXM50: %d\n", factory_dat.pxm50);
|
||||
#if defined(CONFIG_VIDEO)
|
||||
if (0 <= get_factory_record_val(cp, size, (uchar *)"DISP1",
|
||||
(uchar *)"name", factory_dat.disp_name,
|
||||
|
@ -248,7 +239,14 @@ int factoryset_read_eeprom(int i2c_addr)
|
|||
NULL, 16);
|
||||
debug("version number: %d\n", factory_dat.version);
|
||||
}
|
||||
|
||||
/* Get ASN from factory set if available */
|
||||
if (0 <= get_factory_record_val(cp, size, (uchar *)"DEV",
|
||||
(uchar *)"id", factory_dat.asn,
|
||||
MAX_STRING_LENGTH)) {
|
||||
debug("factoryset asn: %s\n", factory_dat.asn);
|
||||
} else {
|
||||
factory_dat.asn[0] = 0;
|
||||
}
|
||||
/* Get COMP/ver from factory set if available */
|
||||
if (0 <= get_factory_record_val(cp, size, (uchar *)"COMP",
|
||||
(uchar *)"ver",
|
||||
|
|
|
@ -20,6 +20,7 @@ struct factorysetcontainer {
|
|||
#endif
|
||||
unsigned char serial[MAX_STRING_LENGTH];
|
||||
int version;
|
||||
uchar asn[MAX_STRING_LENGTH];
|
||||
uchar comp_version[MAX_STRING_LENGTH];
|
||||
};
|
||||
|
||||
|
|
|
@ -280,4 +280,13 @@ U_BOOT_CMD(
|
|||
#endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */
|
||||
#endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */
|
||||
|
||||
#ifdef CONFIG_BOARD_LATE_INIT
|
||||
int board_late_init(void)
|
||||
{
|
||||
omap_nand_switch_ecc(1, 8);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#include "../common/board.c"
|
||||
|
|
|
@ -428,4 +428,38 @@ static int board_video_init(void)
|
|||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BOARD_LATE_INIT
|
||||
int board_late_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
omap_nand_switch_ecc(1, 8);
|
||||
|
||||
#ifdef CONFIG_FACTORYSET
|
||||
if (factory_dat.asn[0] != 0) {
|
||||
char tmp[2 * MAX_STRING_LENGTH + 2];
|
||||
|
||||
if (strncmp((const char *)factory_dat.asn, "PXM50", 5) == 0)
|
||||
factory_dat.pxm50 = 1;
|
||||
else
|
||||
factory_dat.pxm50 = 0;
|
||||
sprintf(tmp, "%s_%s", factory_dat.asn,
|
||||
factory_dat.comp_version);
|
||||
ret = setenv("boardid", tmp);
|
||||
if (ret)
|
||||
printf("error setting board id\n");
|
||||
} else {
|
||||
factory_dat.pxm50 = 1;
|
||||
ret = setenv("boardid", "PXM50_1.0");
|
||||
if (ret)
|
||||
printf("error setting board id\n");
|
||||
}
|
||||
debug("PXM50: %d\n", factory_dat.pxm50);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#include "../common/board.c"
|
||||
|
|
|
@ -467,4 +467,27 @@ static int board_video_init(void)
|
|||
return 0;
|
||||
}
|
||||
#endif /* ifdef CONFIG_VIDEO */
|
||||
|
||||
#ifdef CONFIG_BOARD_LATE_INIT
|
||||
int board_late_init(void)
|
||||
{
|
||||
int ret;
|
||||
char tmp[2 * MAX_STRING_LENGTH + 2];
|
||||
|
||||
omap_nand_switch_ecc(1, 8);
|
||||
|
||||
if (factory_dat.asn[0] != 0)
|
||||
sprintf(tmp, "%s_%s", factory_dat.asn,
|
||||
factory_dat.comp_version);
|
||||
else
|
||||
sprintf(tmp, "QMX7.E38_4.0");
|
||||
|
||||
ret = setenv("boardid", tmp);
|
||||
if (ret)
|
||||
printf("error setting board id\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#include "../common/board.c"
|
||||
|
|
|
@ -150,4 +150,8 @@
|
|||
#define CONFIG_SYS_CONSOLE_FG_COL 0x00
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_FIT
|
||||
#endif
|
||||
|
||||
#endif /* ! __CONFIG_PXM2_H */
|
||||
|
|
|
@ -154,4 +154,8 @@
|
|||
#define CONFIG_SYS_CONSOLE_FG_COL 0x00
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_FIT
|
||||
#endif
|
||||
|
||||
#endif /* ! __CONFIG_RUT_H */
|
||||
|
|
Loading…
Reference in a new issue