summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--arch/arm/Makefile9
-rw-r--r--scripts/.gitignore5
-rw-r--r--scripts/Makefile1
-rw-r--r--scripts/mkublheader.c99
5 files changed, 113 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index fd429fa..4154c73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ barebox.bin
barebox.srec
barebox.netx
barebox.s5p
+barebox.ubl
barebox.map
System.map
Module.symvers
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 1225df7..02519ee 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -184,6 +184,15 @@ ifeq ($(CONFIG_OMAP_BUILD_IFT),y)
KBUILD_IMAGE := MLO
endif
+barebox.ubl: barebox.bin
+ @echo " UBL " $@
+ $(Q)scripts/mkublheader barebox.bin > barebox.ubl
+ $(Q)cat barebox.bin >> barebox.ubl
+
+ifeq ($(CONFIG_ARCH_DAVINCI),y)
+KBUILD_IMAGE := barebox.ubl
+endif
+
all: $(KBUILD_IMAGE)
archprepare: maketools
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 11fd2df..6e63f85 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,6 +1,7 @@
bareboxenv
bin2c
-mkimage
-kallsyms
gen_netx_image
+kallsyms
+mkimage
+mkublheader
omap_signGP
diff --git a/scripts/Makefile b/scripts/Makefile
index 784d205..7ca5e29 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -11,6 +11,7 @@ hostprogs-y += bareboxenv
hostprogs-$(CONFIG_ARCH_NETX) += gen_netx_image
hostprogs-$(CONFIG_ARCH_OMAP) += omap_signGP
hostprogs-$(CONFIG_ARCH_S5PCxx) += s5p_cksum
+hostprogs-$(CONFIG_ARCH_DAVINCI) += mkublheader
always := $(hostprogs-y) $(hostprogs-m)
diff --git a/scripts/mkublheader.c b/scripts/mkublheader.c
new file mode 100644
index 0000000..b61630a
--- /dev/null
+++ b/scripts/mkublheader.c
@@ -0,0 +1,99 @@
+/*
+ * mkublheader.c - produce the header needed to load barebox on OMAP-L138
+ *
+ * Copyright (C) 2012 Jan Luebbe <j.luebbe@pengutronix.de>
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#define _BSD_SOURCE
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <limits.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+#include <endian.h>
+
+#define MAGICNUM 0xa1aced00
+
+struct ubl_header
+{
+ uint32_t magicNum; /* Expected magic number */
+ uint32_t epAddr; /* Entry point of the user application */
+ uint32_t imgSize; /* Number of bytes of the application image */
+ uint32_t imgAddr; /* SPI memory offset where application image is located */
+ uint32_t ldAddr; /* Address where image is copied to */
+};
+
+void usage(char *prgname)
+{
+ printf( "Usage : %s [OPTION] FILE > HEADER\n"
+ "\n"
+ "options:\n"
+ " -a <address> image flash address\n"
+ " -e <address> entry point memory address\n"
+ " -l <address> load memory address\n",
+ prgname);
+}
+
+int main(int argc, char *argv[])
+{
+ struct stat sb;
+ struct ubl_header uh;
+ int opt;
+ uint32_t imgAddr = 0x00040000 + sizeof(uh);
+ uint32_t epAddr = 0xc1080000, ldAddr = 0xc1080000;
+
+ while((opt = getopt(argc, argv, "ael:")) != -1) {
+ switch (opt) {
+ case 'a':
+ imgAddr = strtoul(optarg, NULL, 0);
+ break;
+ case 'e':
+ epAddr = strtoul(optarg, NULL, 0);
+ break;
+ case 'l':
+ ldAddr = strtoul(optarg, NULL, 0);
+ break;
+ }
+ }
+
+ if (optind >= argc) {
+ usage(argv[0]);
+ exit(1);
+ }
+
+ if (stat(argv[optind], &sb) == -1) {
+ perror("stat");
+ exit(EXIT_FAILURE);
+ }
+
+ uh.magicNum = htole32(MAGICNUM);
+ uh.epAddr = htole32(epAddr);
+ uh.imgSize = htole32((uint32_t)sb.st_size);
+ uh.imgAddr = htole32(imgAddr);
+ uh.ldAddr = htole32(ldAddr);
+
+ fwrite(&uh, sizeof(uh), 1, stdout);
+
+ exit(EXIT_SUCCESS);
+}