diff options
| -rw-r--r-- | packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch | 49 | ||||
| -rw-r--r-- | packages/u-boot/u-boot_1.1.2.bb | 12 |
2 files changed, 10 insertions, 51 deletions
diff --git a/packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch b/packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch index ed959d43d8..3809a75f51 100644 --- a/packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch +++ b/packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch @@ -19060,55 +19060,6 @@ diff -u -r --new-file u-boot-1.1.2/patches/arm_flags.patch u-boot-1.1.2-neon/pat ++ -msoft-float + + PLATFORM_CPPFLAGS += -mapcs-32 -march=armv4 -mtune=strongarm1100 -diff -u -r --new-file u-boot-1.1.2/patches/series u-boot-1.1.2-neon/patches/series ---- u-boot-1.1.2/patches/series 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-1.1.2-neon/patches/series 2007-08-11 21:01:36.000000000 +0200 -@@ -0,0 +1,2 @@ -+arm_flags.patch -p1 -+u-boot-2006-06-03.patch.gz -p1 -Binary files u-boot-1.1.2/patches/u-boot-2006-06-03.patch.gz and u-boot-1.1.2-neon/patches/u-boot-2006-06-03.patch.gz differ -diff -u -r --new-file u-boot-1.1.2/.pc/applied-patches u-boot-1.1.2-neon/.pc/applied-patches ---- u-boot-1.1.2/.pc/applied-patches 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-1.1.2-neon/.pc/applied-patches 2007-08-11 21:01:36.000000000 +0200 -@@ -0,0 +1 @@ -+arm_flags.patch -diff -u -r --new-file u-boot-1.1.2/.pc/arm_flags.patch/cpu/pxa/config.mk u-boot-1.1.2-neon/.pc/arm_flags.patch/cpu/pxa/config.mk ---- u-boot-1.1.2/.pc/arm_flags.patch/cpu/pxa/config.mk 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-1.1.2-neon/.pc/arm_flags.patch/cpu/pxa/config.mk 2003-05-23 14:36:21.000000000 +0200 -@@ -0,0 +1,28 @@ -+# -+# (C) Copyright 2002 -+# Sysgo Real-Time Solutions, GmbH <www.elinos.com> -+# Marius Groeger <mgroeger@sysgo.de> -+# -+# See file CREDITS for list of people who contributed to this -+# project. -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+ -+PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ -+ -mshort-load-bytes -msoft-float -+ -+PLATFORM_CPPFLAGS += -mapcs-32 -march=armv4 -mtune=strongarm1100 -diff -u -r --new-file u-boot-1.1.2/.pc/.version u-boot-1.1.2-neon/.pc/.version ---- u-boot-1.1.2/.pc/.version 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-1.1.2-neon/.pc/.version 2007-08-11 21:01:36.000000000 +0200 -@@ -0,0 +1 @@ -+2 diff -u -r --new-file u-boot-1.1.2/README u-boot-1.1.2-neon/README --- u-boot-1.1.2/README 2004-12-16 22:44:03.000000000 +0100 +++ u-boot-1.1.2-neon/README 2007-08-11 21:07:19.000000000 +0200 diff --git a/packages/u-boot/u-boot_1.1.2.bb b/packages/u-boot/u-boot_1.1.2.bb index 82b169ccc4..8287d35a1d 100644 --- a/packages/u-boot/u-boot_1.1.2.bb +++ b/packages/u-boot/u-boot_1.1.2.bb @@ -1,8 +1,11 @@ -PR = "r2" +PR = "r3" require u-boot.inc SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ file://arm_flags.patch;patch=1 " +# Override whole URI fr Neon since Neon patch is incompatible with arm_flags patch. +SRC_URI_bd-neon = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ + file://u-boot-1.1.2-neon.patch;patch=1" SRC_URI_append_vibren = "ftp://bec-systems.com/pub/pxa255_idp/u-boot/uboot_pxa255-idp_2005-03-23.patch;patch=1" SRC_URI_append_mnci = "file://mnci.patch;patch=1 \ file://mnci-jffs2.patch;patch=1 \ @@ -10,7 +13,7 @@ SRC_URI_append_mnci = "file://mnci.patch;patch=1 \ file://command-names.patch;patch=1" SRC_URI_append_magicbox = "file://u-boot-emetec.patch;patch=1 " -SRC_URI_append_bd-neon = "file://u-boot-1.1.2-neon.patch;patch=1" + # TODO: SRC_URI_append_rt3000 @@ -32,6 +35,11 @@ do_compile () { RDEPENDS_append_mnci = " hwctrl" FILES_${PN}_mnci = "/tmp/${UBOOT_IMAGE}" + +do_configure_prepend_bd-neon () { + chmod +x ${S}/Configure +} + do_install_openmn() { install -d ${D}/tmp install ${S}/u-boot.bin ${D}/tmp/${UBOOT_IMAGE} |