diff --git a/mlo-ext2.patch b/mlo-ext2.patch index 24b7347..4fe11a9 100644 --- a/mlo-ext2.patch +++ b/mlo-ext2.patch @@ -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/drivers/mmc/spl_mmc.c -@@ -67,6 +67,53 @@ end: +@@ -67,6 +67,59 @@ end: } #ifdef CONFIG_SPL_FAT_SUPPORT @@ -12,12 +12,18 @@ Index: u-boot-2012.10/drivers/mmc/spl_mmc.c + struct image_header *header; + char *payloadname; + int filelen; ++ disk_partition_t part_info = {}; + + header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - + sizeof(struct image_header)); + -+ err = ext4fs_set_blk_dev(&mmc->block_dev, -+ CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION); ++ if (get_partition_info(&mmc->block_dev, ++ 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) { + printf("spl: ext4fs register err - %d\n", err); + hang(); @@ -56,7 +62,7 @@ Index: u-boot-2012.10/drivers/mmc/spl_mmc.c static void mmc_load_image_fat(struct mmc *mmc) { s32 err; -@@ -121,13 +168,15 @@ void spl_mmc_load_image(void) +@@ -121,13 +174,15 @@ void spl_mmc_load_image(void) hang(); } boot_mode = spl_boot_mode(); @@ -73,56 +79,6 @@ Index: u-boot-2012.10/drivers/mmc/spl_mmc.c #endif } else { 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 - #include - -+#ifndef CONFIG_SPL_BUILD -+ -+#include -+ -+#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 =================================================================== --- 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_POWER_SUPPORT) += drivers/power/libpower.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 --#include - #include - #include - #include -@@ -905,6 +904,45 @@ void ext4fs_deinit(void) - fs->inode_bmaps = NULL; - } - -+#ifndef CONFIG_SPL_BUILD -+ -+#include -+ -+#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; diff --git a/u-boot-highbank.changes b/u-boot-highbank.changes index a6bf49d..ce96f4f 100644 --- a/u-boot-highbank.changes +++ b/u-boot-highbank.changes @@ -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 diff --git a/u-boot-mx53loco.changes b/u-boot-mx53loco.changes index a6bf49d..ce96f4f 100644 --- a/u-boot-mx53loco.changes +++ b/u-boot-mx53loco.changes @@ -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 diff --git a/u-boot-omap4panda.changes b/u-boot-omap4panda.changes index a6bf49d..ce96f4f 100644 --- a/u-boot-omap4panda.changes +++ b/u-boot-omap4panda.changes @@ -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 diff --git a/u-boot-origen.changes b/u-boot-origen.changes index a6bf49d..ce96f4f 100644 --- a/u-boot-origen.changes +++ b/u-boot-origen.changes @@ -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 diff --git a/u-boot-u8500href.changes b/u-boot-u8500href.changes index a6bf49d..ce96f4f 100644 --- a/u-boot-u8500href.changes +++ b/u-boot-u8500href.changes @@ -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 diff --git a/u-boot.changes b/u-boot.changes index 7a9aee5..ce96f4f 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -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