diff options
| author | Mirko Vogt <mirko@openwrt.org> | 2013-01-07 14:10:01 +0000 |
|---|---|---|
| committer | Mirko Vogt <mirko@openwrt.org> | 2013-01-07 14:10:01 +0000 |
| commit | 130b30fbba55d2da7582986f7a5b90bbdfb9a66e (patch) | |
| tree | e6bbb4cc46961482fff071b74e8666cefe5e5206 /package/boot/uboot-xburst/patches/0006-enable-silent-console.patch | |
| parent | 16b08bfc594cff67e02fd1931ee137db754d5cab (diff) | |
| download | master-187ad058-130b30fbba55d2da7582986f7a5b90bbdfb9a66e.tar.gz master-187ad058-130b30fbba55d2da7582986f7a5b90bbdfb9a66e.tar.bz2 master-187ad058-130b30fbba55d2da7582986f7a5b90bbdfb9a66e.zip | |
This patch updates uboot-xburst from 2009.11 to 2012.10-rc2 - Ingenic SoC support went upstream
Summary:
* remove all files/* (since merged to upstream)
* patches on nand-spl, mmc and lcd driver
Thanks a lot to Xiangfu Liu!
Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35034 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/boot/uboot-xburst/patches/0006-enable-silent-console.patch')
| -rw-r--r-- | package/boot/uboot-xburst/patches/0006-enable-silent-console.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/package/boot/uboot-xburst/patches/0006-enable-silent-console.patch b/package/boot/uboot-xburst/patches/0006-enable-silent-console.patch new file mode 100644 index 0000000000..ebd6a6a7bf --- /dev/null +++ b/package/boot/uboot-xburst/patches/0006-enable-silent-console.patch @@ -0,0 +1,60 @@ +From 5eb4d4c598f2806bd1b3d1140e917bfead7851ad Mon Sep 17 00:00:00 2001 +From: Xiangfu <xiangfu@openmobilefree.net> +Date: Wed, 10 Oct 2012 23:51:26 +0800 +Subject: [PATCH 6/6] enable silent console + +--- + common/console.c | 16 ++++++++++++++++ + include/configs/qi_lb60.h | 2 ++ + 2 files changed, 18 insertions(+) + +diff --git a/common/console.c b/common/console.c +index 1177f7d..e8a2078 100644 +--- a/common/console.c ++++ b/common/console.c +@@ -685,6 +685,14 @@ done: + + gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ + ++#ifdef CONFIG_SILENT_CONSOLE ++ /* Check one more time the contents of the silent environment ++ * variable, because if the environment is loaded from NAND it was ++ * not available when console_init_f() was called */ ++ if (getenv("silent") != NULL) ++ gd->flags |= GD_FLG_SILENT; ++#endif ++ + stdio_print_current_devices(); + + #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE +@@ -760,6 +768,14 @@ int console_init_r(void) + + gd->flags |= GD_FLG_DEVINIT; /* device initialization completed */ + ++#ifdef CONFIG_SILENT_CONSOLE ++ /* Check one more time the contents of the silent environment ++ * variable, because if the environment is loaded from NAND it was ++ * not available when console_init_f() was called */ ++ if (getenv("silent") != NULL) ++ gd->flags |= GD_FLG_SILENT; ++#endif ++ + stdio_print_current_devices(); + + /* Setting environment variables */ +diff --git a/include/configs/qi_lb60.h b/include/configs/qi_lb60.h +index d3e78ad..a3534ff 100644 +--- a/include/configs/qi_lb60.h ++++ b/include/configs/qi_lb60.h +@@ -102,6 +102,8 @@ + #define CONFIG_SYS_NO_FLASH + #define CONFIG_SYS_FLASH_BASE 0 /* init flash_base as 0 */ + ++#define CONFIG_SILENT_CONSOLE 1 /* Enable silent console */ ++ + /* + * Command line configuration + */ +-- +1.7.9.5 + |