Accepting request 163711 from Base:System

- add omap3_beagle to targets 

- remove u8500href subpackage, kernel got dropped

- update to 2013.04rc2
- enable bootz support on all boards

- add omap3_beagle to targets 

- remove u8500href subpackage, kernel got dropped

- update to 2013.04rc2
- enable bootz support on all boards

- add omap3_beagle to targets 

- remove u8500href subpackage, kernel got dropped

- update to 2013.04rc2
- enable bootz support on all boards

- add omap3_beagle to targets 

- remove u8500href subpackage, kernel got dropped

- update to 2013.04rc2
- enable bootz support on all boards

- add omap3_beagle to targets

OBS-URL: https://build.opensuse.org/request/show/163711
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=12
This commit is contained in:
Stephan Kulow 2013-04-17 07:25:52 +00:00 committed by Git OBS Bridge
parent bd8a6d0328
commit ae43375422
26 changed files with 537 additions and 229 deletions

View File

@ -5,10 +5,10 @@ Subject: [PATCH] OMAP: Add autorun support for boot.scr
Signed-off-by: Alexander Graf <agraf@suse.de>
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index c4df587..afbe2b3 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
Index: u-boot-2013.04rc2/include/configs/omap3_beagle.h
===================================================================
--- u-boot-2013.04rc2.orig/include/configs/omap3_beagle.h
+++ u-boot-2013.04rc2/include/configs/omap3_beagle.h
@@ -273,6 +273,9 @@
"loadramdisk=ext2load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
"loaduimagefat=ext2load mmc ${mmcdev} ${loadaddr} uImage\0" \

View File

@ -1,25 +1,29 @@
Index: u-boot-2012.04.01/include/configs/origen.h
Index: u-boot-2013.04rc2/include/configs/origen.h
===================================================================
--- u-boot-2012.04.01.orig/include/configs/origen.h
+++ u-boot-2012.04.01/include/configs/origen.h
@@ -87,6 +87,7 @@
--- u-boot-2013.04rc2.orig/include/configs/origen.h
+++ u-boot-2013.04rc2/include/configs/origen.h
@@ -87,8 +87,11 @@
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_MMC
#define CONFIG_CMD_FAT
+#define CONFIG_CMD_EXT2 /* EXT2 Support */
#undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
+#define CONFIG_CMD_BOOTZ /* bootz zImage support */
+#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */
@@ -96,7 +97,35 @@
#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK
@@ -96,7 +99,35 @@
#define CONFIG_SPL
#define COPY_BL2_FNPTR_ADDR 0x02020030
-#define CONFIG_BOOTCOMMAND "fatload mmc 0 40007000 uImage; bootm 40007000"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "loadaddr=0x40007000\0" \
+ "rdaddr=0x4f000000\0" \
+ "rdaddr=0x48000000\0" \
+ "kerneladdr=0x40007000\0" \
+ "ramdiskaddr=0x4f000000\0" \
+ "ramdiskaddr=0x48000000\0" \
+ "console=ttySAC2,115200n8\0" \
+ "mmcdev=0\0" \
+ "bootenv=uEnv.txt\0" \
@ -30,7 +34,7 @@ Index: u-boot-2012.04.01/include/configs/origen.h
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ "source ${loadaddr}\0"
+#define CONFIG_BOOTCOMMAND \
+ "if mmc rescan ${mmcdev}; then " \
+ "if mmc rescan; then " \
+ "echo SD/MMC found on device ${mmcdev};" \
+ "if run loadbootenv; then " \
+ "echo Loaded environment from ${bootenv};" \

View File

@ -11,11 +11,11 @@ linaro version.
Signed-off-by: Alexander Graf <agraf@suse.de>
Index: u-boot-2012.10/include/configs/omap3_beagle.h
Index: u-boot-2013.04rc2/include/configs/omap3_beagle.h
===================================================================
--- u-boot-2012.10.orig/include/configs/omap3_beagle.h
+++ u-boot-2012.10/include/configs/omap3_beagle.h
@@ -220,6 +220,8 @@
--- u-boot-2013.04rc2.orig/include/configs/omap3_beagle.h
+++ u-boot-2013.04rc2/include/configs/omap3_beagle.h
@@ -218,6 +218,8 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x80200000\0" \
"rdaddr=0x81000000\0" \
@ -24,11 +24,11 @@ Index: u-boot-2012.10/include/configs/omap3_beagle.h
"usbtty=cdc_acm\0" \
"bootfile=uImage.beagle\0" \
"console=ttyO2,115200n8\0" \
Index: u-boot-2012.10/include/configs/omap4_common.h
Index: u-boot-2013.04rc2/include/configs/omap4_common.h
===================================================================
--- u-boot-2012.10.orig/include/configs/omap4_common.h
+++ u-boot-2012.10/include/configs/omap4_common.h
@@ -145,6 +145,8 @@
--- u-boot-2013.04rc2.orig/include/configs/omap4_common.h
+++ u-boot-2013.04rc2/include/configs/omap4_common.h
@@ -144,6 +144,8 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \

View File

@ -1,7 +1,7 @@
Index: u-boot-2012.10/drivers/mmc/spl_mmc.c
Index: u-boot-2013.04rc2/drivers/mmc/spl_mmc.c
===================================================================
--- u-boot-2012.10.orig/drivers/mmc/spl_mmc.c
+++ u-boot-2012.10/drivers/mmc/spl_mmc.c
--- u-boot-2013.04rc2.orig/drivers/mmc/spl_mmc.c
+++ u-boot-2013.04rc2/drivers/mmc/spl_mmc.c
@@ -67,6 +67,59 @@ end:
}
@ -79,11 +79,19 @@ Index: u-boot-2012.10/drivers/mmc/spl_mmc.c
#endif
} else {
puts("spl: wrong MMC boot mode\n");
Index: u-boot-2012.10/include/configs/omap3_beagle.h
Index: u-boot-2013.04rc2/include/configs/omap3_beagle.h
===================================================================
--- u-boot-2012.10.orig/include/configs/omap3_beagle.h
+++ u-boot-2012.10/include/configs/omap3_beagle.h
@@ -258,7 +258,7 @@
--- u-boot-2013.04rc2.orig/include/configs/omap3_beagle.h
+++ u-boot-2013.04rc2/include/configs/omap3_beagle.h
@@ -55,6 +55,7 @@
#define CONFIG_OF_LIBFDT
#define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
#define CONFIG_SETUP_MEMORY_TAGS 1
@@ -255,7 +256,7 @@
"root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \
"bootenv=uEnv.txt\0" \
@ -92,7 +100,7 @@ Index: u-boot-2012.10/include/configs/omap3_beagle.h
"importbootenv=echo Importing environment from mmc ...; " \
"env import -t $loadaddr $filesize\0" \
"ramargs=setenv bootargs console=${console} " \
@@ -270,8 +270,8 @@
@@ -267,8 +268,8 @@
"omapdss.def_disp=${defaultdisplay} " \
"root=${ramroot} " \
"rootfstype=${ramrootfstype}\0" \
@ -103,11 +111,19 @@ Index: u-boot-2012.10/include/configs/omap3_beagle.h
"loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
Index: u-boot-2012.10/include/configs/omap4_common.h
Index: u-boot-2013.04rc2/include/configs/omap4_common.h
===================================================================
--- u-boot-2012.10.orig/include/configs/omap4_common.h
+++ u-boot-2012.10/include/configs/omap4_common.h
@@ -156,10 +156,10 @@
--- u-boot-2013.04rc2.orig/include/configs/omap4_common.h
+++ u-boot-2013.04rc2/include/configs/omap4_common.h
@@ -126,6 +126,7 @@
#define CONFIG_CMD_FAT /* FAT support */
#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
+#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */
/* Disabled commands */
#undef CONFIG_CMD_NET
@@ -154,13 +155,13 @@
"vram=${vram} " \
"root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
@ -115,16 +131,20 @@ Index: u-boot-2012.10/include/configs/omap4_common.h
+ "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
"source ${loadaddr}\0" \
- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
+ "loadbootenv=ext2load mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
"env import -t ${loadaddr} ${filesize}\0" \
- "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
+ "loaduimage=ext2load mmc ${mmcdev} ${loadaddr} uImage\0" \
"mmcboot=echo Booting from mmc${mmcdev} ...; " \
"run mmcargs; " \
"bootm ${loadaddr}\0" \
Index: u-boot-2012.10/spl/Makefile
Index: u-boot-2013.04rc2/spl/Makefile
===================================================================
--- u-boot-2012.10.orig/spl/Makefile
+++ u-boot-2012.10/spl/Makefile
@@ -51,6 +51,7 @@ LIBS-$(CONFIG_SPL_SERIAL_SUPPORT) += dri
--- u-boot-2013.04rc2.orig/spl/Makefile
+++ u-boot-2013.04rc2/spl/Makefile
@@ -72,6 +72,7 @@ LIBS-$(CONFIG_SPL_SERIAL_SUPPORT) += dri
LIBS-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += drivers/mtd/spi/libspi_flash.o
LIBS-$(CONFIG_SPL_SPI_SUPPORT) += drivers/spi/libspi.o
LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/fat/libfat.o

View File

@ -1,26 +1,40 @@
Index: u-boot-2012.04.01/include/configs/mx53loco.h
Index: u-boot-2013.04rc2/include/configs/mx53loco.h
===================================================================
--- u-boot-2012.04.01.orig/include/configs/mx53loco.h
+++ u-boot-2012.04.01/include/configs/mx53loco.h
@@ -106,6 +107,8 @@
--- u-boot-2013.04rc2.orig/include/configs/mx53loco.h
+++ u-boot-2013.04rc2/include/configs/mx53loco.h
@@ -106,6 +106,7 @@
/* Command definition */
#include <config_cmd_default.h>
#define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */
#undef CONFIG_CMD_IMLS
@@ -119,20 +120,22 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"uimage=uImage\0" \
+ "kerneladdr=0x70800000\0" \
+ "ramdiskaddr=0x7e000000\0" \
"fdt_file=imx53-qsb.dtb\0" \
- "fdt_addr=0x71000000\0" \
+ "fdt_addr=0x7d800000\0" \
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
"mmcdev=0\0" \
"mmcpart=2\0" \
"mmcroot=/dev/mmcblk0p3 rw\0" \
@@ -114,10 +117,10 @@
"root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "mmcpart=2\0" \
+ "mmcpart=1\0" \
"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
"mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}\0" \
"loadbootscript=" \
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+ "ext2load mmc ${mmcdev} ${loadaddr} ${script};\0" \
+ "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \
"source\0" \
- "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+ "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+ "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"bootm\0" \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \

View File

@ -6,7 +6,7 @@ BOARDCONFIG="$2"
# omap3_beagle currently needs separate sources
if [ ! "$1" -o ! "$2" ]; then
for BOARDCONFIG in omap4_panda u8500_href origen highbank mx53loco; do
for BOARDCONFIG in omap3_beagle omap4_panda origen highbank mx53loco; do
BOARDNAME="$(echo $BOARDCONFIG | tr -d '_')"
BOARDCONFIG=${BOARDCONFIG}_config
bash $0 $BOARDNAME $BOARDCONFIG

View File

@ -1,31 +0,0 @@
From: Jaehoon Chung <jh80.chung@samsung.com>
Date: Thu, 20 Sep 2012 20:31:54 +0000 (+0000)
Subject: mmc: sdhci: increase the timeout value for data transfer
X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=5d48e4224791611498456908fc23a845cc5b4ed7
mmc: sdhci: increase the timeout value for data transfer
Timeout value is tunable.
When run read/write operation, sometime returned the timeout error.
Because the timeout value is too short.
So increased the enough timeout value.
(This timeout value is used to prevent the infinite loop.)
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
---
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 2e3c408..9329874 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -83,7 +83,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data,
{
unsigned int stat, rdy, mask, timeout, block = 0;
- timeout = 10000;
+ timeout = 1000000;
rdy = SDHCI_INT_SPACE_AVAIL | SDHCI_INT_DATA_AVAIL;
mask = SDHCI_DATA_AVAILABLE | SDHCI_SPACE_AVAILABLE;
do {

View File

@ -1,34 +0,0 @@
From: Jaehoon Chung <jh80.chung@samsung.com>
Date: Thu, 20 Sep 2012 20:31:55 +0000 (+0000)
Subject: mmc: sdhci: add the DMA select for SDMA
X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=804c7f422169212e92530e1ddaf74bf1ca9ebfa1
mmc: sdhci: add the DMA select for SDMA
In host-control register, DMA select bit field is present.
BUt in sdhci.c, didn't select for DMA.
if set CONFIG_MMC_SDMA, we need to set SDMA-select bit.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
---
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 9329874..15b4686 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -82,6 +82,13 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data,
unsigned int start_addr)
{
unsigned int stat, rdy, mask, timeout, block = 0;
+#ifdef CONFIG_MMC_SDMA
+ unsigned char ctrl;
+ ctrl = sdhci_readl(host, SDHCI_HOST_CONTROL);
+ ctrl &= ~SDHCI_CTRL_DMA_MASK;
+ ctrl |= SDHCI_CTRL_SDMA;
+ sdhci_writel(host, ctrl, SDHCI_HOST_CONTROL);
+#endif
timeout = 1000000;
rdy = SDHCI_INT_SPACE_AVAIL | SDHCI_INT_DATA_AVAIL;

View File

@ -1,63 +0,0 @@
From: Tushar Behera <tushar.behera@linaro.org>
Date: Thu, 20 Sep 2012 20:31:57 +0000 (+0000)
Subject: mmc: sdhci: Add a quirk to add delay during completion of sdhci_send_cmd
X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=13243f2eafc4292917178051fe1bb5aab2774dca;hp=804c7f422169212e92530e1ddaf74bf1ca9ebfa1
mmc: sdhci: Add a quirk to add delay during completion of sdhci_send_cmd
MMC host controller requires a delay between every sdhci_send_cmd()
execution. In s5p_mmc driver (s5p_sdhci replaces this driver), a delay
of 1000us was provided after every mmc_send_cmd() call. Adding a quirk
in current sdhci driver to replicate the behaviour.
Without this delay, MMC initialization on Origen board fails with
following error messages.
Timeout for status update!
mmc fail to send stop cmd
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
---
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index b978236..dc49d37 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -83,7 +83,8 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
host->ioaddr = (void *)regbase;
host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE |
- SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR;
+ SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR |
+ SDHCI_QUIRK_WAIT_SEND_CMD;
host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 15b4686..7845f87 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -240,6 +240,9 @@ int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
if (!ret && data)
ret = sdhci_transfer_data(host, data, start_addr);
+ if (host->quirks & SDHCI_QUIRK_WAIT_SEND_CMD)
+ udelay(1000);
+
stat = sdhci_readl(host, SDHCI_INT_STATUS);
sdhci_writel(host, SDHCI_INT_ALL_MASK, SDHCI_INT_STATUS);
if (!ret) {
diff --git a/include/sdhci.h b/include/sdhci.h
index c0345ed..c44793d 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -224,6 +224,7 @@
#define SDHCI_QUIRK_NO_HISPD_BIT (1 << 3)
#define SDHCI_QUIRK_BROKEN_VOLTAGE (1 << 4)
#define SDHCI_QUIRK_NO_CD (1 << 5)
+#define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6)
/* to make gcc happy */
struct sdhci_host;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dddec75070b5faa5df463085e3e1d27c6d058ec3481c666917baa961956d4d17
size 9449657

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28ce17f6981f8eba0641787cb470a2394b050253b5a128ca7c8f356175a03b2d
size 10097912

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Apr 11 17:05:58 UTC 2013 - guillaume.gardet@opensuse.org
- add omap3_beagle to targets
-------------------------------------------------------------------
Thu Apr 11 16:05:41 UTC 2013 - dmueller@suse.com
- remove u8500href subpackage, kernel got dropped
-------------------------------------------------------------------
Sun Apr 7 14:32:20 UTC 2013 - agraf@suse.com
- update to 2013.04rc2
- enable bootz support on all boards
-------------------------------------------------------------------
Wed Mar 20 07:21:06 UTC 2013 - agraf@suse.com

View File

@ -22,7 +22,7 @@
%define origen_spl 0
Name: u-boot-highbank
Version: 2012.10
Version: 2013.04rc2
Release: 0
Summary: The u-boot firmware for the highbank arm platform
License: GPL-2.0
@ -37,9 +37,6 @@ Patch3: loadaddr-defaults.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
Patch6: exynos-ext2.patch
Patch7: sdhc-1.patch
Patch8: sdhc-2.patch
Patch9: sdhc-3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: u-boot-loader
Conflicts: otherproviders(u-boot-loader)
@ -72,9 +69,6 @@ rm -rf board/Marvell
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" highbank_config

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Apr 11 17:05:58 UTC 2013 - guillaume.gardet@opensuse.org
- add omap3_beagle to targets
-------------------------------------------------------------------
Thu Apr 11 16:05:41 UTC 2013 - dmueller@suse.com
- remove u8500href subpackage, kernel got dropped
-------------------------------------------------------------------
Sun Apr 7 14:32:20 UTC 2013 - agraf@suse.com
- update to 2013.04rc2
- enable bootz support on all boards
-------------------------------------------------------------------
Wed Mar 20 07:21:06 UTC 2013 - agraf@suse.com

View File

@ -22,7 +22,7 @@
%define origen_spl 0
Name: u-boot-mx53loco
Version: 2012.10
Version: 2013.04rc2
Release: 0
Summary: The u-boot firmware for the mx53loco arm platform
License: GPL-2.0
@ -37,9 +37,6 @@ Patch3: loadaddr-defaults.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
Patch6: exynos-ext2.patch
Patch7: sdhc-1.patch
Patch8: sdhc-2.patch
Patch9: sdhc-3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: u-boot-loader
Conflicts: otherproviders(u-boot-loader)
@ -72,9 +69,6 @@ rm -rf board/Marvell
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx53loco_config

228
u-boot-omap3beagle.changes Normal file
View File

@ -0,0 +1,228 @@
-------------------------------------------------------------------
Thu Apr 11 17:05:58 UTC 2013 - guillaume.gardet@opensuse.org
- add omap3_beagle to targets
-------------------------------------------------------------------
Thu Apr 11 16:05:41 UTC 2013 - dmueller@suse.com
- remove u8500href subpackage, kernel got dropped
-------------------------------------------------------------------
Sun Apr 7 14:32:20 UTC 2013 - agraf@suse.com
- update to 2013.04rc2
- enable bootz support on all boards
-------------------------------------------------------------------
Wed Mar 20 07:21:06 UTC 2013 - agraf@suse.com
- fix mlo-ext2.patch to actually use the ext4 infrastructure
-------------------------------------------------------------------
Sat Jan 26 10:38:07 UTC 2013 - dmueller@suse.com
- update mlo-ext2.patch:
* use the ext4 driver now since ext2 got removed
-------------------------------------------------------------------
Wed Oct 24 22:33:13 UTC 2012 - agraf@suse.com
- add sdhc-1.patch, sdhc-2.patch, sdhc-3.patch:
* backport upstream sdhc fixes
-------------------------------------------------------------------
Wed Oct 24 01:37:36 CEST 2012 - agraf@suse.de
- update to 2012.10:
- refresh patches 0006-ARMV7-hardfp-build-fix.patch, mlo-ext2.patch,
loadaddr-defaults.patch, mx53loco-bootscr.patch
-------------------------------------------------------------------
Mon Oct 22 12:00:22 UTC 2012 - agraf@suse.com
- fix origen by putting the ramdisk higher
-------------------------------------------------------------------
Mon Aug 6 09:39:54 UTC 2012 - dmueller@suse.com
- remove Marvell sources as they are non-free licensed (bnc#773824)
-------------------------------------------------------------------
Thu Jul 26 18:21:44 UTC 2012 - agraf@suse.com
- fix ext2 support for origen
- add origen-spl.bin for origen
-------------------------------------------------------------------
Thu Jul 26 09:47:31 UTC 2012 - dmueller@suse.com
- merge u-boot-tools
-------------------------------------------------------------------
Wed Jul 25 21:05:08 UTC 2012 - agraf@suse.com
- add ext2 support by default in mx53loco
-------------------------------------------------------------------
Tue Jul 24 21:28:59 UTC 2012 - agraf@suse.com
- add support for mx53loco
-------------------------------------------------------------------
Tue Jul 24 11:25:42 UTC 2012 - dmueller@suse.com
- remove u-boot-omap3beagle
-------------------------------------------------------------------
Mon Jul 23 22:34:04 UTC 2012 - agraf@suse.com
- bump to 2012.04.01
- fixes bug in cmdline parsing
-------------------------------------------------------------------
Mon Jul 23 22:26:47 UTC 2012 - agraf@suse.com
- add calxeda highbank support
-------------------------------------------------------------------
Thu Jul 12 12:51:56 UTC 2012 - agraf@suse.com
- autoload boot.scr on beagle, so we can boot again
-------------------------------------------------------------------
Thu Jul 12 08:12:15 UTC 2012 - agraf@suse.com
- update to upstream u-boot 2012.04
-> gets rid of linaro fork, only mainline now
-> gets us omap3 MLO support, no more need for x-loader
-> potentially fixes voltage issues on omap4
-------------------------------------------------------------------
Thu Jun 14 09:04:53 UTC 2012 - adrian@suse.de
- add SUSE style conflicts to avoid installation of multiple
boot loaders
-------------------------------------------------------------------
Tue Apr 17 11:59:55 UTC 2012 - joop.boonen@opensuse.org
- Included u-boot.spec.in and gen_spec.sh in the spec file
-------------------------------------------------------------------
Mon Feb 6 13:25:09 UTC 2012 - agraf@suse.com
- use ext2 on panda
-------------------------------------------------------------------
Tue Dec 20 02:36:05 UTC 2011 - agraf@suse.com
- use ttyO2 as default console= on OMAP boards
-------------------------------------------------------------------
Mon Dec 19 20:21:21 UTC 2011 - agraf@suse.com
- add u8500_href and origen configs
-------------------------------------------------------------------
Fri Dec 16 16:03:01 UTC 2011 - agraf@suse.com
- fix lint failures
-------------------------------------------------------------------
Fri Dec 16 14:46:53 CET 2011 - agraf@suse.com
- don't install map
-------------------------------------------------------------------
Fri Dec 16 02:16:19 UTC 2011 - agraf@suse.com
- generalize spec file to be able to build for more boards
- add beagle board spec file
- remove boot.scr
-------------------------------------------------------------------
Fri Dec 16 01:15:47 UTC 2011 - agraf@suse.com
- rename to u-boot-omap4panda
-------------------------------------------------------------------
Tue Dec 13 17:24:45 UTC 2011 - dkukawka@suse.de
- new package based on u-boot-omap4panda but use linaro u-boot git
repo (http://git.linaro.org/git/boot/u-boot-linaro-stable.git)
instead of mainline u-boot. This package also contains the MLO
(this package obsoletes the x-loader package)
-------------------------------------------------------------------
Tue Nov 29 22:53:44 UTC 2011 - joop.boonen@opensuse.org
- COPYING CREDITS README are now in the standard package
-------------------------------------------------------------------
Thu Nov 24 21:08:58 UTC 2011 - joop.boonen@opensuse.org
- Corrected the links
-------------------------------------------------------------------
Tue Nov 22 17:47:17 UTC 2011 - joop.boonen@opensuse.org
- Build without u-boot tools as we have a u-boot-tools packages
-------------------------------------------------------------------
Sun Nov 20 17:00:43 UTC 2011 - joop.boonen@opensuse.org
- Cleaned the spec file up the spec file
- The name is the same as the package name
-------------------------------------------------------------------
Sun Nov 13 13:13:39 UTC 2011 - joop.boonen@opensuse.org
- Build u-boot according to http://elinux.org/Panda_How_to_MLO_&_u-boot
- Using .txt config file instead of .scr it's gerated via mkimage
-------------------------------------------------------------------
Wed Nov 09 22:55:09 UTC 2011 - joop.boonen@opensuse.org
- Used scr file based on http://elinux.org definition
- Build u-boot 20111109
- Used the Meego panda u-boot as a base
-------------------------------------------------------------------
Fri Feb 18 00:00:00 UTC 2011 - raghuveer.murthy@ti.com>
- 2010.09-MeeGo
- Fix for u-boot fails to compile on armv7hl, BMC#13140
-------------------------------------------------------------------
Thu Nov 18 00:00:00 UTC 2010 - peter.j.zhu@intel.com>
- 2010.09-MeeGo
- Don't build against i586, BMC#10159
-------------------------------------------------------------------
Tue Oct 10 00:00:00 UTC 2010 - nm@ti.com>
- 2010.09-MeeGo
- Add Das u-boot package - FEA#9723
-------------------------------------------------------------------
Tue Oct 10 00:00:00 UTC 2010 - nm@ti.com>
- 2010.09.rc1-MeeGo
- Added option to enable boot.scr generation and copy
-------------------------------------------------------------------
Mon Oct 04 00:00:00 UTC 2010 - nm@ti.com>
- 2010.09.rc1-MeeGo
- Update to 2010.09
-------------------------------------------------------------------
Wed Sep 14 00:00:00 UTC 2010 - nm@ti.com>
- 2010.09.rc1-MeeGo
- Update to 2010.09.rc1
- MeeGo customization
- Enabled PandaBoard, Beagleboard build
-------------------------------------------------------------------
Wed Mar 31 00:00:00 UTC 2010 - silvan.calarco@mambasoft.it>
- 2009.11.1-1mamba
- update to 2009.11.1
-------------------------------------------------------------------

115
u-boot-omap3beagle.spec Normal file
View File

@ -0,0 +1,115 @@
#
# spec file for package u-boot-omap3beagle
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define x_loader 1
%define origen_spl 0
Name: u-boot-omap3beagle
Version: 2013.04rc2
Release: 0
Summary: The u-boot firmware for the omap3beagle arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: u-boot-%{version}.tar.bz2
Source1: openSUSE_panda.txt
Source300: rpmlintrc
Patch1: 0006-ARMV7-hardfp-build-fix.patch
Patch2: mlo-ext2.patch
Patch3: loadaddr-defaults.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
Patch6: exynos-ext2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: u-boot-loader
Conflicts: otherproviders(u-boot-loader)
%if %x_loader == 1
Obsoletes: x-loader-omap3beagle
Provides: x-loader-omap3beagle
%endif
ExclusiveArch: %arm
%description
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors.
This package contains the firmware for the omap3beagle arm platform.
%package doc
Summary: Documentation for the u-boot Firmware
Group: Documentation/Other
%description doc
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors.
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
# is non-free licensed, and we don't need it (bnc#773824)
rm -rf board/Marvell
# Any custom patches to be applied on top of mainline u-boot
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_config
# temporary disable of --build-id
#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
%if %origen_spl == 1
install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
/boot/u-boot.bin
%if %x_loader == 1
/boot/MLO
%endif
%if %origen_spl == 1
/boot/origen-spl.bin
%endif
%doc COPYING CREDITS README
%files doc
%defattr(-,root,root)
# Generic documents
%doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands
%doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns
%doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi
%doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb
%doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem
# Copy some useful kermit scripts as well
%doc tools/scripts/dot.kermrc tools/scripts/flash_param tools/scripts/send_cmd tools/scripts/send_image
# Now any h/w dependent Documentation
%doc doc/README.ARM-SoC doc/README.ARM-memory-map
%changelog

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Apr 11 17:05:58 UTC 2013 - guillaume.gardet@opensuse.org
- add omap3_beagle to targets
-------------------------------------------------------------------
Thu Apr 11 16:05:41 UTC 2013 - dmueller@suse.com
- remove u8500href subpackage, kernel got dropped
-------------------------------------------------------------------
Sun Apr 7 14:32:20 UTC 2013 - agraf@suse.com
- update to 2013.04rc2
- enable bootz support on all boards
-------------------------------------------------------------------
Wed Mar 20 07:21:06 UTC 2013 - agraf@suse.com

View File

@ -22,7 +22,7 @@
%define origen_spl 0
Name: u-boot-omap4panda
Version: 2012.10
Version: 2013.04rc2
Release: 0
Summary: The u-boot firmware for the omap4panda arm platform
License: GPL-2.0
@ -37,9 +37,6 @@ Patch3: loadaddr-defaults.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
Patch6: exynos-ext2.patch
Patch7: sdhc-1.patch
Patch8: sdhc-2.patch
Patch9: sdhc-3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: u-boot-loader
Conflicts: otherproviders(u-boot-loader)
@ -72,9 +69,6 @@ rm -rf board/Marvell
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_config

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Apr 11 17:05:58 UTC 2013 - guillaume.gardet@opensuse.org
- add omap3_beagle to targets
-------------------------------------------------------------------
Thu Apr 11 16:05:41 UTC 2013 - dmueller@suse.com
- remove u8500href subpackage, kernel got dropped
-------------------------------------------------------------------
Sun Apr 7 14:32:20 UTC 2013 - agraf@suse.com
- update to 2013.04rc2
- enable bootz support on all boards
-------------------------------------------------------------------
Wed Mar 20 07:21:06 UTC 2013 - agraf@suse.com

View File

@ -22,7 +22,7 @@
%define origen_spl 1
Name: u-boot-origen
Version: 2012.10
Version: 2013.04rc2
Release: 0
Summary: The u-boot firmware for the origen arm platform
License: GPL-2.0
@ -37,9 +37,6 @@ Patch3: loadaddr-defaults.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
Patch6: exynos-ext2.patch
Patch7: sdhc-1.patch
Patch8: sdhc-2.patch
Patch9: sdhc-3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: u-boot-loader
Conflicts: otherproviders(u-boot-loader)
@ -72,9 +69,6 @@ rm -rf board/Marvell
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" origen_config

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Apr 11 16:05:41 UTC 2013 - dmueller@suse.com
- remove u8500href subpackage, kernel got dropped
-------------------------------------------------------------------
Sun Apr 7 14:32:20 UTC 2013 - agraf@suse.com
- update to 2013.04rc2
- enable bootz support on all boards
-------------------------------------------------------------------
Wed Mar 20 07:21:06 UTC 2013 - agraf@suse.com

View File

@ -1,5 +1,5 @@
#
# spec file for package u-boot-u8500href
# spec file for package u-boot-raspberrypi
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
@ -21,10 +21,10 @@
%define x_loader 0
%define origen_spl 0
Name: u-boot-u8500href
Version: 2012.10
Name: u-boot-raspberrypi
Version: 2013.04rc2
Release: 0
Summary: The u-boot firmware for the u8500href arm platform
Summary: The u-boot firmware for the raspberrypi arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
@ -37,21 +37,18 @@ Patch3: loadaddr-defaults.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
Patch6: exynos-ext2.patch
Patch7: sdhc-1.patch
Patch8: sdhc-2.patch
Patch9: sdhc-3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: u-boot-loader
Conflicts: otherproviders(u-boot-loader)
%if %x_loader == 1
Obsoletes: x-loader-u8500href
Provides: x-loader-u8500href
Obsoletes: x-loader-raspberrypi
Provides: x-loader-raspberrypi
%endif
ExclusiveArch: %arm
%description
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors.
This package contains the firmware for the u8500href arm platform.
This package contains the firmware for the raspberrypi arm platform.
%package doc
Summary: Documentation for the u-boot Firmware
@ -72,12 +69,9 @@ rm -rf board/Marvell
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" u8500_href_config
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" raspberrypi_config
# temporary disable of --build-id
#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Apr 11 17:05:58 UTC 2013 - guillaume.gardet@opensuse.org
- add omap3_beagle to targets
-------------------------------------------------------------------
Thu Apr 11 16:05:41 UTC 2013 - dmueller@suse.com
- remove u8500href subpackage, kernel got dropped
-------------------------------------------------------------------
Sun Apr 7 14:32:20 UTC 2013 - agraf@suse.com
- update to 2013.04rc2
- enable bootz support on all boards
-------------------------------------------------------------------
Wed Mar 20 07:21:06 UTC 2013 - agraf@suse.com

View File

@ -19,7 +19,7 @@
Name: u-boot
Version: 2012.10
Version: 2013.04rc2
Release: 0
Summary: Tools for the u-boot Firmware
License: GPL-2.0

View File

@ -22,7 +22,7 @@
%define origen_spl ORIGEN_SPL
Name: u-boot-BOARDNAME
Version: 2012.10
Version: 2013.04rc2
Release: 0
Summary: The u-boot firmware for the BOARDNAME arm platform
License: GPL-2.0
@ -37,9 +37,6 @@ Patch3: loadaddr-defaults.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
Patch6: exynos-ext2.patch
Patch7: sdhc-1.patch
Patch8: sdhc-2.patch
Patch9: sdhc-3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: u-boot-loader
Conflicts: otherproviders(u-boot-loader)
@ -72,9 +69,6 @@ rm -rf board/Marvell
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG