diff options
| author | James Maki <jmaki@multitech.com> | 2010-05-18 15:58:44 -0500 |
|---|---|---|
| committer | James Maki <jmaki@multitech.com> | 2010-05-18 15:58:44 -0500 |
| commit | 5ee12e59035cd547b6cc98406b2315b5181dcbdc (patch) | |
| tree | ad8bbecc4cd0742e1b931efd98ac2234e6213697 /recipes | |
| parent | 2ce8c5b66ff40942f0db0a859d954e0d70a278ef (diff) | |
| parent | 9db3b8621a20c1be4a7b13fc87c690bbe0fd8032 (diff) | |
Merge remote branch 'origin/multitech-corecdp-1.x' into multitech-corecdp-dev
Conflicts:
recipes/multitech/helloworld-autotools_git.bb
recipes/multitech/mts-io_git.bb
recipes/multitech/sms-utils_git.bb
recipes/multitech/u-boot-linux-utils_git.bb
recipes/multitech/upgrade-reboot_git.bb
recipes/multitech/venus-gps_git.bb
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch b/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch index 97dc2f193d..412837a545 100644 --- a/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch +++ b/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch @@ -3090,17 +3090,8 @@ diff -uprN u-boot-1.3.4-vanilla/include/configs/at91sam9rlek.h u-boot-1.3.4/incl /* bootstrap + u-boot + env + linux in dataflash on CS0 */ diff -uprN u-boot-1.3.4-vanilla/Makefile u-boot-1.3.4/Makefile --- u-boot-1.3.4-vanilla/Makefile 2008-08-12 09:08:38.000000000 -0500 -+++ u-boot-1.3.4/Makefile 2010-03-25 17:04:31.000000000 -0500 -@@ -21,6 +21,8 @@ - # MA 02111-1307 USA - # - -+export CROSS_COMPILE = /opt/timesys/toolchains/armv5l-linux/bin/armv5l-linux- -+ - VERSION = 1 - PATCHLEVEL = 3 - SUBLEVEL = 4 -@@ -2353,15 +2355,6 @@ shannon_config : unconfig ++++ u-boot-1.3.4/Makefile 2010-05-13 14:00:22.000000000 -0500 +@@ -2353,15 +2353,6 @@ shannon_config : unconfig at91rm9200dk_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 @@ -3116,7 +3107,7 @@ diff -uprN u-boot-1.3.4-vanilla/Makefile u-boot-1.3.4/Makefile cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 -@@ -2384,8 +2377,175 @@ mp2usb_config : unconfig +@@ -2384,8 +2375,175 @@ mp2usb_config : unconfig at91cap9adk_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91sam9 |