fix ftbfs for wandboard
- use _smp_mflags
This commit is contained in:
Dennis Gilmore
parent
741142d41f
commit
47938e12c6
@ -1,15 +1,14 @@
|
||||
From cf5beda60dcf4751d519f5c99321014ff2c566c8 Mon Sep 17 00:00:00 2001
|
||||
From 8141d31d3abbddc1463dad6a22e431510c4ce629 Mon Sep 17 00:00:00 2001
|
||||
From: Dennis Gilmore <dennis@ausil.us>
|
||||
Date: Sat, 19 Oct 2013 06:47:29 -0500
|
||||
Subject: [PATCH 16/16] WANDBOARD: use ext2load to load dtbs wrap some of the
|
||||
generic distro defined options in ifdef to avoid duplicate defines
|
||||
Subject: [PATCH 16/16] WANDBOARD: use ext2load to load dtbs
|
||||
|
||||
---
|
||||
include/configs/wandboard.h | 17 ++++++++++++-----
|
||||
1 file changed, 12 insertions(+), 5 deletions(-)
|
||||
include/configs/wandboard.h | 14 +++++++++-----
|
||||
1 file changed, 9 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
|
||||
index 135835f..b81092b 100644
|
||||
index 135835f..ae09f43 100644
|
||||
--- a/include/configs/wandboard.h
|
||||
+++ b/include/configs/wandboard.h
|
||||
@@ -51,7 +51,6 @@
|
||||
@ -20,18 +19,17 @@ index 135835f..b81092b 100644
|
||||
|
||||
#define CONFIG_SYS_MEMTEST_START 0x10000000
|
||||
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
|
||||
@@ -68,6 +67,10 @@
|
||||
@@ -68,6 +67,9 @@
|
||||
#define CONFIG_CMD_MMC
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_BOUNCE_BUFFER
|
||||
+
|
||||
+#ifndef DISTRO_DEFAULTS
|
||||
+#define CONFIG_BOOTDELAY 5
|
||||
+
|
||||
#define CONFIG_CMD_EXT2
|
||||
#define CONFIG_CMD_FAT
|
||||
#define CONFIG_DOS_PARTITION
|
||||
@@ -77,6 +80,13 @@
|
||||
@@ -77,6 +79,11 @@
|
||||
#define CONFIG_CMD_DHCP
|
||||
#define CONFIG_CMD_MII
|
||||
#define CONFIG_CMD_NET
|
||||
@ -39,13 +37,11 @@ index 135835f..b81092b 100644
|
||||
+#define CONFIG_OF_LIBFDT
|
||||
+#define CONFIG_CMD_BOOTZ
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+/* Ethernet Configuration */
|
||||
#define CONFIG_FEC_MXC
|
||||
#define CONFIG_MII
|
||||
#define IMX_FEC_BASE ENET_BASE_ADDR
|
||||
@@ -130,7 +140,7 @@
|
||||
@@ -130,7 +137,7 @@
|
||||
"bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
|
||||
"bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
|
||||
"bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
|
||||
@ -54,7 +50,7 @@ index 135835f..b81092b 100644
|
||||
"bootcmd_sata=setenv boot_ifc scsi; scsi scan && run bootcmd_disk\0" \
|
||||
"bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
|
||||
"bootcmd_default=run bootcmd_mmc; run bootcmd_sata; run bootcmd_pxe\0" \
|
||||
@@ -258,9 +268,6 @@
|
||||
@@ -258,9 +265,6 @@
|
||||
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
|
||||
#define CONFIG_SYS_MMC_ENV_DEV 0
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2013.10
|
||||
Release: 2%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 3%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
|
||||
Group: Development/Tools
|
||||
@ -184,98 +184,98 @@ mkdir builds
|
||||
%build
|
||||
%ifarch %{arm}
|
||||
make CROSS_COMPILE="" am335x_evm_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p MLO builds/MLO.beaglebone
|
||||
cp -p u-boot.img builds/u-boot.img.beaglebone
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" omap3_beagle_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p MLO builds/MLO.beagle
|
||||
cp -p u-boot.img builds/u-boot.img.beagle
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" arndale_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p spl/arndale-spl.bin builds/arndale-spl.bin.arndale
|
||||
cp -p u-boot-dtb.bin builds/u-boot-dtb.bin.arndale
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" highbank_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p u-boot.bin builds/u-boot.bin.highbank
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" omap4_panda_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p MLO builds/MLO.panda
|
||||
cp -p u-boot.img builds/u-boot.img.panda
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" origen_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p spl/origen-spl.bin builds/origen-spl.bin.origen
|
||||
cp -p u-boot.bin builds/u-boot.bin.origen
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" paz00_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p u-boot-dtb-tegra.bin builds/u-boot-dtb-tegra.bin.paz00
|
||||
cp -p u-boot-nodtb-tegra.bin builds/u-boot-nodtb-tegra.bin.paz00
|
||||
cp -p u-boot.map builds/u-boot.map.paz00
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" smdkv310_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p spl/smdkv310-spl.bin builds/smdkv310-spl.bin.smdkv310
|
||||
cp -p u-boot.bin builds/u-boot.bin.smdkv310
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" snow_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p u-boot-dtb.bin builds/u-boot-dtb.bin.snow
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" snowball_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p u-boot.bin builds/u-boot.bin.snowball
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" trimslice_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p u-boot-dtb-tegra.bin builds/u-boot-dtb-tegra.bin.trimslice
|
||||
cp -p u-boot-nodtb-tegra.bin builds/u-boot-nodtb-tegra.bin.trimslice
|
||||
cp -p u-boot.map builds/u-boot.map.trimslice
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" wandboard_dl_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p u-boot.imx builds/u-boot.imx.dl
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" wandboard_quad_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p u-boot.imx builds/u-boot.imx.quad
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" wandboard_solo_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p u-boot.imx builds/u-boot.imx.solo
|
||||
make distclean
|
||||
|
||||
make CROSS_COMPILE="" omap5_uevm_config
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
cp -p MLO builds/MLO.uevm
|
||||
cp -p u-boot.img builds/u-boot.img.uevm
|
||||
make distclean
|
||||
|
||||
%endif
|
||||
|
||||
make tools HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true CROSS_COMPILE=""
|
||||
make tools HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true CROSS_COMPILE="" %{?_smp_mflags}
|
||||
|
||||
%if 0%{?with_env}
|
||||
make CROSS_COMPILE="" sheevaplug_config
|
||||
make env HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
|
||||
make env HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags}
|
||||
%endif
|
||||
|
||||
%install
|
||||
@ -284,10 +284,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
|
||||
|
||||
%ifarch %{arm}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/
|
||||
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/uboot/uEnv.txt
|
||||
|
||||
%ifarch %{arm}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/arndale/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/beagle/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/beaglebone/
|
||||
@ -425,6 +426,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sun Oct 20 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-3
|
||||
- fix ftbfs for wandboard
|
||||
- use _smp_mflags
|
||||
|
||||
* Sat Oct 19 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-2
|
||||
- use ext2load for dtb loading
|
||||
- cleanup duplicate defines
|
||||
|
||||
Loading…
Reference in New Issue
Block a user