board/BuR/common: make CONFIG_LCD optional

Since we're going to drop LCD-support on brppt1 boards, we have to make
this stuff here optional and remove the #error path.

We also move out the ft_board_setup(...) from this #ifdef because
there's no relationship with the LCD-code and on the other hand this is
still needed in future even with LCD-support off.

Signed-off-by: Hannes Schmelzer <oe5hpm@oevsv.at>
This commit is contained in:
Hannes Schmelzer 2018-07-06 15:41:20 +02:00 committed by Tom Rini
parent dc36b65795
commit e22597048a

View file

@ -156,24 +156,6 @@ int load_lcdtiming(struct am335x_lcdpanel *panel)
return 0;
}
int ft_board_setup(void *blob, bd_t *bd)
{
int nodeoffset;
nodeoffset = fdt_path_offset(blob, "/factory-settings");
if (nodeoffset < 0) {
puts("set bootloader version 'factory-settings' not in dtb!\n");
return -1;
}
if (fdt_setprop(blob, nodeoffset, "bl-version",
PLAIN_VERSION, strlen(PLAIN_VERSION)) != 0) {
puts("set bootloader version 'bl-version' prop. not in dtb!\n");
return -1;
}
return 0;
}
static void br_summaryscreen_printenv(char *prefix,
char *name, char *altname,
char *suffix)
@ -262,11 +244,26 @@ void lcd_enable(void)
br_summaryscreen();
lcdbacklight(1);
}
#elif CONFIG_SPL_BUILD
#else
#error "LCD-support with a suitable FB-Driver is mandatory !"
#endif /* CONFIG_LCD */
int ft_board_setup(void *blob, bd_t *bd)
{
int nodeoffset;
nodeoffset = fdt_path_offset(blob, "/factory-settings");
if (nodeoffset < 0) {
puts("set bootloader version 'factory-settings' not in dtb!\n");
return -1;
}
if (fdt_setprop(blob, nodeoffset, "bl-version",
PLAIN_VERSION, strlen(PLAIN_VERSION)) != 0) {
puts("set bootloader version 'bl-version' prop. not in dtb!\n");
return -1;
}
return 0;
}
#ifdef CONFIG_SPL_BUILD
void pmicsetup(u32 mpupll)
{