Accepting request 260911 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/260911
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger 2014-11-13 08:17:26 +00:00 committed by Git OBS Bridge
parent 74dddc628a
commit cdcdf66ac1
40 changed files with 316 additions and 1045 deletions

View File

@ -1,859 +0,0 @@
From c1da5660a00d1169e0d07efae0e699294dcb298b Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@free.fr>
Date: Fri, 19 Sep 2014 10:03:45 +0200
Subject: [PATCH 1/5] Rename some defines containing FAT in their name to be
filesystem generic MMCSD_MODE_FAT => MMCSD_MODE_FS
CONFIG_SPL_FAT_LOAD_ARGS_NAME => CONFIG_SPL_FS_LOAD_ARGS_NAME
CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME => CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION => CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION
---
arch/arm/cpu/arm1136/mx35/generic.c | 2 +-
arch/arm/cpu/armv7/omap-common/boot-common.c | 4 ++--
arch/arm/cpu/armv7/omap3/board.c | 2 +-
arch/arm/cpu/armv7/zynq/spl.c | 2 +-
arch/arm/cpu/at91-common/spl.c | 2 +-
arch/arm/imx-common/spl.c | 2 +-
common/spl/spl_fat.c | 6 +++---
common/spl/spl_mmc.c | 8 ++++----
common/spl/spl_sata.c | 2 +-
common/spl/spl_usb.c | 2 +-
include/configs/am3517_crane.h | 4 ++--
include/configs/am3517_evm.h | 4 ++--
include/configs/cm_t35.h | 4 ++--
include/configs/devkit8000.h | 8 ++++----
include/configs/imx6_spl.h | 4 ++--
include/configs/mcx.h | 4 ++--
include/configs/omap3_evm.h | 4 ++--
include/configs/omap3_evm_quick_mmc.h | 4 ++--
include/configs/sama5d3_xplained.h | 4 ++--
include/configs/sama5d3xek.h | 4 ++--
include/configs/siemens-am33x-common.h | 4 ++--
include/configs/tao3530.h | 4 ++--
include/configs/ti814x_evm.h | 4 ++--
include/configs/ti816x_evm.h | 4 ++--
include/configs/ti_armv7_common.h | 8 ++++----
include/configs/tricorder.h | 4 ++--
include/configs/zynq-common.h | 8 ++++----
include/spl.h | 2 +-
28 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index 8d3f92c..bc98edd 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -531,7 +531,7 @@ u32 spl_boot_mode(void)
switch (spl_boot_device()) {
case BOOT_DEVICE_MMC1:
#ifdef CONFIG_SPL_FAT_SUPPORT
- return MMCSD_MODE_FAT;
+ return MMCSD_MODE_FS;
#else
return MMCSD_MODE_RAW;
#endif
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 3033564..fb535eb 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -81,8 +81,8 @@ u32 spl_boot_mode(void)
if (val == MMCSD_MODE_RAW)
return MMCSD_MODE_RAW;
- else if (val == MMCSD_MODE_FAT)
- return MMCSD_MODE_FAT;
+ else if (val == MMCSD_MODE_FS)
+ return MMCSD_MODE_FS;
else
#ifdef CONFIG_SUPPORT_EMMC_BOOT
return MMCSD_MODE_EMMCBOOT;
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 667e77f..9bcca9d 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -65,7 +65,7 @@ u32 spl_boot_mode(void)
case BOOT_DEVICE_MMC2:
return MMCSD_MODE_RAW;
case BOOT_DEVICE_MMC1:
- return MMCSD_MODE_FAT;
+ return MMCSD_MODE_FS;
break;
default:
puts("spl: ERROR: unknown device - can't select boot mode\n");
diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c
index 9ff2ef2..31627f9 100644
--- a/arch/arm/cpu/armv7/zynq/spl.c
+++ b/arch/arm/cpu/armv7/zynq/spl.c
@@ -63,7 +63,7 @@ u32 spl_boot_device(void)
#ifdef CONFIG_SPL_MMC_SUPPORT
u32 spl_boot_mode(void)
{
- return MMCSD_MODE_FAT;
+ return MMCSD_MODE_FS;
}
#endif
diff --git a/arch/arm/cpu/at91-common/spl.c b/arch/arm/cpu/at91-common/spl.c
index cbb5a52..674a470 100644
--- a/arch/arm/cpu/at91-common/spl.c
+++ b/arch/arm/cpu/at91-common/spl.c
@@ -102,7 +102,7 @@ u32 spl_boot_mode(void)
switch (spl_boot_device()) {
#ifdef CONFIG_SYS_USE_MMC
case BOOT_DEVICE_MMC1:
- return MMCSD_MODE_FAT;
+ return MMCSD_MODE_FS;
break;
#endif
case BOOT_DEVICE_NONE:
diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c
index 9a02a64..9d3c31a 100644
--- a/arch/arm/imx-common/spl.c
+++ b/arch/arm/imx-common/spl.c
@@ -68,7 +68,7 @@ u32 spl_boot_mode(void)
case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC2:
#ifdef CONFIG_SPL_FAT_SUPPORT
- return MMCSD_MODE_FAT;
+ return MMCSD_MODE_FS;
#else
return MMCSD_MODE_RAW;
#endif
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 56be943..91481fc 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -106,18 +106,18 @@ int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition)
defaults:
#endif
- err = file_fat_read(CONFIG_SPL_FAT_LOAD_ARGS_NAME,
+ err = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME,
(void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
if (err <= 0) {
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
printf("%s: error reading image %s, err - %d\n",
- __func__, CONFIG_SPL_FAT_LOAD_ARGS_NAME, err);
+ __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);
#endif
return -1;
}
return spl_load_image_fat(block_dev, partition,
- CONFIG_SPL_FAT_LOAD_KERNEL_NAME);
+ CONFIG_SPL_FS_LOAD_KERNEL_NAME);
}
#endif
#endif
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index fa6f891..a631e0a 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -101,15 +101,15 @@ void spl_mmc_load_image(void)
err = mmc_load_image_raw(mmc,
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
#ifdef CONFIG_SPL_FAT_SUPPORT
- } else if (boot_mode == MMCSD_MODE_FAT) {
+ } else if (boot_mode == MMCSD_MODE_FS) {
debug("boot mode - FAT\n");
#ifdef CONFIG_SPL_OS_BOOT
if (spl_start_uboot() || spl_load_image_fat_os(&mmc->block_dev,
- CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION))
+ CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION))
#endif
err = spl_load_image_fat(&mmc->block_dev,
- CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION,
- CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+ CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION,
+ CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
#endif
#ifdef CONFIG_SUPPORT_EMMC_BOOT
} else if (boot_mode == MMCSD_MODE_EMMCBOOT) {
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 2e7adca..6fd1b79 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -41,7 +41,7 @@ void spl_sata_load_image(void)
#endif
err = spl_load_image_fat(stor_dev,
CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
- CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+ CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
if (err) {
puts("Error loading sata device\n");
hang();
diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index 53a9043..c81672b 100644
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -49,7 +49,7 @@ void spl_usb_load_image(void)
#endif
err = spl_load_image_fat(stor_dev,
CONFIG_SYS_USB_FAT_BOOT_PARTITION,
- CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+ CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
if (err) {
puts("Error loading USB device\n");
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index fcb4033..0fbfa3f 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -304,8 +304,8 @@
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_LIBCOMMON_SUPPORT
#define CONFIG_SPL_LIBDISK_SUPPORT
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index c5d64ca..8719f76 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -313,8 +313,8 @@
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_LIBCOMMON_SUPPORT
#define CONFIG_SPL_LIBDISK_SUPPORT
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 6f4d97f..1919cde 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -321,8 +321,8 @@
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_LIBCOMMON_SUPPORT
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 7ab6d51..ca62461 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -298,8 +298,8 @@
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/
@@ -341,8 +341,8 @@
0x400000)
#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000
-#define CONFIG_SPL_FAT_LOAD_KERNEL_NAME "uImage"
-#define CONFIG_SPL_FAT_LOAD_ARGS_NAME "args"
+#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
+#define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x500 /* address 0xa0000 */
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x8 /* address 0x1000 */
diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
index 970460d..308e520 100644
--- a/include/configs/imx6_spl.h
+++ b/include/configs/imx6_spl.h
@@ -46,7 +46,7 @@
#if defined(CONFIG_SPL_MMC_SUPPORT)
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 138 /* offset 69KB */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 800 /* 400 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
#define CONFIG_SYS_MONITOR_LEN (CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS/2*1024)
#endif
@@ -58,7 +58,7 @@
/* Define the payload for FAT/EXT support */
#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_LIBDISK_SUPPORT
#endif
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index cd85a6c..adaf44f 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -372,8 +372,8 @@
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
/* NAND boot config */
#define CONFIG_SYS_NAND_PAGE_COUNT 64
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index b7638fb..27bf89c 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -75,8 +75,8 @@
#define CONFIG_SPL_FAT_SUPPORT
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
/* Partition tables */
#define CONFIG_EFI_PARTITION
diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h
index 50929aa..2daf13c 100644
--- a/include/configs/omap3_evm_quick_mmc.h
+++ b/include/configs/omap3_evm_quick_mmc.h
@@ -87,7 +87,7 @@
#define CONFIG_SPL_FAT_SUPPORT
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif /* __OMAP3_EVM_QUICK_MMC_H */
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index 0dfb7e7..5b77db2 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -230,8 +230,8 @@
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_FAT_SUPPORT
#define CONFIG_SPL_LIBDISK_SUPPORT
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index c46baf2..dfbf3cb 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -276,8 +276,8 @@
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_FAT_SUPPORT
#define CONFIG_SPL_LIBDISK_SUPPORT
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 1ce0965..0d5dba1 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -148,8 +148,8 @@
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
#define CONFIG_FS_FAT
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 8d2db27..d687717 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -305,8 +305,8 @@
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_LIBCOMMON_SUPPORT
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index a55bde2..2fddef3 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -178,8 +178,8 @@
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index e86c364..aeabb1b 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -144,8 +144,8 @@
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 85171db..4b9b629 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -232,13 +232,13 @@
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
/* FAT sd card locations. */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#ifdef CONFIG_SPL_OS_BOOT
/* FAT */
-#define CONFIG_SPL_FAT_LOAD_KERNEL_NAME "uImage"
-#define CONFIG_SPL_FAT_LOAD_ARGS_NAME "args"
+#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
+#define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
/* RAW SD card / eMMC */
#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x900 /* address 0x120000 */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 6ddf3d5..6e7a7fb 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -348,8 +348,8 @@
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 0b4dd66..2bc1562 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -268,10 +268,10 @@
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
+#define CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION 1
#define CONFIG_SPL_LIBDISK_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
#endif
/* Disable dcache for SPL just for sure */
@@ -283,8 +283,8 @@
/* Address in RAM where the parameters must be copied by SPL. */
#define CONFIG_SYS_SPL_ARGS_ADDR 0x10000000
-#define CONFIG_SPL_FAT_LOAD_ARGS_NAME "system.dtb"
-#define CONFIG_SPL_FAT_LOAD_KERNEL_NAME "uImage"
+#define CONFIG_SPL_FS_LOAD_ARGS_NAME "system.dtb"
+#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
/* Not using MMC raw mode - just for compilation purpose */
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0
diff --git a/include/spl.h b/include/spl.h
index a7e41da..58c81dc 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -15,7 +15,7 @@
/* Boot type */
#define MMCSD_MODE_UNDEFINED 0
#define MMCSD_MODE_RAW 1
-#define MMCSD_MODE_FAT 2
+#define MMCSD_MODE_FS 2
#define MMCSD_MODE_EMMCBOOT 3
struct spl_image_info {
--
1.8.4.5
From 3f3d987e1c43205424ab3e6e5128517c97307386 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@free.fr>
Date: Fri, 19 Sep 2014 10:06:33 +0200
Subject: [PATCH 2/5] spl: Add EXT support to SPL
---
common/spl/Makefile | 1 +
common/spl/spl_ext.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++
common/spl/spl_mmc.c | 18 ++++++-
fs/Makefile | 1 +
include/spl.h | 4 ++
5 files changed, 160 insertions(+), 2 deletions(-)
create mode 100644 common/spl/spl_ext.c
diff --git a/common/spl/Makefile b/common/spl/Makefile
index 64569c2..10a4589 100644
--- a/common/spl/Makefile
+++ b/common/spl/Makefile
@@ -18,5 +18,6 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o
obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o
obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o
+obj-$(CONFIG_SPL_EXT_SUPPORT) += spl_ext.o
obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o
endif
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
new file mode 100644
index 0000000..7342268
--- /dev/null
+++ b/common/spl/spl_ext.c
@@ -0,0 +1,138 @@
+/*
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+#include <spl.h>
+#include <asm/u-boot.h>
+#include <ext4fs.h>
+#include <image.h>
+
+#ifdef CONFIG_SPL_EXT_SUPPORT
+int spl_load_image_ext(block_dev_desc_t *block_dev,
+ int partition,
+ const char *filename)
+{
+ s32 err;
+ struct image_header *header;
+ int filelen;
+ disk_partition_t part_info = {};
+
+ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
+ sizeof(struct image_header));
+
+ if (get_partition_info(block_dev,
+ partition, &part_info)) {
+ printf("spl: no partition table found\n");
+ goto end;
+ }
+
+ ext4fs_set_blk_dev(block_dev, &part_info);
+
+ err = ext4fs_mount(0);
+ if (!err) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+ printf("%s: ext4fs mount err - %d\n", __func__, err);
+#endif
+ goto end;
+ }
+
+ filelen = err = ext4fs_open(filename);
+ if (err < 0) {
+ puts("spl: ext4fs_open failed\n");
+ goto end;
+ }
+ err = ext4fs_read((char *)header, sizeof(struct image_header));
+ if (err <= 0) {
+ puts("spl: ext4fs_read failed\n");
+ goto end;
+ }
+
+ spl_parse_image_header(header);
+
+ err = ext4fs_read((char *)spl_image.load_addr, filelen);
+
+end:
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+ if (err <= 0)
+ printf("%s: error reading image %s, err - %d\n",
+ __func__, filename, err);
+#endif
+
+ return (err <= 0);
+}
+
+#ifdef CONFIG_SPL_OS_BOOT
+int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition)
+{
+ int err;
+ int filelen;
+ disk_partition_t part_info = {};
+ __maybe_unused char *file;
+
+ if (get_partition_info(block_dev,
+ partition, &part_info)) {
+ printf("spl: no partition table found\n");
+ return -1;
+ }
+
+ ext4fs_set_blk_dev(block_dev, &part_info);
+
+ err = ext4fs_mount(0);
+ if (!err) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+ printf("%s: ext4fs mount err - %d\n", __func__, err);
+#endif
+ return -1;
+ }
+
+#if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
+ file = getenv("falcon_args_file");
+ if (file) {
+ filelen = err = ext4fs_open(file);
+ if (err < 0) {
+ puts("spl: ext4fs_open failed\n");
+ goto defaults;
+ }
+ err = ext4fs_read( (void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen);
+ if (err <= 0) {
+ printf("spl: error reading image %s, err - %d, falling back to default\n",
+ file, err);
+ goto defaults;
+ }
+ file = getenv("falcon_image_file");
+ if (file) {
+ err = spl_load_image_ext(block_dev, partition, file);
+ if (err != 0) {
+ puts("spl: falling back to default\n");
+ goto defaults;
+ }
+
+ return 0;
+ } else
+ puts("spl: falcon_image_file not set in environment, falling back to default\n");
+ } else
+ puts("spl: falcon_args_file not set in environment, falling back to default\n");
+
+defaults:
+#endif
+
+ filelen = err = ext4fs_open(CONFIG_SPL_FS_LOAD_ARGS_NAME);
+ if (err < 0) {
+ puts("spl: ext4fs_open failed\n");
+ }
+ err = ext4fs_read( (void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen);
+ if (err <= 0) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+ printf("%s: error reading image %s, err - %d\n",
+ __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);
+#endif
+ return -1;
+ }
+
+ return spl_load_image_ext(block_dev, partition,
+ CONFIG_SPL_FS_LOAD_KERNEL_NAME);
+}
+#endif
+#endif
+
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index a631e0a..ee71f79 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -100,9 +100,10 @@ void spl_mmc_load_image(void)
#endif
err = mmc_load_image_raw(mmc,
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
-#ifdef CONFIG_SPL_FAT_SUPPORT
+#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
} else if (boot_mode == MMCSD_MODE_FS) {
- debug("boot mode - FAT\n");
+ debug("boot mode - FS\n");
+#ifdef CONFIG_SPL_FAT_SUPPORT
#ifdef CONFIG_SPL_OS_BOOT
if (spl_start_uboot() || spl_load_image_fat_os(&mmc->block_dev,
CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION))
@@ -110,7 +111,20 @@ void spl_mmc_load_image(void)
err = spl_load_image_fat(&mmc->block_dev,
CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION,
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+ if(err)
+#endif /* CONFIG_SPL_FAT_SUPPORT */
+ {
+#ifdef CONFIG_SPL_EXT_SUPPORT
+#ifdef CONFIG_SPL_OS_BOOT
+ if (spl_start_uboot() || spl_load_image_ext_os(&mmc->block_dev,
+ CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION))
#endif
+ err = spl_load_image_ext(&mmc->block_dev,
+ CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION,
+ CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+#endif /* CONFIG_SPL_EXT_SUPPORT */
+ }
+#endif /* defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) */
#ifdef CONFIG_SUPPORT_EMMC_BOOT
} else if (boot_mode == MMCSD_MODE_EMMCBOOT) {
/*
diff --git a/fs/Makefile b/fs/Makefile
index 1822165..51d06fc 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -8,6 +8,7 @@
ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/
+obj-$(CONFIG_SPL_EXT_SUPPORT) += ext4/
else
obj-y += fs.o
diff --git a/include/spl.h b/include/spl.h
index 58c81dc..f4688c0 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -72,6 +72,10 @@ void spl_sata_load_image(void);
int spl_load_image_fat(block_dev_desc_t *block_dev, int partition, const char *filename);
int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition);
+/* SPL EXT image functions */
+int spl_load_image_ext(block_dev_desc_t *block_dev, int partition, const char *filename);
+int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition);
+
#ifdef CONFIG_SPL_BOARD_INIT
void spl_board_init(void);
#endif
--
1.8.4.5
From 0c10154334aa4dd7bd40a6896a93f9cdfb83d2d2 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@free.fr>
Date: Fri, 19 Sep 2014 10:07:09 +0200
Subject: [PATCH 3/5] doc: Update documentation according to the EXT SPL
support patch set
---
README | 17 ++++++++++-------
doc/README.SPL | 1 +
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/README b/README
index 46def00..43b460c 100644
--- a/README
+++ b/README
@@ -3541,7 +3541,7 @@ FIT uImage format:
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR,
CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS,
- CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION
+ CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION
Address, size and partition on the MMC to load U-Boot from
when the MMC is being used in raw mode.
@@ -3558,16 +3558,19 @@ FIT uImage format:
CONFIG_SPL_FAT_SUPPORT
Support for fs/fat/libfat.o in SPL binary
- CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME
- Filename to read to load U-Boot when reading from FAT
+ CONFIG_SPL_EXT_SUPPORT
+ Support for EXT filesystem in SPL binary
- CONFIG_SPL_FAT_LOAD_KERNEL_NAME
+ CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
+ Filename to read to load U-Boot when reading from filesystem
+
+ CONFIG_SPL_FS_LOAD_KERNEL_NAME
Filename to read to load kernel uImage when reading
- from FAT (for Falcon mode)
+ from filesystem (for Falcon mode)
- CONFIG_SPL_FAT_LOAD_ARGS_NAME
+ CONFIG_SPL_FS_LOAD_ARGS_NAME
Filename to read to load kernel argument parameters
- when reading from FAT (for Falcon mode)
+ when reading from filesystem (for Falcon mode)
CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
Set this for NAND SPL on PPC mpc83xx targets, so that
diff --git a/doc/README.SPL b/doc/README.SPL
index c283dcf..3ba313c 100644
--- a/doc/README.SPL
+++ b/doc/README.SPL
@@ -54,6 +54,7 @@ CONFIG_SPL_SERIAL_SUPPORT (drivers/serial/libserial.o)
CONFIG_SPL_SPI_FLASH_SUPPORT (drivers/mtd/spi/libspi_flash.o)
CONFIG_SPL_SPI_SUPPORT (drivers/spi/libspi.o)
CONFIG_SPL_FAT_SUPPORT (fs/fat/libfat.o)
+CONFIG_SPL_EXT_SUPPORT
CONFIG_SPL_LIBGENERIC_SUPPORT (lib/libgeneric.o)
CONFIG_SPL_POWER_SUPPORT (drivers/power/libpower.o)
CONFIG_SPL_NAND_SUPPORT (drivers/mtd/nand/libnand.o)
--
1.8.4.5
From 238c02388b820ad685873038da23d5653aa00c64 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@free.fr>
Date: Fri, 19 Sep 2014 10:08:09 +0200
Subject: [PATCH 4/5] spl: do not hang in spl_register_fat_device but return
error value. It allows to use both CONFIG_SPL_FAT_SUPPORT and
CONFIG_SPL_EXT_SUPPORT.
---
common/spl/spl_fat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 91481fc..350f7d9 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -30,7 +30,7 @@ static int spl_register_fat_device(block_dev_desc_t *block_dev, int partition)
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
printf("%s: fat register err - %d\n", __func__, err);
#endif
- hang();
+ return err;
}
fat_registered = 1;
--
1.8.4.5
From b801768f6840702a397c4176cdcb64e2045cd6f1 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@free.fr>
Date: Fri, 19 Sep 2014 10:09:28 +0200
Subject: [PATCH 5/5] TI:OMAP4: enable EXT support in SPL for OMAP4 boards
---
include/configs/ti_omap4_common.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index b0f199e..1c93aab 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -167,6 +167,9 @@
#define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \
(128 << 20))
+/* SPL: Allow to use an EXT partition */
+#define CONFIG_SPL_EXT_SUPPORT
+
#ifdef CONFIG_NAND
#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */
#endif
--
1.8.4.5

View File

@ -1,22 +1,7 @@
Index: u-boot-2014.10-rc3/arch/arm/Kconfig
===================================================================
--- u-boot-2014.10-rc3.orig/arch/arm/Kconfig 2014-10-08 10:39:59.003117003 +0200
+++ u-boot-2014.10-rc3/arch/arm/Kconfig 2014-10-08 10:40:14.788116444 +0200
@@ -559,9 +559,6 @@ source "board/BuR/tseries/Kconfig"
source "board/BuS/eb_cpux9k2/Kconfig"
source "board/BuS/vl_ma2sc/Kconfig"
source "board/CarMediaLab/flea3/Kconfig"
-source "board/Marvell/aspenite/Kconfig"
-source "board/Marvell/dkb/Kconfig"
-source "board/Marvell/gplugd/Kconfig"
source "board/afeb9260/Kconfig"
source "board/altera/socfpga/Kconfig"
source "board/armadeus/apf27/Kconfig"
Index: u-boot-2014.10-rc3/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
===================================================================
--- u-boot-2014.10-rc3.orig/arch/arm/cpu/arm926ejs/kirkwood/Kconfig 2014-10-08 10:39:58.976117004 +0200
+++ u-boot-2014.10-rc3/arch/arm/cpu/arm926ejs/kirkwood/Kconfig 2014-10-08 10:40:14.789116444 +0200
@@ -65,12 +65,6 @@ config SYS_CPU
diff -purN u-boot-2015.01-rc1.orig/arch/arm/cpu/arm926ejs/kirkwood/Kconfig u-boot-2015.01-rc1/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
--- u-boot-2015.01-rc1.orig/arch/arm/cpu/arm926ejs/kirkwood/Kconfig 2014-11-11 15:14:37.466020309 +0100
+++ u-boot-2015.01-rc1/arch/arm/cpu/arm926ejs/kirkwood/Kconfig 2014-11-11 15:15:01.306019465 +0100
@@ -62,12 +62,6 @@ endchoice
config SYS_SOC
default "kirkwood"
@ -29,16 +14,18 @@ Index: u-boot-2014.10-rc3/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
source "board/buffalo/lsxl/Kconfig"
source "board/cloudengines/pogo_e02/Kconfig"
source "board/d-link/dns325/Kconfig"
Index: u-boot-2014.10-rc3/arch/powerpc/cpu/74xx_7xx/Kconfig
===================================================================
--- u-boot-2014.10-rc3.orig/arch/powerpc/cpu/74xx_7xx/Kconfig 2014-10-08 10:39:58.947117005 +0200
+++ u-boot-2014.10-rc3/arch/powerpc/cpu/74xx_7xx/Kconfig 2014-10-08 10:40:14.789116444 +0200
@@ -36,8 +36,6 @@ config TARGET_P3MX
endchoice
-source "board/Marvell/db64360/Kconfig"
-source "board/Marvell/db64460/Kconfig"
source "board/eltec/elppc/Kconfig"
source "board/esd/cpci750/Kconfig"
source "board/evb64260/Kconfig"
diff -purN u-boot-2015.01-rc1.orig/arch/arm/Kconfig u-boot-2015.01-rc1/arch/arm/Kconfig
--- u-boot-2015.01-rc1.orig/arch/arm/Kconfig 2014-11-11 15:14:38.261020281 +0100
+++ u-boot-2015.01-rc1/arch/arm/Kconfig 2014-11-11 15:50:06.519944920 +0100
@@ -815,10 +815,6 @@ source "board/BuR/tseries/Kconfig"
source "board/BuS/eb_cpux9k2/Kconfig"
source "board/BuS/vl_ma2sc/Kconfig"
source "board/CarMediaLab/flea3/Kconfig"
-source "board/Marvell/aspenite/Kconfig"
-source "board/Marvell/db-mv784mp-gp/Kconfig"
-source "board/Marvell/dkb/Kconfig"
-source "board/Marvell/gplugd/Kconfig"
source "board/afeb9260/Kconfig"
source "board/altera/socfpga/Kconfig"
source "board/armadeus/apf27/Kconfig"

View File

@ -1,12 +0,0 @@
Index: include/configs/ti_armv7_common.h
===================================================================
--- include/configs/ti_armv7_common.h.orig
+++ include/configs/ti_armv7_common.h
@@ -174,6 +174,7 @@
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_ECHO
#define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD
/*
* Common filesystems support. When we have removable storage we

View File

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

View File

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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-am335xevm
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the am335xevm arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-arndale
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the arndale arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-colibrit20iris
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the colibrit20iris arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-cubieboard
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the cubieboard arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-cubieboard2
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the cubieboard2 arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-cubietruck
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the cubietruck arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-highbank
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the highbank arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-melea1000
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the melea1000 arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-mx53loco
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the mx53loco arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-mx6qsabrelite
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the mx6qsabrelite arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-omap3beagle
Version: 2014.10
Version: 2015.01~rc1
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: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-omap4panda
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the omap4panda arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-paz00
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the paz00 arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-rpib
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the rpib arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-snow
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the snow arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -25,20 +25,19 @@
%define cuboxi_spl 0
Name: u-boot-vexpressaemv8a
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the vexpressaemv8a arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org
- Update to 2015.01-rc1
- Drop upstreamed patches:
* add_spl_extfs_support.patch
* ti_common_initrd_support.patch
- Refresh patch:
* drop-marvell.patch
- Drop CREDITS file from DOC (dropped upstream)
-------------------------------------------------------------------
Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org

View File

@ -19,13 +19,14 @@
Name: u-boot
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: Tools for the u-boot Firmware
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: u-boot-%{version}.tar.bz2
#Source: u-boot-%{version}.tar.bz2
Source: u-boot-2015.01-rc1.tar.bz2
BuildRequires: libopenssl-devel
BuildRequires: python
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -46,7 +47,8 @@ This package contains:
mkimage- a tool that creates kernel bootable images for u-boot.
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
%build
# needed for include/config/auto.conf

View File

@ -25,20 +25,19 @@
%define cuboxi_spl CUBOXI_SPL
Name: u-boot-BOARDNAME
Version: 2014.10
Version: 2015.01~rc1
Release: 0
Summary: The u-boot firmware for the BOARDNAME arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
#Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-2015.01-rc1.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
Patch0: add_spl_extfs_support.patch
Patch1: enable_spl_ext_support_for_ti_armv7.patch
Patch2: fix_beagle_spl_build.patch
Patch3: fix_omap_boot_mode.patch
Patch4: ti_common_initrd_support.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
@ -72,18 +71,17 @@ Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded Pow
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
#%setup -q -n u-boot-%{version}
%setup -q -n u-boot-2015.01-rc1
# 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
%patch0 -p1
%patch1
%patch2 -p1
# Fix SPL boot mode for OMAP3 and OMAP4 boards only
%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
%patch3
%endif
%patch4
%patch5
%patch6
%patch7
@ -137,7 +135,7 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%doc Licenses/gpl-2.0.txt README
%files doc
%defattr(-,root,root)