[uboot-tools] Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
Dennis Gilmore
ausil at fedoraproject.org
Thu Sep 18 13:40:18 UTC 2014
commit 55459c799be29a1b92aa5742aa673db1b4109b45
Author: Dennis Gilmore <dennis at ausil.us>
Date: Thu Sep 18 08:40:18 2014 -0500
Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
...a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch | 126 ---
...-wandboard-port-to-generic-distro-booting.patch | 139 ++++
...Update-the-ramdisk-args-we-pass-things-in.patch | 27 -
...Update-the-ramdisk-args-we-pass-things-in.patch | 27 -
...ditionaly-check-for-fdt_file-env-variable.patch | 32 -
...convert-snowball-to-distro-generic-config.patch | 131 ----
...ard-over-to-use-the-generic-distro-config.patch | 168 ----
...ver-to-use-the-generic-distro-configuatio.patch | 168 ----
...oard-over-to-use-the-generic-distro-confi.patch | 118 ---
...bone-over-to-use-the-generic-distro-confi.patch | 137 ----
...with-a-generic-set-of-boot-commands-defin.patch | 236 ------
0011-add-README.distro-file.patch | 98 ---
...cleanup-duplicate-options-in-paz00-config.patch | 25 -
...-hackish-utilite-build-based-on-wandboard.patch | 601 --------------
...rmv7_common.h-generic-distro-environment-.patch | 29 -
0015-omap4-buildfixes.patch | 27 -
...ly-add-console-to-bootline-when-not-exist.patch | 60 --
...ootdelay-match-the-generic-distro-default.patch | 25 -
...-sunxi-add-sun7i-clocks-and-timer-support.patch | 818 --------------------
0019-sunxi-add-sun7i-pinmux-and-gpio-support.patch | 262 -------
0020-sunxi-add-sun7i-dram-setup-support.patch | 786 -------------------
...-sun7i-cpu-board-and-start-of-day-support.patch | 713 -----------------
...upport-for-Cubietruck-booting-in-FEL-mode.patch | 77 --
0023-sunxi-add-gmac-Ethernet-support.patch | 168 ----
0024-sunxi-mmc-support.patch | 797 -------------------
...-sunxi-non-FEL-SPL-boot-support-for-sun7i.patch | 409 ----------
0026-port-over-to-generic-bootcommands.patch | 53 --
...-sec-move-switch-to-non-sec-to-the-last-b.patch | 44 --
...-sec-add-a-barrier-after-setting-SCR.NS-1.patch | 28 -
0029-ARM-non-sec-reset-CNTVOFF-to-zero.patch | 50 --
0030-ARM-add-missing-HYP-mode-constant.patch | 53 --
...-sec-add-separate-section-for-secure-code.patch | 93 ---
...YP-non-sec-allow-relocation-to-secure-RAM.patch | 499 ------------
...M-HYP-non-sec-add-generic-ARMv7-PSCI-code.patch | 185 -----
...-sec-add-the-option-for-a-second-stage-mo.patch | 47 --
...-arch_fixup_memory_node-to-a-generic-FDT-.patch | 97 ---
0036-ARM-HYP-non-sec-PSCI-emit-DT-nodes.patch | 187 -----
...x-implenets-some-keywords-found-in-config.patch | 68 --
...-implementing-syslinux-will-be-using-raw-.patch | 38 -
0039-sunxi-fix-SRAM_B-SRAM_D-memory-map.patch | 31 -
0040-sunxi-add-hyp-support-on-sun7i.patch | 227 ------
uboot-tools.spec | 86 +--
42 files changed, 143 insertions(+), 7847 deletions(-)
---
diff --git a/0001-wandboard-port-to-generic-distro-booting.patch b/0001-wandboard-port-to-generic-distro-booting.patch
new file mode 100644
index 0000000..a4fbfe7
--- /dev/null
+++ b/0001-wandboard-port-to-generic-distro-booting.patch
@@ -0,0 +1,139 @@
+From bbf39abc70115a2be94738b849920be095ae481c Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Wed, 10 Sep 2014 10:57:16 -0500
+Subject: [PATCH] wandboard: port to generic distro booting
+
+set the variables and functions needed for generic distro booting.
+---
+ include/configs/wandboard.h | 48 ++++++++++++++++++++++++---------------------
+ 1 file changed, 26 insertions(+), 22 deletions(-)
+
+diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
+index 7d96908..cd42523 100644
+--- a/include/configs/wandboard.h
++++ b/include/configs/wandboard.h
+@@ -51,8 +51,6 @@
+ #define CONFIG_CMD_BMODE
+ #define CONFIG_CMD_SETEXPR
+
+-#define CONFIG_BOOTDELAY 5
+-
+ #define CONFIG_SYS_MEMTEST_START 0x10000000
+ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
+ #define CONFIG_LOADADDR 0x12000000
+@@ -74,15 +72,8 @@
+ #define CONFIG_CMD_MMC
+ #define CONFIG_GENERIC_MMC
+ #define CONFIG_BOUNCE_BUFFER
+-#define CONFIG_CMD_EXT2
+-#define CONFIG_CMD_FAT
+-#define CONFIG_DOS_PARTITION
+
+ /* Ethernet Configuration */
+-#define CONFIG_CMD_PING
+-#define CONFIG_CMD_DHCP
+-#define CONFIG_CMD_MII
+-#define CONFIG_CMD_NET
+ #define CONFIG_FEC_MXC
+ #define CONFIG_MII
+ #define IMX_FEC_BASE ENET_BASE_ADDR
+@@ -110,6 +101,16 @@
+ #define CONFIG_IMX_HDMI
+ #define CONFIG_IMX_VIDEO_SKIP
+
++#ifndef CONFIG_SPL_BUILD
++#include <config_distro_defaults.h>
++#include <config_distro_bootcmd.h>
++
++#define BOOT_TARGET_DEVICES(func) \
++ func(MMC, mmc, 0) \
++ func(PXE, pxe, na) \
++ func(DHCP, dhcp, na)
++
++
+ #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
+ #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb"
+ #elif defined(CONFIG_MX6Q)
+@@ -119,13 +120,16 @@
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ "script=boot.scr\0" \
+ "image=zImage\0" \
+- "console=ttymxc0\0" \
++ "console=ttymxc0,115200\0" \
+ "splashpos=m,m\0" \
+- "fdt_high=0xffffffff\0" \
+- "initrd_high=0xffffffff\0" \
+- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+- "fdt_addr=0x18000000\0" \
++ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
++ "fdt_addr_r=0x18000000\0" \
+ "boot_fdt=try\0" \
++ "pxefile_addr_r=0x17f00000\0" \
++ "scriptaddr=0x17e00000\0" \
++ "kernel_addr_r=0x11000000\0" \
++ "ramdisk_addr_r=0x18100000\0" \
++ "bootm_size=0x20000000\0" \
+ "ip_dyn=yes\0" \
+ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+ "mmcpart=1\0" \
+@@ -144,7 +148,7 @@
+ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \
+ "fi; " \
+ "fi\0" \
+- "mmcargs=setenv bootargs console=${console},${baudrate} " \
++ "mmcargs=setenv bootargs console=${console} " \
+ "root=${mmcroot}; run videoargs\0" \
+ "videoargs=" \
+ "setenv nextcon 0; " \
+@@ -193,7 +197,7 @@
+ "else " \
+ "bootz; " \
+ "fi;\0" \
+- "netargs=setenv bootargs console=${console},${baudrate} " \
++ "netargs=setenv bootargs console=${console} " \
+ "root=/dev/nfs " \
+ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
+ "netboot=echo Booting from net ...; " \
+@@ -216,7 +220,8 @@
+ "fi; " \
+ "else " \
+ "bootz; " \
+- "fi;\0"
++ "fi;\0" \
++ BOOTENV
+
+ #define CONFIG_BOOTCOMMAND \
+ "mmc dev ${mmcdev}; if mmc rescan; then " \
+@@ -230,6 +235,10 @@
+ "fi; " \
+ "else run netboot; fi"
+
++#else
++#define BOOT_TARGET_DEVICES
++#endif
++
+ /* Miscellaneous configurable options */
+ #define CONFIG_SYS_LONGHELP
+ #define CONFIG_SYS_HUSH_PARSER
+@@ -243,8 +252,6 @@
+
+ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
+
+-#define CONFIG_CMDLINE_EDITING
+-
+ /* Physical Memory Map */
+ #define CONFIG_NR_DRAM_BANKS 1
+ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
+@@ -267,9 +274,6 @@
+ #define CONFIG_ENV_OFFSET (6 * 64 * 1024)
+ #define CONFIG_SYS_MMC_ENV_DEV 0
+
+-#define CONFIG_OF_LIBFDT
+-#define CONFIG_CMD_BOOTZ
+-
+ #ifndef CONFIG_SYS_DCACHE_OFF
+ #define CONFIG_CMD_CACHE
+ #endif
+--
+2.1.0
+
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 79b83ae..7f1b92e 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -1,8 +1,8 @@
-#global candidate
+%global candidate rc2
Name: uboot-tools
-Version: 2014.04
-Release: 7%{?candidate:.%{candidate}}%{?dist}
+Version: 2014.10
+Release: 0.1%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities
Group: Development/Tools
@@ -12,46 +12,7 @@ Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{ca
Source1: uEnv.txt
Patch1: u-boot-fat.patch
-Patch10: 0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch
-Patch11: 0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch
-Patch12: 0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch
-Patch13: 0004-pxe-additionaly-check-for-fdt_file-env-variable.patch
-Patch14: 0005-convert-snowball-to-distro-generic-config.patch
-Patch15: 0006-move-wandboard-over-to-use-the-generic-distro-config.patch
-Patch16: 0007-move-udoo-over-to-use-the-generic-distro-configuatio.patch
-Patch17: 0008-move-pandaboard-over-to-use-the-generic-distro-confi.patch
-Patch18: 0009-move-beaglebone-over-to-use-the-generic-distro-confi.patch
-Patch19: 0010-add-header-with-a-generic-set-of-boot-commands-defin.patch
-Patch20: 0011-add-README.distro-file.patch
-Patch21: 0012-cleanup-duplicate-options-in-paz00-config.patch
-Patch22: 0013-add-hackish-utilite-build-based-on-wandboard.patch
-Patch23: 0014-add-to-ti_armv7_common.h-generic-distro-environment-.patch
-Patch24: 0015-omap4-buildfixes.patch
-Patch25: 0016-automatically-add-console-to-bootline-when-not-exist.patch
-Patch26: 0017-make-bootdelay-match-the-generic-distro-default.patch
-Patch27: 0018-sunxi-add-sun7i-clocks-and-timer-support.patch
-Patch28: 0019-sunxi-add-sun7i-pinmux-and-gpio-support.patch
-Patch29: 0020-sunxi-add-sun7i-dram-setup-support.patch
-Patch30: 0021-sunxi-add-sun7i-cpu-board-and-start-of-day-support.patch
-Patch31: 0022-sunxi-add-support-for-Cubietruck-booting-in-FEL-mode.patch
-Patch32: 0023-sunxi-add-gmac-Ethernet-support.patch
-Patch33: 0024-sunxi-mmc-support.patch
-Patch34: 0025-sunxi-non-FEL-SPL-boot-support-for-sun7i.patch
-Patch35: 0026-port-over-to-generic-bootcommands.patch
-Patch36: 0027-ARM-HYP-non-sec-move-switch-to-non-sec-to-the-last-b.patch
-Patch37: 0028-ARM-HYP-non-sec-add-a-barrier-after-setting-SCR.NS-1.patch
-Patch38: 0029-ARM-non-sec-reset-CNTVOFF-to-zero.patch
-Patch39: 0030-ARM-add-missing-HYP-mode-constant.patch
-Patch40: 0031-ARM-HYP-non-sec-add-separate-section-for-secure-code.patch
-Patch41: 0032-ARM-HYP-non-sec-allow-relocation-to-secure-RAM.patch
-Patch42: 0033-ARM-HYP-non-sec-add-generic-ARMv7-PSCI-code.patch
-Patch43: 0034-ARM-HYP-non-sec-add-the-option-for-a-second-stage-mo.patch
-Patch44: 0035-ARM-convert-arch_fixup_memory_node-to-a-generic-FDT-.patch
-Patch45: 0036-ARM-HYP-non-sec-PSCI-emit-DT-nodes.patch
-Patch46: 0037-PXE-syslinux-implenets-some-keywords-found-in-config.patch
-Patch47: 0038-PXE-distros-implementing-syslinux-will-be-using-raw-.patch
-Patch48: 0039-sunxi-fix-SRAM_B-SRAM_D-memory-map.patch
-Patch49: 0040-sunxi-add-hyp-support-on-sun7i.patch
+Patch10: 0001-wandboard-port-to-generic-distro-booting.patch
BuildRequires: dtc
BuildRequires: fedora-logos, netpbm-progs
@@ -116,45 +77,6 @@ u-boot bootloader binaries for armv7 boards
%patch1 -p1
%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
mkdir builds
# convert fedora logo to bmp for use in u-boot
More information about the scm-commits
mailing list