summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/recipes-bsp/x-load/files/signGP.c108
-rw-r--r--meta/recipes-bsp/x-load/signgp-native.bb14
-rw-r--r--meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch11
-rw-r--r--meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch16
-rw-r--r--meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch11
-rw-r--r--meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch11
-rw-r--r--meta/recipes-bsp/x-load/x-load.inc5
-rw-r--r--meta/recipes-bsp/x-load/x-load_git.bb19
9 files changed, 19 insertions, 178 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index b1ea34d2f0..b508278800 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -189,7 +189,7 @@ SRCREV_pn-xserver-kdrive-glamo ??= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
189SRCREV_pn-xserver-xf86-dri-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433" 189SRCREV_pn-xserver-xf86-dri-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
190SRCREV_pn-xserver-xf86-dri2-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433" 190SRCREV_pn-xserver-xf86-dri2-lite ??= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
191SRCREV_pn-xvideo-tests ??= "270" 191SRCREV_pn-xvideo-tests ??= "270"
192SRCREV_pn-x-load ??= "65ed00323f3807197a83abc75d62ed2a8d3f60de" 192SRCREV_pn-x-load ??= "6f3a26101303051e0f91b6213735b68ce804e94e"
193SRCDATE_yaffs2-utils-native ??= "20071107" 193SRCDATE_yaffs2-utils-native ??= "20071107"
194SRCDATE_yaffs2-utils ??= "20071107" 194SRCDATE_yaffs2-utils ??= "20071107"
195SRCREV_pn-zaurusd ??= "426" 195SRCREV_pn-zaurusd ??= "426"
diff --git a/meta/recipes-bsp/x-load/files/signGP.c b/meta/recipes-bsp/x-load/files/signGP.c
deleted file mode 100644
index 9325064013..0000000000
--- a/meta/recipes-bsp/x-load/files/signGP.c
+++ /dev/null
@@ -1,108 +0,0 @@
1/*
2 * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
3 *
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *
9 * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 *
12 * Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the
15 * distribution.
16 *
17 * Neither the name of Texas Instruments Incorporated nor the names of
18 * its contributors may be used to endorse or promote products derived
19 * from this software without specific prior written permission.
20 *
21 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
24 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
25 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
26 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
27 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
28 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
29 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
30 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
31 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32 *
33*/
34
35
36//
37// signGP.c
38// Read the x-load.bin file and write out the x-load.bin.ift file.
39// The signed image is the original pre-pended with the size of the image
40// and the load address. If not entered on command line, file name is
41// assumed to be x-load.bin in current directory and load address is
42// 0x40200800.
43
44#include <stdio.h>
45#include <stdlib.h>
46#include <fcntl.h>
47#include <sys/stat.h>
48#include <string.h>
49#include <malloc.h>
50
51
52main(int argc, char *argv[])
53{
54 int i;
55 char ifname[FILENAME_MAX], ofname[FILENAME_MAX], ch;
56 FILE *ifile, *ofile;
57 unsigned long loadaddr, len;
58 struct stat sinfo;
59
60
61 // Default to x-load.bin and 0x40200800.
62 strcpy(ifname, "x-load.bin");
63 loadaddr = 0x40200800;
64
65 if ((argc == 2) || (argc == 3))
66 strcpy(ifname, argv[1]);
67
68 if (argc == 3)
69 loadaddr = strtol(argv[2], NULL, 16);
70
71 // Form the output file name.
72 strcpy(ofname, ifname);
73 strcat(ofname, ".ift");
74
75 // Open the input file.
76 ifile = fopen(ifname, "rb");
77 if (ifile == NULL) {
78 printf("Cannot open %s\n", ifname);
79 exit(0);
80 }
81
82 // Get file length.
83 stat(ifname, &sinfo);
84 len = sinfo.st_size;
85
86 // Open the output file and write it.
87 ofile = fopen(ofname, "wb");
88 if (ofile == NULL) {
89 printf("Cannot open %s\n", ofname);
90 fclose(ifile);
91 exit(0);
92 }
93
94 // Pad 1 sector of zeroes.
95 //ch = 0x00;
96 //for (i=0; i<0x200; i++)
97 // fwrite(&ch, 1, 1, ofile);
98
99 fwrite(&len, 1, 4, ofile);
100 fwrite(&loadaddr, 1, 4, ofile);
101 for (i=0; i<len; i++) {
102 fread(&ch, 1, 1, ifile);
103 fwrite(&ch, 1, 1, ofile);
104 }
105
106 fclose(ifile);
107 fclose(ofile);
108}
diff --git a/meta/recipes-bsp/x-load/signgp-native.bb b/meta/recipes-bsp/x-load/signgp-native.bb
deleted file mode 100644
index ae8c8f9dcb..0000000000
--- a/meta/recipes-bsp/x-load/signgp-native.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1LICENSE = "BSD"
2DESCRIPTION = "Tool to sign omap3 x-loader images"
3
4inherit native
5SRC_URI = "file://signGP.c"
6
7do_compile() {
8 ${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/signGP.c -o signGP
9}
10
11do_install() {
12 install -d ${D}${bindir}/
13 install -m 0755 signGP ${D}${bindir}/
14}
diff --git a/meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch b/meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch
deleted file mode 100644
index 3131cda6bb..0000000000
--- a/meta/recipes-bsp/x-load/x-load-git/beagleboard/armv7-a.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- git/cpu/omap3/config.mk-orig 2008-05-27 16:46:45.000000000 -0700
2+++ git/cpu/omap3/config.mk 2008-05-29 12:50:49.000000000 -0700
3@@ -23,7 +23,7 @@
4 PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \
5 -msoft-float
6
7-PLATFORM_CPPFLAGS += -march=armv7a
8+PLATFORM_CPPFLAGS += -march=armv7-a
9 # =========================================================================
10 #
11 # Supply options according to compiler version
diff --git a/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch b/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
index 98dcbae497..d0fb99699d 100644
--- a/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
+++ b/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
@@ -1,14 +1,16 @@
1--- git/Makefile-orig 2008-07-29 22:31:03.000000000 -0700 1Index: git/Makefile
2+++ git/Makefile 2008-07-29 22:34:36.000000000 -0700 2===================================================================
3@@ -152,9 +152,9 @@ omap3evm_config : unconfig 3--- git.orig/Makefile
4+++ git/Makefile
5@@ -225,8 +225,9 @@ omap3evm_config : unconfig
4 overo_config : unconfig 6 overo_config : unconfig
5 @./mkconfig $(@:_config=) arm omap3 overo 7 @$(MKCONFIG) $(@:_config=) arm omap3 overo
6 8
7-omap3530beagle_config : unconfig 9-omap3530beagle_config : unconfig
10- @$(MKCONFIG) $(@:_config=) arm omap3 omap3530beagle
8+beagleboard_config : unconfig 11+beagleboard_config : unconfig
9 12+ @$(MKCONFIG) omap3530beagle arm omap3 omap3530beagle
10- @./mkconfig $(@:_config=) arm omap3 omap3530beagle
11+ @./mkconfig omap3530beagle arm omap3 omap3530beagle 13+ @./mkconfig omap3530beagle arm omap3 omap3530beagle
12 14
13 ######################################################################### 15 #########################################################################
14 16 ## OMAP4 (ARM-CortexA9) Systems
diff --git a/meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch b/meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch
deleted file mode 100644
index 3131cda6bb..0000000000
--- a/meta/recipes-bsp/x-load/x-load-git/omap3evm/armv7-a.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- git/cpu/omap3/config.mk-orig 2008-05-27 16:46:45.000000000 -0700
2+++ git/cpu/omap3/config.mk 2008-05-29 12:50:49.000000000 -0700
3@@ -23,7 +23,7 @@
4 PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \
5 -msoft-float
6
7-PLATFORM_CPPFLAGS += -march=armv7a
8+PLATFORM_CPPFLAGS += -march=armv7-a
9 # =========================================================================
10 #
11 # Supply options according to compiler version
diff --git a/meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch b/meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch
deleted file mode 100644
index 3131cda6bb..0000000000
--- a/meta/recipes-bsp/x-load/x-load-git/overo/armv7-a.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- git/cpu/omap3/config.mk-orig 2008-05-27 16:46:45.000000000 -0700
2+++ git/cpu/omap3/config.mk 2008-05-29 12:50:49.000000000 -0700
3@@ -23,7 +23,7 @@
4 PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \
5 -msoft-float
6
7-PLATFORM_CPPFLAGS += -march=armv7a
8+PLATFORM_CPPFLAGS += -march=armv7-a
9 # =========================================================================
10 #
11 # Supply options according to compiler version
diff --git a/meta/recipes-bsp/x-load/x-load.inc b/meta/recipes-bsp/x-load/x-load.inc
index 7073b13fe7..a98ec8fb7c 100644
--- a/meta/recipes-bsp/x-load/x-load.inc
+++ b/meta/recipes-bsp/x-load/x-load.inc
@@ -5,7 +5,7 @@ LICENSE = "GPL"
5 5
6inherit deploy 6inherit deploy
7 7
8DEPENDS = "signgp-native" 8DEPENDS = ""
9 9
10PARALLEL_MAKE="" 10PARALLEL_MAKE=""
11 11
@@ -24,11 +24,10 @@ do_compile () {
24 unset CPPFLAGS 24 unset CPPFLAGS
25 oe_runmake distclean 25 oe_runmake distclean
26 oe_runmake ${XLOAD_MACHINE} 26 oe_runmake ${XLOAD_MACHINE}
27 oe_runmake 27 oe_runmake ift
28} 28}
29 29
30do_deploy () { 30do_deploy () {
31 signGP ${S}/x-load.bin
32 install ${S}/x-load.bin.ift ${DEPLOYDIR}/${XLOAD_IMAGE} 31 install ${S}/x-load.bin.ift ${DEPLOYDIR}/${XLOAD_IMAGE}
33 install ${S}/x-load.bin.ift ${DEPLOYDIR}/${MLO_IMAGE} 32 install ${S}/x-load.bin.ift ${DEPLOYDIR}/${MLO_IMAGE}
34 33
diff --git a/meta/recipes-bsp/x-load/x-load_git.bb b/meta/recipes-bsp/x-load/x-load_git.bb
index f124e2b300..fc2927ef02 100644
--- a/meta/recipes-bsp/x-load/x-load_git.bb
+++ b/meta/recipes-bsp/x-load/x-load_git.bb
@@ -2,24 +2,19 @@ require x-load.inc
2 2
3FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE}" 3FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE}"
4 4
5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://README;beginline=1;endline=25;md5=ef08d08cb99057bbb5b9d6d0c5a4396f"
7
5PV = "1.42+${PR}+git${SRCPV}" 8PV = "1.42+${PR}+git${SRCPV}"
6PR="r12" 9PR="r13"
7 10
8SRC_URI = "git://www.sakoman.net/git/x-load-omap3.git;branch=master;protocol=git" 11#SRC_URI = "git://www.sakoman.net/git/x-load-omap3.git;branch=master;protocol=git"
12#SRC_URI = "git://gitorious.org/x-load-omap3/mainline.git;branch=master;protocol=git"
13SRC_URI = "git://gitorious.org/x-loader/x-loader.git;branch=master;protocol=git"
9 14
10SRC_URI_append_beagleboard = " \ 15SRC_URI_append_beagleboard = " \
11 file://name.patch;patch=1 \ 16 file://name.patch;patch=1 \
12 file://armv7-a.patch;patch=1 \
13 "
14
15SRC_URI_append_omap3evm = " \
16 file://armv7-a.patch;patch=1 \
17 " 17 "
18
19SRC_URI_append_overo = " \
20 file://armv7-a.patch;patch=1 \
21 "
22
23S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
24 19
25PACKAGE_ARCH = "${MACHINE_ARCH}" 20PACKAGE_ARCH = "${MACHINE_ARCH}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 05:30:27 +0000