- remove upstream patches - disable THUMB mode on OMAP3 this increases binary size (remove CONFIG_SYS_THUMB_BUILD) - reduce SPL size by disabling EXT feature (remove CONFIG_SPL_EXT_SUPPORT)
this fixes 2015.07 and 2015.10-rc3 Beagleboard C4 booting which were broken by upstream commit with id: bd2c4522c26d535515aebca52d27c004a7e0c05c Arm THUMB mode is broken because of an yet unknown errata see: http://lists.denx.de/pipermail/u-boot/2015-August/225793.html Signed-off-by: Dirk Neukirchen <dirkneukirc...@web.de> --- The previous patch had some issues: - patch series not needed - sign-off missing I bisected the boot issue on beagleboard C4 and later found some mailing list post with the same problem - so I reverted the commit that is breaking boot. Divide the revert into 2 patches because one is a compile fix (affects size/features) while the other is the Arm errata/THUMB problem. be aware uboot 2015.10-rc3 has some changes to default ubootenv that affect boot scripts. package/boot/uboot-omap/Makefile | 4 +-- .../uboot-omap/patches/001-switch_omap4_ext4.patch | 6 ++-- .../boot/uboot-omap/patches/002-fix_jffs2.patch | 34 ---------------------- .../uboot-omap/patches/003-fix_findfdt_C4.patch | 11 ------- .../patches/010-omap3_disable_thumb.patch | 11 +++++++ .../patches/011-omap3_reduce_spl_rodata.patch | 10 +++++++ 6 files changed, 26 insertions(+), 50 deletions(-) delete mode 100644 package/boot/uboot-omap/patches/002-fix_jffs2.patch delete mode 100644 package/boot/uboot-omap/patches/003-fix_findfdt_C4.patch create mode 100644 package/boot/uboot-omap/patches/010-omap3_disable_thumb.patch create mode 100644 package/boot/uboot-omap/patches/011-omap3_reduce_spl_rodata.patch diff --git a/package/boot/uboot-omap/Makefile b/package/boot/uboot-omap/Makefile index e21e2e1..0b5c51c 100644 --- a/package/boot/uboot-omap/Makefile +++ b/package/boot/uboot-omap/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=u-boot -PKG_VERSION:=2013.10 +PKG_VERSION:=2015.10-rc3 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://mirror2.openwrt.org/sources \ ftp://ftp.denx.de/pub/u-boot -PKG_MD5SUM:=a076a044b64371edc52f7e562b13f6b2 +PKG_MD5SUM:=e7a72e070ca43b6b1979007d764e625e PKG_LICENSE:=GPL-2.0 GPL-2.0+ PKG_LICENSE_FILES:=Licenses/README diff --git a/package/boot/uboot-omap/patches/001-switch_omap4_ext4.patch b/package/boot/uboot-omap/patches/001-switch_omap4_ext4.patch index d741c08..785a750 100644 --- a/package/boot/uboot-omap/patches/001-switch_omap4_ext4.patch +++ b/package/boot/uboot-omap/patches/001-switch_omap4_ext4.patch @@ -1,6 +1,6 @@ ---- a/include/configs/omap4_common -+++ b/include/configs/omap4_common.h -@@ -143,7 +143,7 @@ +--- a/include/configs/ti_omap4_common.h ++++ b/include/configs/ti_omap4_common.h +@@ -92,7 +92,7 @@ "vram=16M\0" \ "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \ diff --git a/package/boot/uboot-omap/patches/002-fix_jffs2.patch b/package/boot/uboot-omap/patches/002-fix_jffs2.patch deleted file mode 100644 index cba0e25..0000000 --- a/package/boot/uboot-omap/patches/002-fix_jffs2.patch +++ /dev/null @@ -1,34 +0,0 @@ -Building boards that have JFFS2 support enabled will fail when using -U-Boot's builtin GCC library, for example like this: - -USE_PRIVATE_LIBGCC=yes ./MAKEALL omap3_evm -... -fs/jffs2/libjffs2.o: In function `jffs2_1pass_build_lists': -fs/jffs2/jffs2_1pass.c:1441: undefined reference to `__aeabi_uldivmod' - -This is caused by a u64 / u32 division in jffs2_1pass.c; the problem -can be avoided by using do_div() instead of plain division. - -Signed-off-by: Wolfgang Denk <w...@denx.de> -Reported-by: Chris Ruehl <chris.ru...@gtsys.com.hk> -Cc: Chris Ruehl <chris.ru...@gtsys.com.hk> - ---- - fs/jffs2/jffs2_1pass.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c -index c856983..a7dbe79 100644 ---- a/fs/jffs2/jffs2_1pass.c -+++ b/fs/jffs2/jffs2_1pass.c -@@ -1438,7 +1438,7 @@ jffs2_1pass_build_lists(struct part_info * part) - { - struct b_lists *pL; - struct jffs2_unknown_node *node; -- u32 nr_sectors = part->size/part->sector_size; -+ u32 nr_sectors = do_div(part->size, part->sector_size); - u32 i; - u32 counter4 = 0; - u32 counterF = 0; --- -1.8.3.1 diff --git a/package/boot/uboot-omap/patches/003-fix_findfdt_C4.patch b/package/boot/uboot-omap/patches/003-fix_findfdt_C4.patch deleted file mode 100644 index b0b85e5..0000000 --- a/package/boot/uboot-omap/patches/003-fix_findfdt_C4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -242,6 +242,8 @@ - "setenv fdtfile omap3-beagle.dtb; fi; " \ - "if test $beaglerev = Cx; then " \ - "setenv fdtfile omap3-beagle.dtb; fi; " \ -+ "if test $beaglerev = C4; then " \ -+ "setenv fdtfile omap3-beagle.dtb; fi; " \ - "if test $beaglerev = xMAB; then " \ - "setenv fdtfile omap3-beagle-xm.dtb; fi; " \ - "if test $beaglerev = xMC; then " \ diff --git a/package/boot/uboot-omap/patches/010-omap3_disable_thumb.patch b/package/boot/uboot-omap/patches/010-omap3_disable_thumb.patch new file mode 100644 index 0000000..7b7bfa8 --- /dev/null +++ b/package/boot/uboot-omap/patches/010-omap3_disable_thumb.patch @@ -0,0 +1,11 @@ +--- a/include/configs/ti_armv7_common.h ++++ b/include/configs/ti_armv7_common.h +@@ -233,8 +233,6 @@ + #define CONFIG_SPL_EXT_SUPPORT + #endif + +-#define CONFIG_SYS_THUMB_BUILD +- + /* General parts of the framework, required. */ + #define CONFIG_SPL_I2C_SUPPORT + #define CONFIG_SPL_LIBCOMMON_SUPPORT diff --git a/package/boot/uboot-omap/patches/011-omap3_reduce_spl_rodata.patch b/package/boot/uboot-omap/patches/011-omap3_reduce_spl_rodata.patch new file mode 100644 index 0000000..9e0e47c --- /dev/null +++ b/package/boot/uboot-omap/patches/011-omap3_reduce_spl_rodata.patch @@ -0,0 +1,10 @@ +--- a/include/configs/ti_armv7_common.h ++++ b/include/configs/ti_armv7_common.h +@@ -230,7 +230,6 @@ + #define CONFIG_SPL_LIBDISK_SUPPORT + #define CONFIG_SPL_MMC_SUPPORT + #define CONFIG_SPL_FAT_SUPPORT +-#define CONFIG_SPL_EXT_SUPPORT + #endif + + /* General parts of the framework, required. */ -- 2.5.2 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel