X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Ftegra-common-post.h;h=dd72e5b4db6533e032d0a02cec5bb7be14b8473f;hb=d56b4b19744c314c26dc77585a7c7a9253d1487d;hp=651c4c4935366bf7d5df2b2eac05c6b55d947019;hpb=f69d72ee2a147b93f6d7664daf62af997e28f5b0;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 651c4c4..dd72e5b 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -19,9 +19,7 @@ #define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MB */ #endif -#ifndef CONFIG_ARM64 #define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */ -#endif #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ @@ -55,6 +53,12 @@ #define STDOUT_LCD "" #endif +#ifdef CONFIG_DM_VIDEO +#define STDOUT_VIDEO ",vidconsole" +#else +#define STDOUT_VIDEO "" +#endif + #ifdef CONFIG_CROS_EC_KEYB #define STDOUT_CROS_EC ",cros-ec-keyb" #else @@ -63,8 +67,8 @@ #define TEGRA_DEVICE_SETTINGS \ "stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB STDOUT_CROS_EC "\0" \ - "stdout=serial" STDOUT_LCD "\0" \ - "stderr=serial" STDOUT_LCD "\0" \ + "stdout=serial" STDOUT_LCD STDOUT_VIDEO "\0" \ + "stderr=serial" STDOUT_LCD STDOUT_VIDEO "\0" \ "" #ifndef BOARD_EXTRA_ENV_SETTINGS @@ -101,77 +105,25 @@ /* overrides for SPL build here */ #ifdef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* remove I2C support */ #ifdef CONFIG_SYS_I2C_TEGRA #undef CONFIG_SYS_I2C_TEGRA #endif #ifdef CONFIG_CMD_I2C -#undef CONFIG_CMD_I2C -#endif - -/* remove MMC support */ -#ifdef CONFIG_MMC -#undef CONFIG_MMC -#endif -#ifdef CONFIG_GENERIC_MMC -#undef CONFIG_GENERIC_MMC -#endif -#ifdef CONFIG_TEGRA_MMC -#undef CONFIG_TEGRA_MMC -#endif -#ifdef CONFIG_CMD_MMC -#undef CONFIG_CMD_MMC #endif /* remove partitions/filesystems */ -#ifdef CONFIG_DOS_PARTITION -#undef CONFIG_DOS_PARTITION -#endif -#ifdef CONFIG_EFI_PARTITION -#undef CONFIG_EFI_PARTITION -#endif -#ifdef CONFIG_CMD_FS_GENERIC -#undef CONFIG_CMD_FS_GENERIC -#endif -#ifdef CONFIG_CMD_EXT4 -#undef CONFIG_CMD_EXT4 -#endif -#ifdef CONFIG_CMD_EXT2 -#undef CONFIG_CMD_EXT2 -#endif -#ifdef CONFIG_CMD_FAT -#undef CONFIG_CMD_FAT -#endif #ifdef CONFIG_FS_EXT4 #undef CONFIG_FS_EXT4 #endif -#ifdef CONFIG_FS_FAT -#undef CONFIG_FS_FAT -#endif /* remove USB */ -#ifdef CONFIG_USB_EHCI -#undef CONFIG_USB_EHCI -#endif #ifdef CONFIG_USB_EHCI_TEGRA #undef CONFIG_USB_EHCI_TEGRA #endif -#ifdef CONFIG_USB_STORAGE -#undef CONFIG_USB_STORAGE -#endif #ifdef CONFIG_CMD_USB -#undef CONFIG_CMD_USB -#endif - -/* remove part command support */ -#ifdef CONFIG_PARTITION_UUIDS -#undef CONFIG_PARTITION_UUIDS -#endif - -#ifdef CONFIG_CMD_PART -#undef CONFIG_CMD_PART #endif #endif /* CONFIG_SPL_BUILD */