diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 01:09:51 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 01:09:51 +0100 |
| commit | ce81a5820f712888529f7814ae11cce4ce3f6bd9 (patch) | |
| tree | c6aa834d51accf4f4182bc0c7bfd93247c12607f /packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch | |
| parent | 61d929464d8d345d5e0a4d6b1a9955c77f708e3c (diff) | |
| parent | e13eb6ed3ee15de931a517361ad80f9248798873 (diff) | |
Merge branch 'holger/openmoko-merges' into org.openembedded.dev
Conflicts:
packages/tasks/task-openmoko-feed.bb
Diffstat (limited to 'packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch')
| -rw-r--r-- | packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch index 5757cc078b..285c546e73 100644 --- a/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch @@ -90,7 +90,7 @@ Index: u-boot/board/smdk2443/smdk2443.c +++ u-boot/board/smdk2443/smdk2443.c @@ -0,0 +1,147 @@ +/* -+ * (C) Copyright 2006 OpenMoko, Inc. ++ * (C) Copyright 2006 Openmoko, Inc. + * Author: Harald Welte <laforge@openmoko.org> + * + * See file CREDITS for list of people who contributed to this @@ -305,7 +305,7 @@ Index: u-boot/include/configs/smdk2443.h +++ u-boot/include/configs/smdk2443.h @@ -0,0 +1,289 @@ +/* -+ * (C) Copyright 2007 OpenMoko, Inc. ++ * (C) Copyright 2007 Openmoko, Inc. + * Author: Harald Welte <laforge@openmoko.org> + * + * Configuation settings for the SAMSUNG SMDK2443 board. @@ -688,7 +688,7 @@ Index: u-boot/board/smdk2443/lowlevel_init.S +/* + * SMDK2443 Memory Setup + * -+ * Copyright (C) 2007 by OpenMoko, Inc. ++ * Copyright (C) 2007 by Openmoko, Inc. + * Author: Harald Welte <laforge@openmoko.org> + * + * See file CREDITS for list of people who contributed to this |