rpm/u-boot
SHA256
1
0
Fork 0
forked from pool/u-boot
Code Pull Requests Activity

Accepting request 160204 from Base:System

Browse Source 
- fix mlo-ext2.patch to actually use the ext4 infrastructure

- update mlo-ext2.patch:
  * use the ext4 driver now since ext2 got removed

- fix mlo-ext2.patch to actually use the ext4 infrastructure

- update mlo-ext2.patch:
  * use the ext4 driver now since ext2 got removed

- fix mlo-ext2.patch to actually use the ext4 infrastructure

- update mlo-ext2.patch:
  * use the ext4 driver now since ext2 got removed

- fix mlo-ext2.patch to actually use the ext4 infrastructure

- update mlo-ext2.patch:
  * use the ext4 driver now since ext2 got removed

- fix mlo-ext2.patch to actually use the ext4 infrastructure

- update mlo-ext2.patch:
  * use the ext4 driver now since ext2 got removed

- fix mlo-ext2.patch to actually use the ext4 infrastructure (forwarded request 160169 from algraf)

OBS-URL: https://build.opensuse.org/request/show/160204
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=11
This commit is contained in:
Stephan Kulow 2013-03-21 09:51:13 +00:00 committed by Git OBS Bridge
parent 7ffccd1546
commit bd8a6d0328
7 changed files with 70 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
mlo-ext2.patch
View File

@ -2,7 +2,7 @@ Index: u-boot-2012.10/drivers/mmc/spl_mmc.c
=================================================================== ===================================================================
--- u-boot-2012.10.orig/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-2012.10/drivers/mmc/spl_mmc.c
@@ -67,6 +67,53 @@ end: @@ -67,6 +67,59 @@ end:
} }
#ifdef CONFIG_SPL_FAT_SUPPORT #ifdef CONFIG_SPL_FAT_SUPPORT
@ -12,12 +12,18 @@ Index: u-boot-2012.10/drivers/mmc/spl_mmc.c
+ struct image_header *header; + struct image_header *header;
+ char *payloadname; + char *payloadname;
+ int filelen; + int filelen;
+ disk_partition_t part_info = {};
+ +
+ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - + header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
+ sizeof(struct image_header)); + sizeof(struct image_header));
+ +
+ err = ext4fs_set_blk_dev(&mmc->block_dev, + if (get_partition_info(&mmc->block_dev,
+ CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION); + CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION, &part_info)) {
+ printf("spl: no partition table found\n");
+ hang();
+ }
+
+ err = ext4fs_set_blk_dev(&mmc->block_dev, &part_info);
+ if (!err) { + if (!err) {
+ printf("spl: ext4fs register err - %d\n", err); + printf("spl: ext4fs register err - %d\n", err);
+ hang(); + hang();
@ -56,7 +62,7 @@ Index: u-boot-2012.10/drivers/mmc/spl_mmc.c
static void mmc_load_image_fat(struct mmc *mmc) static void mmc_load_image_fat(struct mmc *mmc)
{ {
s32 err; s32 err;
@@ -121,13 +168,15 @@ void spl_mmc_load_image(void) @@ -121,13 +174,15 @@ void spl_mmc_load_image(void)
hang(); hang();
} }
boot_mode = spl_boot_mode(); boot_mode = spl_boot_mode();
@ -73,56 +79,6 @@ Index: u-boot-2012.10/drivers/mmc/spl_mmc.c
#endif #endif
} else { } else {
puts("spl: wrong MMC boot mode\n"); puts("spl: wrong MMC boot mode\n");
Index: u-boot-2012.10/fs/ext4/dev.c
===================================================================
--- u-boot-2012.10.orig/fs/ext4/dev.c
+++ u-boot-2012.10/fs/ext4/dev.c
@@ -41,6 +41,45 @@
#include <ext4fs.h>
#include <ext_common.h>
+#ifndef CONFIG_SPL_BUILD
+
+#include <malloc.h>
+
+#else
+
+/* compat stuff */
+
+void *free_buf;
+void *topmost_entry;
+int topmost_size;
+char heap[10240];
+
+static inline void *malloc(int size)
+{
+ void *r;
+ if (!free_buf)
+ free_buf = heap;
+ memset(free_buf, 0, size);
+ r = free_buf;
+ free_buf += size;
+ topmost_entry = r;
+ topmost_size = size;
+ return r;
+}
+
+static inline void free(void *p)
+{
+ if (p == topmost_entry) {
+ free_buf -= topmost_size;
+ topmost_entry = 0;
+ } else {
+ printf("leaked %d bytes\n", topmost_size);
+ }
+}
+
+#endif
+
+
unsigned long part_offset;
static block_dev_desc_t *ext4fs_block_dev_desc;
Index: u-boot-2012.10/include/configs/omap3_beagle.h Index: u-boot-2012.10/include/configs/omap3_beagle.h
=================================================================== ===================================================================
--- u-boot-2012.10.orig/include/configs/omap3_beagle.h --- u-boot-2012.10.orig/include/configs/omap3_beagle.h
@ -176,61 +132,3 @@ Index: u-boot-2012.10/spl/Makefile
LIBS-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/libgeneric.o LIBS-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/libgeneric.o
LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/libpower.o LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/libpower.o
LIBS-$(CONFIG_SPL_NAND_SUPPORT) += drivers/mtd/nand/libnand.o LIBS-$(CONFIG_SPL_NAND_SUPPORT) += drivers/mtd/nand/libnand.o
Index: u-boot-2012.10/fs/ext4/ext4fs.c
===================================================================
--- u-boot-2012.10.orig/fs/ext4/ext4fs.c
+++ u-boot-2012.10/fs/ext4/ext4fs.c
@@ -34,7 +34,6 @@
*/
#include <common.h>
-#include <malloc.h>
#include <ext_common.h>
#include <ext4fs.h>
#include <linux/stat.h>
@@ -905,6 +904,45 @@ void ext4fs_deinit(void)
fs->inode_bmaps = NULL;
}
+#ifndef CONFIG_SPL_BUILD
+
+#include <malloc.h>
+
+#else
+
+/* compat stuff */
+
+void *free_buf;
+void *topmost_entry;
+int topmost_size;
+char heap[10240];
+
+static inline void *malloc(int size)
+{
+ void *r;
+ if (!free_buf)
+ free_buf = heap;
+ memset(free_buf, 0, size);
+ r = free_buf;
+ free_buf += size;
+ topmost_entry = r;
+ topmost_size = size;
+ return r;
+}
+
+static inline void free(void *p)
+{
+ if (p == topmost_entry) {
+ free_buf -= topmost_size;
+ topmost_entry = 0;
+ } else {
+ printf("leaked %d bytes\n", topmost_size);
+ }
+}
+
+#endif
+
+
free(fs->gdtable);
fs->gdtable = NULL;

11
u-boot-highbank.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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 Wed Oct 24 22:33:13 UTC 2012 - agraf@suse.com

11
u-boot-mx53loco.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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 Wed Oct 24 22:33:13 UTC 2012 - agraf@suse.com

11
u-boot-omap4panda.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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 Wed Oct 24 22:33:13 UTC 2012 - agraf@suse.com

11
u-boot-origen.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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 Wed Oct 24 22:33:13 UTC 2012 - agraf@suse.com

11
u-boot-u8500href.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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 Wed Oct 24 22:33:13 UTC 2012 - agraf@suse.com

5
u-boot.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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 Sat Jan 26 10:38:07 UTC 2013 - dmueller@suse.com