Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2013-03-21 10:51:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot-highbank.changes 2012-12-28 22:50:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-highbank.changes 2013-03-21 10:51:15.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Mar 20 07:21:06 UTC 2013 - [email protected] + +- fix mlo-ext2.patch to actually use the ext4 infrastructure + +------------------------------------------------------------------- +Sat Jan 26 10:38:07 UTC 2013 - [email protected] + +- update mlo-ext2.patch: + * use the ext4 driver now since ext2 got removed + +------------------------------------------------------------------- u-boot-mx53loco.changes: same change u-boot-omap4panda.changes: same change u-boot-origen.changes: same change u-boot-u8500href.changes: same change --- /work/SRC/openSUSE:Factory/u-boot/u-boot.changes 2013-01-30 09:40:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot.changes 2013-03-21 10:51:15.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 20 07:21:06 UTC 2013 - [email protected] + +- fix mlo-ext2.patch to actually use the ext4 infrastructure + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ u-boot-mx53loco.spec: same change u-boot-omap4panda.spec: same change u-boot-origen.spec: same change u-boot-u8500href.spec: same change u-boot.spec: same change ++++++ mlo-ext2.patch ++++++ --- /var/tmp/diff_new_pack.s30aKk/_old 2013-03-21 10:51:20.000000000 +0100 +++ /var/tmp/diff_new_pack.s30aKk/_new 2013-03-21 10:51:20.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- 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 @@ + 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 @@ 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 @@ #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 <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 =================================================================== --- u-boot-2012.10.orig/include/configs/omap3_beagle.h @@ -176,61 +132,3 @@ 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 <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; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
