diff options
| author |   Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-07-14 01:07:34 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-07-14 01:07:34 +0400 |
| commit | 1a35b6063591e39cb54f30188a0f8baa36c5f61b (patch) | |
| tree | 9f13a1a4f14ae2745abe92d8a37c742a849922df /recipes/u-boot | |
| parent | 3be79bbe6aeb0fb0ce9ad543cff54a166169c52f (diff) | |
| parent | b62ea92436361e3f89eb433389a2fd48f967e4f0 (diff) | |
| download | openembedded-1a35b6063591e39cb54f30188a0f8baa36c5f61b.tar.gz | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/u-boot')
| -rw-r--r-- | recipes/u-boot/u-boot-git/0001-omap3evm-Change-default-console-serial-port-from.patch | 30 | ||||
| -rw-r--r-- | recipes/u-boot/u-boot_git.bb | 10 |
2 files changed, 37 insertions, 3 deletions
diff --git a/recipes/u-boot/u-boot-git/0001-omap3evm-Change-default-console-serial-port-from.patch b/recipes/u-boot/u-boot-git/0001-omap3evm-Change-default-console-serial-port-from.patch new file mode 100644 index 0000000000..d171b78af0 --- /dev/null +++ b/recipes/u-boot/u-boot-git/0001-omap3evm-Change-default-console-serial-port-from.patch @@ -0,0 +1,30 @@ +From 6b23ecf49d1c2ee5227ff57101919af46ecd7396 Mon Sep 17 00:00:00 2001 +From: Roger Monk <r-monk@ti.com> +Date: Fri, 9 Jul 2010 08:37:04 +0100 +Subject: [PATCH] omap3evm: Change default 'console' serial port from ttyS2 to ttyS0 + + * Update default kernel console env variable ($(console)) + to use ttyS0 (instead of ttyS2) to match the serial port + used by x-loader and u-boot + +Signed-off-by: Roger Monk <r-monk@ti.com> +--- + include/configs/omap3_evm.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h +index 73a5c98..d01d733 100644 +--- a/include/configs/omap3_evm.h ++++ b/include/configs/omap3_evm.h +@@ -203,7 +203,7 @@ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "loadaddr=0x82000000\0" \ + "usbtty=cdc_acm\0" \ +- "console=ttyS2,115200n8\0" \ ++ "console=ttyS0,115200n8\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "root=/dev/mmcblk0p2 rw " \ + "rootfstype=ext3 rootwait\0" \ +-- +1.6.0.4 + diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index d67e78744a..cf76e1df0b 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r57" +PR ="r58" FILESPATHPKG =. "u-boot-git:" @@ -105,12 +105,16 @@ SRCREV_omap3-touchbook = "d363f9cb0918a1b6b92e2e20d01543d0c4f53274" PV_omap3-touchbook = "2009.05+${PR}+gitr${SRCREV}" # ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits) -SRC_URI_omap3evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git" +SRC_URI_omap3evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git \ + file://0001-omap3evm-Change-default-console-serial-port-from.patch \ +" SRCREV_omap3evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620" PV_omap3evm = "2009.11+${PR}+gitr${SRCREV}" # ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits) -SRC_URI_dm3730-am3715-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git" +SRC_URI_dm3730-am3715-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git \ + file://0001-omap3evm-Change-default-console-serial-port-from.patch \ +" SRCREV_dm3730-am3715-evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620" PV_dm3730-am3715-evm = "2009.11+${PR}+gitr${SRCREV}" |