X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=board%2Fkaro%2Ftx28%2Ftx28.c;h=8957b8c7db503476997ae6f0fff2b37531e24b70;hp=d0045164f200536eaefa80cb46d4e1abd5219671;hb=2817e70bf7c11c4a0043f764a08b06c964d523ef;hpb=7e32727532810ad10aef5ce25cfe6d54ddae889d

diff --git a/board/karo/tx28/tx28.c b/board/karo/tx28/tx28.c
index d0045164f2..8957b8c7db 100644
--- a/board/karo/tx28/tx28.c
+++ b/board/karo/tx28/tx28.c
@@ -566,9 +566,6 @@ static const iomux_cfg_t stk5_lcd_pads[] = {
 	MX28_PAD_LCD_WR_RWN__LCD_HSYNC | MXS_PAD_CTRL,
 	MX28_PAD_LCD_RS__LCD_DOTCLK | MXS_PAD_CTRL,
 	MX28_PAD_LCD_CS__LCD_CS | MXS_PAD_CTRL,
-	MX28_PAD_LCD_VSYNC__LCD_VSYNC | MXS_PAD_CTRL,
-	MX28_PAD_LCD_HSYNC__LCD_HSYNC | MXS_PAD_CTRL,
-	MX28_PAD_LCD_DOTCLK__LCD_DOTCLK | MXS_PAD_CTRL,
 };
 
 static const struct gpio stk5_lcd_gpios[] = {
@@ -897,7 +894,8 @@ int checkboard(void)
 	const char *dlm = "";
 
 	printf("Board: Ka-Ro TX28-4%sx%d\n", TX28_MOD_SUFFIX,
-		CONFIG_SDRAM_SIZE / SZ_128M);
+		CONFIG_SDRAM_SIZE / SZ_128M +
+		CONFIG_SYS_NAND_BLOCKS / 2048 * 2);
 
 	printf("POWERUP Source: ");
 	if (pwrup_src & (3 << 0)) {
@@ -975,6 +973,11 @@ void ft_board_setup(void *blob, bd_t *bd)
 	const char *baseboard = getenv("baseboard");
 	int stk5_v5 = baseboard != NULL && (strcmp(baseboard, "stk5-v5") == 0);
 	const char *video_mode = karo_get_vmode(getenv("video_mode"));
+	int ret;
+
+	ret = fdt_increase_size(blob, 4096);
+	if (ret)
+		printf("Failed to increase FDT size: %s\n", fdt_strerror(ret));
 
 #ifdef CONFIG_TX28_S
 	/* TX28-41xx (aka TX28S) has no external RTC
@@ -991,7 +994,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 
 	karo_fdt_fixup_touchpanel(blob, tx28_touchpanels,
 				ARRAY_SIZE(tx28_touchpanels));
-	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy");
+	karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy", "vbus-supply");
 	karo_fdt_fixup_flexcan(blob, stk5_v5);
 	karo_fdt_update_fb_mode(blob, video_mode);
 }