Skip to content

Commit f61660c

Browse files
teverettteverett
committed
addition of support for ubldr
1 parent 69faa69 commit f61660c

File tree

8 files changed

+53
-51
lines changed

8 files changed

+53
-51
lines changed

‎board/WandboardQuad/files/Makefile.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- b/Makefile 2013-12-05 20:00:55.053569628 -0700
2-
+++ a/Makefile 2013-12-05 20:00:34.471573906 -0700
1+
--- u-boot-2013.10/Makefile 2013-10-16 11:08:12.000000000 -0600
2+
+++ xxx/Makefile 2014-02-17 19:04:54.656874183 -0700
33
@@ -360,7 +360,7 @@
44
else
55
PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
@@ -9,3 +9,4 @@
99
export PLATFORM_LIBS
1010

1111
# Special flags for CPP when processing the linker script.
12+
sub

‎board/WandboardQuad/files/elf.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎board/WandboardQuad/files/uEnv.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
uenvcmd=fatload mmc 0:1 12000000 kernel.bin;go 12000000;
2-
1+
uenvcmd=fatload mmc 0:1 88000000 ubldr;bootelf 88000000;
32

‎board/WandboardQuad/files/uboot_config.mk.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/config.mk b/config.mk
2+
index 1fd109f..336715e 100644
3+
--- a/config.mk
4+
+++ b/config.mk
5+
@@ -95,7 +95,7 @@ HOSTCC = $(call os_x_before, 10, 5, "cc", "gcc")
6+
HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp")
7+
HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress")
8+
else
9+
-HOSTCC = gcc
10+
+HOSTCC ?= gcc
11+
endif
12+
13+
ifeq ($(HOSTOS),cygwin)

‎board/WandboardQuad/files/uboot_examples_api_Makefile.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/examples/api/Makefile b/examples/api/Makefile
2+
index bad05af..394585c 100644
3+
--- a/examples/api/Makefile
4+
+++ b/examples/api/Makefile
5+
@@ -69,7 +69,7 @@ all: $(obj).depend $(OUTPUT)
6+
#########################################################################
7+
8+
$(OUTPUT): $(OBJS)
9+
- $(LD) -Ttext $(LOAD_ADDR) -o $@ $^ $(PLATFORM_LIBS)
10+
+ $(LD) -static -Ttext $(LOAD_ADDR) -o $@ $^ $(PLATFORM_LIBS)
11+
$(OBJCOPY) -O binary $@ $(OUTPUT).bin 2>/dev/null
12+
13+
# Rule to build generic library C files

‎board/WandboardQuad/files/0001-wandboard-uEnv.txt-bootz-n-fixes.patch renamed to ‎board/WandboardQuad/files/wandboard_h.patch

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
From fd62c8d6f86822373c2a620d1e726f23aba13265 Mon Sep 17 00:00:00 2001
2-
From: Robert Nelson <robertcnelson@gmail.com>
3-
Date: Thu, 3 Oct 2013 10:42:21 -0500
4-
Subject: [PATCH] wandboard: uEnv.txt, bootz, n fixes
5-
6-
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
7-
---
8-
include/configs/wandboard.h | 63 +++++++++++++++++++++++++++++----------------
9-
1 file changed, 41 insertions(+), 22 deletions(-)
10-
11-
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
12-
index 442a984..47dcf54 100644
13-
--- a/include/configs/wandboard.h
14-
+++ b/include/configs/wandboard.h
15-
@@ -48,7 +48,7 @@
1+
--- u-boot-2013.10/include/configs/wandboard.h 2013-10-16 11:08:12.000000000 -0600
2+
+++ xxx/wandboard.h 2014-02-18 20:52:52.014481935 -0700
3+
@@ -17,6 +17,12 @@
4+
#define CONFIG_DISPLAY_CPUINFO
5+
#define CONFIG_DISPLAY_BOARDINFO
6+
7+
+#ifndef CONFIG_SPL_BUILD
8+
+#define CONFIG_CMD_ELF
9+
+#define CONFIG_API
10+
+#define CONFIG_SYS_MMC_MAX_DEVICE 4
11+
+#endif
12+
+
13+
#define MACH_TYPE_WANDBOARD 4412
14+
#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD
15+
16+
@@ -48,7 +54,7 @@
1617
#define CONFIG_CMD_BMODE
1718
#define CONFIG_CMD_SETEXPR
1819

@@ -21,7 +22,7 @@ index 442a984..47dcf54 100644
2122

2223
#define CONFIG_SYS_MEMTEST_START 0x10000000
2324
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
24-
@@ -67,6 +67,8 @@
25+
@@ -67,6 +73,8 @@
2526
#define CONFIG_BOUNCE_BUFFER
2627
#define CONFIG_CMD_EXT2
2728
#define CONFIG_CMD_FAT
@@ -30,7 +31,7 @@ index 442a984..47dcf54 100644
3031
#define CONFIG_DOS_PARTITION
3132

3233
/* Ethernet Configuration */
33-
@@ -116,9 +118,12 @@
34+
@@ -116,9 +124,12 @@
3435
"fdt_addr=0x11000000\0" \
3536
"boot_fdt=try\0" \
3637
"ip_dyn=yes\0" \
@@ -45,7 +46,7 @@ index 442a984..47dcf54 100644
4546
"update_sd_firmware_filename=u-boot.imx\0" \
4647
"update_sd_firmware=" \
4748
"if test ${ip_dyn} = yes; then " \
48-
@@ -134,27 +139,34 @@
49+
@@ -134,27 +145,34 @@
4950
"fi; " \
5051
"fi\0" \
5152
"mmcargs=setenv bootargs console=${console},${baudrate} " \
@@ -85,7 +86,7 @@ index 442a984..47dcf54 100644
8586
"fi;\0" \
8687
"netargs=setenv bootargs console=${console},${baudrate} " \
8788
"root=/dev/nfs " \
88-
@@ -166,32 +178,38 @@
89+
@@ -166,32 +184,38 @@
8990
"else " \
9091
"setenv get_cmd tftp; " \
9192
"fi; " \
@@ -138,14 +139,11 @@ index 442a984..47dcf54 100644
138139

139140
/* Miscellaneous configurable options */
140141
#define CONFIG_SYS_LONGHELP
141-
@@ -234,6 +252,7 @@
142+
@@ -234,6 +258,7 @@
142143

143144
#define CONFIG_OF_LIBFDT
144145
#define CONFIG_CMD_BOOTZ
145146
+#define CONFIG_SUPPORT_RAW_INITRD
146147

147148
#ifndef CONFIG_SYS_DCACHE_OFF
148149
#define CONFIG_CMD_CACHE
149-
--
150-
1.8.4.rc3
151-

‎board/WandboardQuad/overlay/etc/fstab

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/dev/mmcsd0s2a / ufs rw,noatime 1 1
2+
/dev/mmcsd0s1 /boot/msdos msdosfs rw,noatime 0 0
23
md /tmp mfs rw,noatime,-s30m 0 0
34
md /var/log mfs rw,noatime,-s15m 0 0
45
md /var/tmp mfs rw,noatime,-s5m 0 0

‎board/WandboardQuad/setup.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,9 @@ wandboard_uboot_install ( ) {
5656
#
5757
# ubldr
5858
#
59-
strategy_add $PHASE_BUILD_OTHER freebsd_ubldr_build UBLDR_LOADADDR=0x10800000
59+
strategy_add $PHASE_BUILD_OTHER freebsd_ubldr_build UBLDR_LOADADDR=0x88000000
6060
strategy_add $PHASE_BOOT_INSTALL freebsd_ubldr_copy_ubldr ubldr
6161

62-
#
63-
#
64-
#
65-
wandboard_kernel_install ( ) {
66-
echo "Installing kernel"
67-
cp ${FREEBSD_OBJDIR}/sys/${KERNCONF}/kernel .
68-
cp ${FREEBSD_OBJDIR}/sys/${KERNCONF}/kernel.bin .
69-
}
70-
strategy_add $PHASE_BOOT_INSTALL wandboard_kernel_install
71-
7262
#
7363
# uEnv
7464
#

0 commit comments

Comments
 (0)