Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / include / configs / tbs2910.h

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 17de122..a2e59ce 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -16,8 +16,6 @@
 
 #define CONFIG_SYS_HZ                  1000
 
-#define CONFIG_IMX_THERMAL
-
 /* Physical Memory Map */
 #define CONFIG_SYS_SDRAM_BASE          MMDC0_ARB_BASE_ADDR
 
@@ -33,15 +31,11 @@
 #define CONFIG_SYS_BOOTMAPSZ           0x10000000
 
 /* Serial console */
-#define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE /* select UART1/UART2 */
 
 /* Framebuffer */
-#ifdef CONFIG_VIDEO
-#define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
-#endif
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
@@ -68,11 +62,6 @@
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
 #endif /* CONFIG_CMD_USB      */
 
-/* Environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV         2 /* overwritten on SD boot */
-#define CONFIG_SYS_MMC_ENV_PART                1 /* overwritten on SD boot */
-#define CONFIG_ENV_OVERWRITE
-
 #define CONFIG_BOARD_SIZE_LIMIT                392192 /* (CONFIG_ENV_OFFSET - 1024) */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -93,20 +82,19 @@
                        "bootm 0x10800000 0x10d00000\0" \
        "console=ttymxc0\0" \
        "fan=gpio set 92\0" \
-       "fdt_addr=0x13000000\0" \
-       "fdt_addr_r=0x13000000\0" \
+       "fdt_addr_r=0x18000000\0" \
        "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
-       "kernel_addr_r=0x10008000\0" \
-       "pxefile_addr_r=0x10008000\0" \
-       "ramdisk_addr_r=0x18000000\0" \
-       "scriptaddr=0x14000000\0" \
+       "kernel_addr_r=0x12000000\0" \
+       "pxefile_addr_r=0x10100000\0" \
+       "ramdisk_addr_r=0x18080000\0" \
+       "scriptaddr=0x10000000\0" \
        "set_con_serial=setenv stdout serial; " \
                        "setenv stderr serial\0" \
-       "set_con_hdmi=setenv stdout serial,vga; " \
-                       "setenv stderr serial,vga\0" \
-       "stderr=serial,vga\0" \
+       "set_con_hdmi=setenv stdout serial,vidconsole; " \
+                       "setenv stderr serial,vidconsole\0" \
+       "stderr=serial,vidconsole\0" \
        "stdin=serial,usbkbd\0" \
-       "stdout=serial,vga\0"
+       "stdout=serial,vidconsole\0"
 
 /* Enable distro boot */
 #define BOOT_TARGET_DEVICES(func) \