Page MenuHomeFreeBSD
Files F148608631

D16599.id46325.diff
No OneTemporary
Actions

D16599.id46325.diff
View Options

Index: sysutils/u-boot-beaglebone/Makefile
===================================================================
--- sysutils/u-boot-beaglebone/Makefile
+++ sysutils/u-boot-beaglebone/Makefile
@@ -6,4 +6,7 @@
BOARD_CONFIG= am335x_boneblack_defconfig
FAMILY= omap
+CONFIG_FRAGMENT= ${.CURDIR}/files/bbb_fragment
+FRAGMENT_NAME= bbb_fragment
+
.include "${MASTERDIR}/Makefile"
Index: sysutils/u-boot-beaglebone/files/bbb_fragment
===================================================================
--- /dev/null
+++ sysutils/u-boot-beaglebone/files/bbb_fragment
@@ -0,0 +1,4 @@
+CONFIG_API=y
+CONFIG_ARMV7_NONSEC=n
+CONFIG_CMD_CACHE=y
+CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run distro_bootcmd"
Index: sysutils/u-boot-master/Makefile
===================================================================
--- sysutils/u-boot-master/Makefile
+++ sysutils/u-boot-master/Makefile
@@ -5,7 +5,7 @@
PORTNAME= u-boot
PORTVERSION= ${UBOOT_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
PKGNAMESUFFIX?= -${MODEL}
MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/
@@ -84,6 +84,12 @@
UBOOT_METADATA_RPI_FILES= ${UBOOT_PLIST_RPI}
UBOOT_METADATA_RPI_METHOD= file
+# Overrides for IMX6 family
+UBOOT_METADATA_IMX6_FILES= u-boot.imx
+UBOOT_METADATA_IMX6_METHOD= raw
+UBOOT_METADATA_IMX6_RAW_OFFSET= 2
+UBOOT_METADATA_IMX6_RAW_BS= 512
+
# Uboot variables
.if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
Index: sysutils/u-boot-master/files/patch-api_api.c
===================================================================
--- sysutils/u-boot-master/files/patch-api_api.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- api/api.c.orig 2018-01-09 01:25:29 UTC
-+++ api/api.c
-@@ -290,6 +290,11 @@ static int API_dev_close(va_list ap)
- if (!err)
- di->state = DEV_STA_CLOSED;
-
-+ if (dcache_status())
-+ flush_dcache_all();
-+ if (icache_status())
-+ invalidate_icache_all();
-+
- return err;
- }
-
Index: sysutils/u-boot-master/files/patch-cmd_boot.c
===================================================================
--- sysutils/u-boot-master/files/patch-cmd_boot.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmd/boot.c.orig 2018-01-09 01:25:29 UTC
-+++ cmd/boot.c
-@@ -19,6 +19,10 @@ __attribute__((weak))
- unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
- char * const argv[])
- {
-+ if (dcache_status())
-+ flush_dcache_all();
-+ if (icache_status())
-+ invalidate_icache_all();
- return entry (argc, argv);
- }
-
Index: sysutils/u-boot-master/files/patch-cmd_elf.c
===================================================================
--- sysutils/u-boot-master/files/patch-cmd_elf.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- cmd/elf.c.orig 2018-01-09 01:25:29 UTC
-+++ cmd/elf.c
-@@ -109,6 +109,11 @@ static unsigned long do_bootelf_exec(ulong (*entry)(in
- {
- unsigned long ret;
-
-+ if (dcache_status())
-+ flush_dcache_all();
-+ if (icache_status())
-+ invalidate_icache_all();
-+
- /*
- * pass address parameter as argv[0] (aka command name),
- * and all remaining args
Index: sysutils/u-boot-riotboard/Makefile
===================================================================
--- sysutils/u-boot-riotboard/Makefile
+++ sysutils/u-boot-riotboard/Makefile
@@ -4,7 +4,7 @@
MODEL= riotboard
BOARD_CONFIG= riotboard_defconfig
-FAMILY= riotboard
+FAMILY= imx6
UBOOT_PLIST= u-boot.imx

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 20, 3:05 AM (4 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29994259
Default Alt Text
D16599.id46325.diff (3 KB)

Event Timeline