Dennis Gilmore
parent
c75774dd93
commit
4bad927947
|
|
@ -1,7 +1,7 @@
|
|||
From a28aee469dd0c3efb5407295d8d7d792327236e4 Mon Sep 17 00:00:00 2001
|
||||
From 5f854c52e79c0efa552625a494ebb01bd044dbea Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Wed, 1 Oct 2014 13:20:53 -0700
|
||||
Subject: [PATCH 1/7] Allow checking in multiple partitions for
|
||||
Subject: [PATCH 01/12] Allow checking in multiple partitions for
|
||||
scan_dev_for_boot.
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
From 63067bd8536deefd1017992954538721c92ab794 Mon Sep 17 00:00:00 2001
|
||||
From 2e18c03d8988e2873ff771675591905fdbdca6f9 Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Wed, 1 Oct 2014 12:55:58 -0700
|
||||
Subject: [PATCH 2/7] Allow overriding boot_partitions default value by setting
|
||||
BOOTENV_BOOT_PARTITIONS before including config_distro_bootcmd.
|
||||
Subject: [PATCH 02/12] Allow overriding boot_partitions default value by
|
||||
setting BOOTENV_BOOT_PARTITIONS before including config_distro_bootcmd.
|
||||
|
||||
---
|
||||
include/config_distro_bootcmd.h | 6 +++++-
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
From dfc773d1d2f33dbfbf6c75d001f5f0be371db795 Mon Sep 17 00:00:00 2001
|
||||
From da59908a3db4c6221e6c825de3f11f1ef875e99d Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Tue, 30 Sep 2014 20:02:26 -0700
|
||||
Subject: [PATCH 3/7] Add BOOTENV_INIT_COMMAND for commands that may be needed
|
||||
to run before bootcmd, such as setting the fdt file variables for platfroms
|
||||
that detect on boot.
|
||||
Subject: [PATCH 03/12] Add BOOTENV_INIT_COMMAND for commands that may be
|
||||
needed to run before bootcmd, such as setting the fdt file variables for
|
||||
platfroms that detect on boot.
|
||||
|
||||
---
|
||||
include/config_distro_bootcmd.h | 7 ++++++-
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
From 310ce4053e0d32eb8b8d0ab6490c2c8924951884 Mon Sep 17 00:00:00 2001
|
||||
From 895199928ee42253714766421586bfba8132a7af Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Wed, 1 Oct 2014 14:04:01 -0700
|
||||
Subject: [PATCH 4/7] Add BOOTENV_POST_COMMAND, which is appended to the end of
|
||||
bootcmd.
|
||||
Subject: [PATCH 04/12] Add BOOTENV_POST_COMMAND, which is appended to the end
|
||||
of bootcmd.
|
||||
|
||||
---
|
||||
include/config_distro_bootcmd.h | 8 +++++++-
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 6a683c290cd95de0bc1a77f2291a4ab2e82ceeb3 Mon Sep 17 00:00:00 2001
|
||||
From 99a473134671c1f430269b9b16faaecfcfe9959f Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Tue, 30 Sep 2014 20:34:19 -0700
|
||||
Subject: [PATCH 5/7] Only set CONFIG_BOOTDELAY if not already set.
|
||||
Subject: [PATCH 05/12] Only set CONFIG_BOOTDELAY if not already set.
|
||||
|
||||
---
|
||||
include/config_distro_defaults.h | 2 ++
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 38339ff8554ca8b70c87d6939aeea86f4960a6ee Mon Sep 17 00:00:00 2001
|
||||
From 3661e50cfe0b4d5cf045be749e3cc4858acc4957 Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Wed, 1 Oct 2014 10:29:36 -0700
|
||||
Subject: [PATCH 6/7] Add support for loading environment from uEnv.txt in
|
||||
Subject: [PATCH 06/12] Add support for loading environment from uEnv.txt in
|
||||
config_distro_bootcmd.
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 7ae64b5379a6fd1f3bf46df308c4b753c7357a6c Mon Sep 17 00:00:00 2001
|
||||
From 4326956e87cbfc913b19dd735b534610cd2b38e6 Mon Sep 17 00:00:00 2001
|
||||
From: Vagrant Cascadian <vagrant@debian.org>
|
||||
Date: Wed, 1 Oct 2014 13:28:18 -0700
|
||||
Subject: [PATCH 7/7] Switch am335x_evm.h to use config_distro_defaults and
|
||||
Subject: [PATCH 07/12] Switch am335x_evm.h to use config_distro_defaults and
|
||||
config_distro_bootcmd. Add scriptaddr to DEFAULT_LINUX_BOOT_ENV, as
|
||||
scriptaddr is used for boot scripts in config_distro_defaults.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From bbf39abc70115a2be94738b849920be095ae481c Mon Sep 17 00:00:00 2001
|
||||
From 69b8812eec97af45dbd54699988f30044e40869e Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Wed, 10 Sep 2014 10:57:16 -0500
|
||||
Subject: [PATCH] wandboard: port to generic distro booting
|
||||
Subject: [PATCH 08/12] wandboard: port to generic distro booting
|
||||
|
||||
set the variables and functions needed for generic distro booting.
|
||||
---
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
From 8f0930046dbe8d417650b5fb4e5049ffdc17371d Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Tue, 30 Sep 2014 18:45:32 +0200
|
||||
Subject: [PATCH 09/12] sunxi: Fix gmac not working reliable on the Bananapi
|
||||
|
||||
In order for the gmac nic to work reliable on the Bananapi, we need to set
|
||||
bits 10-12 GTXDC "GMAC Transmit Clock Delay Chain" of the GMAC clk register
|
||||
(0x01c20164) to 3.
|
||||
|
||||
Without this about 9 out of 10 ethernet packets get lost, with this setting
|
||||
there is no packet loss.
|
||||
|
||||
So far setting these bits is only necessary on the Bananapi, so this commit
|
||||
solves this with a bit of #ifdef CONFIG_BANANAPI code. If in the future we
|
||||
need to do something similar for other boards, we can create a specific
|
||||
CONFIG_FOO option for this then.
|
||||
|
||||
Reported-by: Karsten Merker <merker@debian.org>
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Tested-by: Karsten Merker <merker@debian.org>
|
||||
Tested-by: Zoltan HERPAI <wigyori@openwrt.org>
|
||||
Tested-by: Tony Zhang <tony.zhang@lemaker.org>
|
||||
Acked-by: Ian Campbell <ijc@hellion.org.uk>
|
||||
---
|
||||
board/sunxi/gmac.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
|
||||
index e7ff952..6348d27 100644
|
||||
--- a/board/sunxi/gmac.c
|
||||
+++ b/board/sunxi/gmac.c
|
||||
@@ -24,6 +24,15 @@ int sunxi_gmac_initialize(bd_t *bis)
|
||||
CCM_GMAC_CTRL_GPIT_MII);
|
||||
#endif
|
||||
|
||||
+ /*
|
||||
+ * In order for the gmac nic to work reliable on the Bananapi, we
|
||||
+ * need to set bits 10-12 GTXDC "GMAC Transmit Clock Delay Chain"
|
||||
+ * of the GMAC clk register to 3.
|
||||
+ */
|
||||
+#ifdef CONFIG_BANANAPI
|
||||
+ setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10);
|
||||
+#endif
|
||||
+
|
||||
/* Configure pin mux settings for GMAC */
|
||||
for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) {
|
||||
#ifdef CONFIG_RGMII
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
From 72005a3bb4c6c86ddcf811b265dc2a5a357c60a4 Mon Sep 17 00:00:00 2001
|
||||
From: Nikita Kiryanov <nikita@compulab.co.il>
|
||||
Date: Wed, 17 Sep 2014 15:59:25 +0300
|
||||
Subject: [PATCH 10/12] compulab: eeprom: add default eeprom bus
|
||||
|
||||
Add default eeprom bus setting.
|
||||
This addresses the trimslice compile error that was introduced
|
||||
with the addition of this setting.
|
||||
|
||||
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
|
||||
Cc: Igor Grinberg <grinberg@compulab.co.il>
|
||||
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
|
||||
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
|
||||
---
|
||||
board/compulab/common/eeprom.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
|
||||
index 85442cd..2df3ada 100644
|
||||
--- a/board/compulab/common/eeprom.c
|
||||
+++ b/board/compulab/common/eeprom.c
|
||||
@@ -15,6 +15,10 @@
|
||||
# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
|
||||
#endif
|
||||
|
||||
+#ifndef CONFIG_SYS_I2C_EEPROM_BUS
|
||||
+#define CONFIG_SYS_I2C_EEPROM_BUS 0
|
||||
+#endif
|
||||
+
|
||||
#define EEPROM_LAYOUT_VER_OFFSET 44
|
||||
#define BOARD_SERIAL_OFFSET 20
|
||||
#define BOARD_SERIAL_OFFSET_LEGACY 8
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -1,5 +1,17 @@
|
|||
--- u-boot-2014.10-rc2/include/configs/embestmx6boards.h.orig 2014-09-29 12:37:12.391839941 +0100
|
||||
+++ u-boot-2014.10-rc2/include/configs/embestmx6boards.h 2014-09-29 14:30:35.763497826 +0100
|
||||
From a0c28ea3f2518734be16022ad25920dcd66e102c Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Mon, 13 Oct 2014 23:17:32 -0500
|
||||
Subject: [PATCH 11/12] port the riotboard to distro generic configs, patch by
|
||||
pbrobinson
|
||||
|
||||
---
|
||||
include/configs/embestmx6boards.h | 39 ++++++++++++++++++++++++---------------
|
||||
1 file changed, 24 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
|
||||
index 185edbe..e75ee89 100644
|
||||
--- a/include/configs/embestmx6boards.h
|
||||
+++ b/include/configs/embestmx6boards.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#define CONFIG_SYS_GENERIC_BOARD
|
||||
|
||||
|
|
@ -85,3 +97,6 @@
|
|||
|
||||
+
|
||||
#endif /* __RIOTBOARD_CONFIG_H */
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -0,0 +1,149 @@
|
|||
From 210dde2aaf9a998e759c68bad0a4384559a398e3 Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Mon, 13 Oct 2014 23:58:13 -0500
|
||||
Subject: [PATCH 12/12] port utilite to distro generic boot commands
|
||||
|
||||
---
|
||||
include/configs/cm_fx6.h | 112 +++++++++++------------------------------------
|
||||
1 file changed, 26 insertions(+), 86 deletions(-)
|
||||
|
||||
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
|
||||
index 10d02b4..1f0179e 100644
|
||||
--- a/include/configs/cm_fx6.h
|
||||
+++ b/include/configs/cm_fx6.h
|
||||
@@ -12,7 +12,6 @@
|
||||
#define __CONFIG_CM_FX6_H
|
||||
|
||||
#include <asm/arch/imx-regs.h>
|
||||
-#include <config_distro_defaults.h>
|
||||
#include "mx6_common.h"
|
||||
|
||||
/* Machine config */
|
||||
@@ -92,98 +91,39 @@
|
||||
#define CONFIG_ENV_SIZE (8 * 1024)
|
||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||
|
||||
+#ifndef CONFIG_SPL_BUILD
|
||||
+#include <config_distro_defaults.h>
|
||||
+#include <config_distro_bootcmd.h>
|
||||
+
|
||||
+#ifdef CONFIG_AHCI
|
||||
+#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
|
||||
+#else
|
||||
+#define BOOT_TARGET_DEVICES_SCSI(func)
|
||||
+#endif
|
||||
+
|
||||
+#define BOOT_TARGET_DEVICES(func) \
|
||||
+ func(MMC, mmc, 2) \
|
||||
+ BOOT_TARGET_DEVICES_SCSI(func) \
|
||||
+ func(PXE, pxe, na) \
|
||||
+ func(DHCP, dhcp, na)
|
||||
+
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
- "kernel=uImage-cm-fx6\0" \
|
||||
- "autoload=no\0" \
|
||||
"loadaddr=0x10800000\0" \
|
||||
"fdtaddr=0x11000000\0" \
|
||||
+ "fdt_addr_r=0x18000000\0" \
|
||||
+ "pxefile_addr_r=0x17f00000\0" \
|
||||
+ "scriptaddr=0x17e00000\0" \
|
||||
+ "kernel_addr_r=0x11000000\0" \
|
||||
+ "ramdisk_addr_r=0x18100000\0" \
|
||||
+ "bootm_size=0x20000000\0" \
|
||||
"console=ttymxc3,115200\0" \
|
||||
"ethprime=FEC0\0" \
|
||||
- "bootscr=boot.scr\0" \
|
||||
- "bootm_low=18000000\0" \
|
||||
- "video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32@50,if=RGB32\0" \
|
||||
- "video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \
|
||||
"fdtfile=cm-fx6.dtb\0" \
|
||||
- "doboot=bootm ${loadaddr}\0" \
|
||||
- "loadfdt=false\0" \
|
||||
- "setboottypez=setenv kernel zImage-cm-fx6;" \
|
||||
- "setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
|
||||
- "setenv loadfdt true;\0" \
|
||||
- "setboottypem=setenv kernel uImage-cm-fx6;" \
|
||||
- "setenv doboot bootm ${loadaddr};" \
|
||||
- "setenv loadfdt false;\0"\
|
||||
- "run_eboot=echo Starting EBOOT ...; "\
|
||||
- "mmc dev ${mmcdev} && " \
|
||||
- "mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \
|
||||
- "mmcdev=2\0" \
|
||||
- "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
|
||||
- "loadmmcbootscript=load mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \
|
||||
- "mmcbootscript=echo Running bootscript from mmc ...; "\
|
||||
- "source ${loadaddr}\0" \
|
||||
- "mmcargs=setenv bootargs console=${console} " \
|
||||
- "root=${mmcroot} " \
|
||||
- "${video}\0" \
|
||||
- "mmcloadkernel=load mmc ${mmcdev} ${loadaddr} ${kernel}\0" \
|
||||
- "mmcloadfdt=load mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
|
||||
- "mmcboot=echo Booting from mmc ...; " \
|
||||
- "run mmcargs; " \
|
||||
- "run doboot\0" \
|
||||
- "satadev=0\0" \
|
||||
- "sataroot=/dev/sda2 rw rootwait\0" \
|
||||
- "sataargs=setenv bootargs console=${console} " \
|
||||
- "root=${sataroot} " \
|
||||
- "${video}\0" \
|
||||
- "loadsatabootscript=load sata ${satadev} ${loadaddr} ${bootscr}\0" \
|
||||
- "satabootscript=echo Running bootscript from sata ...; " \
|
||||
- "source ${loadaddr}\0" \
|
||||
- "sataloadkernel=load sata ${satadev} ${loadaddr} ${kernel}\0" \
|
||||
- "sataloadfdt=load sata ${satadev} ${fdtaddr} ${fdtfile}\0" \
|
||||
- "sataboot=echo Booting from sata ...; "\
|
||||
- "run sataargs; " \
|
||||
- "run doboot\0" \
|
||||
- "nandroot=/dev/mtdblock4 rw\0" \
|
||||
- "nandrootfstype=ubifs\0" \
|
||||
- "nandargs=setenv bootargs console=${console} " \
|
||||
- "root=${nandroot} " \
|
||||
- "rootfstype=${nandrootfstype} " \
|
||||
- "${video}\0" \
|
||||
- "nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \
|
||||
- "nandboot=echo Booting from nand ...; " \
|
||||
- "run nandargs; " \
|
||||
- "nand read ${loadaddr} 0 780000; " \
|
||||
- "if ${loadfdt}; then " \
|
||||
- "run nandloadfdt;" \
|
||||
- "fi; " \
|
||||
- "run doboot\0" \
|
||||
- "boot=mmc dev ${mmcdev}; " \
|
||||
- "if mmc rescan; then " \
|
||||
- "if run loadmmcbootscript; then " \
|
||||
- "run mmcbootscript;" \
|
||||
- "else " \
|
||||
- "if run mmcloadkernel; then " \
|
||||
- "if ${loadfdt}; then " \
|
||||
- "run mmcloadfdt;" \
|
||||
- "fi;" \
|
||||
- "run mmcboot;" \
|
||||
- "fi;" \
|
||||
- "fi;" \
|
||||
- "fi;" \
|
||||
- "if sata init; then " \
|
||||
- "if run loadsatabootscript; then " \
|
||||
- "run satabootscript;" \
|
||||
- "else "\
|
||||
- "if run sataloadkernel; then " \
|
||||
- "if ${loadfdt}; then " \
|
||||
- "run sataloadfdt; " \
|
||||
- "fi;" \
|
||||
- "run sataboot;" \
|
||||
- "fi;" \
|
||||
- "fi;" \
|
||||
- "fi;" \
|
||||
- "run nandboot\0"
|
||||
+ BOOTENV
|
||||
|
||||
-#define CONFIG_BOOTCOMMAND \
|
||||
- "run setboottypem; run boot"
|
||||
+#else /* ifndef CONFIG_SPL_BUILD */
|
||||
+#define CONFIG_EXTRA_ENV_SETTINGS
|
||||
+#endif
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_SPI
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
In order for the gmac nic to work reliable on the Bananapi, we need to poke
|
||||
these 2 undocumented bits in the gmac clk register. Since these are
|
||||
undocumented, this commit only sets these bits on the Bananapi for now.
|
||||
|
||||
I'll contact Allwinner to try and get these bits documented, once they
|
||||
are documented we can hopefully replace this hack with a better patch.
|
||||
|
||||
Reported-by: Karsten Merker <merker at debian.org>
|
||||
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
|
||||
---
|
||||
board/sunxi/gmac.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
|
||||
index e7ff952..f58c963 100644
|
||||
--- a/board/sunxi/gmac.c
|
||||
+++ b/board/sunxi/gmac.c
|
||||
@@ -24,6 +24,15 @@ int sunxi_gmac_initialize(bd_t *bis)
|
||||
CCM_GMAC_CTRL_GPIT_MII);
|
||||
#endif
|
||||
|
||||
+ /*
|
||||
+ * HdG: this is necessary to get GMAC to work reliable on the
|
||||
+ * Bananapi. We don't know what these undocumented bits do, so this
|
||||
+ * is a Bananapi specific hack for now.
|
||||
+ */
|
||||
+#ifdef CONFIG_BANANAPI
|
||||
+ setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10);
|
||||
+#endif
|
||||
+
|
||||
/* Configure pin mux settings for GMAC */
|
||||
for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) {
|
||||
#ifdef CONFIG_RGMII
|
||||
--
|
||||
2.1.0
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c
|
||||
index 85442cd..2df3ada 100644
|
||||
--- a/board/compulab/common/eeprom.c
|
||||
+++ b/board/compulab/common/eeprom.c
|
||||
@@ -15,6 +15,10 @@
|
||||
# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
|
||||
#endif
|
||||
|
||||
+#ifndef CONFIG_SYS_I2C_EEPROM_BUS
|
||||
+#define CONFIG_SYS_I2C_EEPROM_BUS 0
|
||||
+#endif
|
||||
+
|
||||
#define EEPROM_LAYOUT_VER_OFFSET 44
|
||||
#define BOARD_SERIAL_OFFSET 20
|
||||
#define BOARD_SERIAL_OFFSET_LEGACY 8
|
||||
|
||||
|
||||
119
uboot-tools.spec
119
uboot-tools.spec
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
Name: uboot-tools
|
||||
Version: 2014.10
|
||||
Release: 0.5%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 0.7%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
|
||||
Group: Development/Tools
|
||||
|
|
@ -12,22 +12,18 @@ Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{ca
|
|||
Source1: uEnv.txt
|
||||
Patch1: u-boot-fat.patch
|
||||
|
||||
# Debian proposed improvements to distro defaults
|
||||
# http://lists.denx.de/pipermail/u-boot/2014-October/190627.html
|
||||
Patch11: 0001-Allow-checking-in-multiple-partitions-for-scan_dev_f.patch
|
||||
Patch12: 0002-Allow-overriding-boot_partitions-default-value-by-se.patch
|
||||
Patch13: 0003-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
||||
Patch14: 0004-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
|
||||
Patch15: 0005-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
|
||||
Patch16: 0006-Add-support-for-loading-environment-from-uEnv.txt-in.patch
|
||||
Patch17: 0007-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
|
||||
# Fedora patches for distro defaults support
|
||||
Patch20: 0001-wandboard-port-to-generic-distro-booting.patch
|
||||
Patch21: riotboard-port-to-generic-distro-booting.patch
|
||||
# Bug fixes
|
||||
# http://lists.denx.de/pipermail/u-boot/2014-September/190052.html
|
||||
Patch30: sun7i-bananapi-fixGmac.patch
|
||||
Patch31: trimslice-fixbuild.patch
|
||||
Patch10: 0001-Allow-checking-in-multiple-partitions-for-scan_dev_f.patch
|
||||
Patch11: 0002-Allow-overriding-boot_partitions-default-value-by-se.patch
|
||||
Patch12: 0003-Add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
|
||||
Patch13: 0004-Add-BOOTENV_POST_COMMAND-which-is-appended-to-the-en.patch
|
||||
Patch14: 0005-Only-set-CONFIG_BOOTDELAY-if-not-already-set.patch
|
||||
Patch15: 0006-Add-support-for-loading-environment-from-uEnv.txt-in.patch
|
||||
Patch16: 0007-Switch-am335x_evm.h-to-use-config_distro_defaults-an.patch
|
||||
Patch17: 0008-wandboard-port-to-generic-distro-booting.patch
|
||||
Patch18: 0009-sunxi-Fix-gmac-not-working-reliable-on-the-Bananapi.patch
|
||||
Patch19: 0010-compulab-eeprom-add-default-eeprom-bus.patch
|
||||
Patch20: 0011-port-the-riotboard-to-distro-generic-configs-patch-b.patch
|
||||
Patch21: 0012-port-utilite-to-distro-generic-boot-commands.patch
|
||||
|
||||
BuildRequires: dtc, openssl-devel
|
||||
BuildRequires: fedora-logos, netpbm-progs
|
||||
|
|
@ -98,12 +94,11 @@ u-boot bootloader binaries for armv7 boards
|
|||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
|
||||
%patch20 -p1 -b .wand
|
||||
%patch21 -p1 -b .riot
|
||||
|
||||
%patch30 -p1 -b .BPgmac
|
||||
%patch31 -p1 -b .ts
|
||||
|
||||
mkdir builds
|
||||
# convert fedora logo to bmp for use in u-boot
|
||||
|
|
@ -198,6 +193,12 @@ cp -p u-boot.bin builds/u-boot.bin.highbank
|
|||
make mrproper
|
||||
|
||||
# Freescale i.MX6
|
||||
make cm_fx6_defconfig
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
|
||||
cp -p u-boot.img builds/u-boot.img.cm_fx6
|
||||
cp -p SPL builds/SPL.cm_fx6
|
||||
make mrproper
|
||||
|
||||
make riotboard_defconfig
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1
|
||||
cp -p u-boot.imx builds/u-boot.imx.riotboard
|
||||
|
|
@ -327,51 +328,15 @@ install -p -m 0644 builds/u-boot.bin.vexpress_aemv8a $RPM_BUILD_ROOT%{_datadir}/
|
|||
|
||||
%ifarch %{arm}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/
|
||||
# ARM Vexpress
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/vexpress/
|
||||
|
||||
# AllWinner
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/Bananapi/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/Cubieboard/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/Cubieboard2/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/Cubietruck/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/Mele_A1000/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/Mele_A1000G/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/Mini-X/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/Mini-X-1Gb/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/A10-OLinuXino-Lime/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/A10s-OLinuXino-M/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/A13-OLinuXino/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/A13-OLinuXinoM/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/A20-OLinuXino_MICRO/
|
||||
# Calxeda
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/highbank/
|
||||
# FreeScale
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/riotboard/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/udoo_quad/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/wandboard_dl/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/wandboard_quad/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/wandboard_solo/
|
||||
# NVidia
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/jetson-tk1/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/paz00/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/trimslice/
|
||||
# Samsung
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/arndale/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/origen/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/smdkv310/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/snow/
|
||||
# STE
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/snowball/
|
||||
# TI
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/beagle/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/beaglebone/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/panda/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/uevm/
|
||||
for board in A10-OLinuXino-Lime A10s-OLinuXino-M A13-OLinuXino A13-OLinuXinoM A20-OLinuXino_MICRO arndale Bananapi beagle beaglebone cm_fx6 Cubieboard Cubieboard2 Cubietruck highbank jetson-tk1 Mele_A1000 Mele_A1000G Mini-X Mini-X-1Gb origen panda paz00 riotboard smdkv310 snow snowball trimslice udoo_quad uevm vexpress wandboard_dl wandboard_quad wandboard_solo
|
||||
do
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||
done
|
||||
|
||||
# AllWinner
|
||||
for board in Bananapi Cubieboard Cubieboard2 Cubietruck Mele_A1000 Mele_A1000G Mini-X Mini-X-1Gb A10-OLinuXino-Lime A10s-OLinuXino-M A13-OLinuXino A13-OLinuXinoM A20-OLinuXino_MICRO
|
||||
do
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||
install -p -m 0644 builds/u-boot-sunxi-with-spl.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-sunxi-with-spl.bin
|
||||
done
|
||||
|
||||
|
|
@ -379,14 +344,22 @@ done
|
|||
install -p -m 0644 builds/u-boot.bin.highbank $RPM_BUILD_ROOT%{_datadir}/uboot/highbank/u-boot.bin
|
||||
|
||||
# FreeScale
|
||||
for board in cm_fx6
|
||||
do
|
||||
install -p -m 0644 builds/u-boot.img.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.img
|
||||
install -p -m 0644 builds/SPL.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/SPL
|
||||
done
|
||||
|
||||
for board in riotboard udoo_quad wandboard_dl wandboard_quad wandboard_solo
|
||||
do
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||
install -p -m 0644 builds/u-boot.imx.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.imx
|
||||
done
|
||||
|
||||
# NVidia
|
||||
for board in paz00 trimslice jetson-tk1
|
||||
do
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||
install -p -m 0644 builds/u-boot-nodtb-tegra.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-nodtb-tegra.bin
|
||||
install -p -m 0644 builds/u-boot-dtb-tegra.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-dtb-tegra.bin
|
||||
install -p -m 0644 builds/u-boot.map.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.map
|
||||
|
|
@ -394,14 +367,12 @@ install -p -m 0644 builds/u-boot.dtb.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/u
|
|||
done
|
||||
|
||||
# Samsung
|
||||
install -p -m 0644 builds/arndale-spl.bin.arndale $RPM_BUILD_ROOT%{_datadir}/uboot/arndale/arndale-spl.bin
|
||||
install -p -m 0644 builds/u-boot-dtb.bin.arndale $RPM_BUILD_ROOT%{_datadir}/uboot/arndale/u-boot-dtb.bin
|
||||
|
||||
install -p -m 0644 builds/origen-spl.bin.origen $RPM_BUILD_ROOT%{_datadir}/uboot/origen/origen-spl.bin
|
||||
install -p -m 0644 builds/u-boot.bin.origen $RPM_BUILD_ROOT%{_datadir}/uboot/origen/u-boot.bin
|
||||
|
||||
install -p -m 0644 builds/smdkv310-spl.bin.smdkv310 $RPM_BUILD_ROOT%{_datadir}/uboot/smdkv310/smdkv310-spl.bin
|
||||
install -p -m 0644 builds/u-boot.bin.smdkv310 $RPM_BUILD_ROOT%{_datadir}/uboot/smdkv310/u-boot.bin
|
||||
for board in arndale origen smdkv310
|
||||
do
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||
install -p -m 0644 builds/$(echo $board)-spl.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/$(echo $board)-spl.bin
|
||||
install -p -m 0644 builds/u-boot-dtb.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-dtb.bin
|
||||
done
|
||||
|
||||
install -p -m 0644 builds/u-boot-dtb.bin.snow $RPM_BUILD_ROOT%{_datadir}/uboot/snow/u-boot-dtb.bin
|
||||
|
||||
|
|
@ -411,6 +382,7 @@ install -p -m 0644 builds/u-boot.bin.snowball $RPM_BUILD_ROOT%{_datadir}/uboot/s
|
|||
# TI
|
||||
for board in beaglebone beagle panda uevm
|
||||
do
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||
install -p -m 0644 builds/u-boot.img.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.img
|
||||
install -p -m 0644 builds/MLO.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/MLO
|
||||
done
|
||||
|
|
@ -473,6 +445,7 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
|||
# Calxeda
|
||||
%{_datadir}/uboot/highbank/
|
||||
# FreeScale
|
||||
%{_datadir}/uboot/cm_fx6/
|
||||
%{_datadir}/uboot/riotboard/
|
||||
%{_datadir}/uboot/wandboard_dl/
|
||||
%{_datadir}/uboot/wandboard_quad/
|
||||
|
|
@ -497,6 +470,10 @@ install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Oct 14 2014 Dennis Gilmore <dennis@ausil.us> - 2014.10-0.7.rc3
|
||||
- refacter making directories for images
|
||||
- make cm_fx6 image for utilite
|
||||
|
||||
* Wed Oct 8 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2014.10-0.6.rc3
|
||||
- Update to 2014.10 rc3
|
||||
- Add proposed distro patches from Debian
|
||||
|
|
|
|||
Loading…
Reference in New Issue