From fb6d5953fcb70c317c273a3f324c4523f613d16b Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Sat, 9 Jan 2016 14:42:55 +0800 Subject: [PATCH] u-boot-qoirq: update to commit eb3d4fc New commit imported: eb3d4fc powerpc/mpc85xx: fix disable port for FMAN erratum A007273 63dfac1 powerpc/mpc85xx: restrict platform for FMAN erratum A007273 54e5fde powerpc/mpc85xx: Add workaround for FMAN erratum A007273 61ac6ba drivers:usb:fsl: Add affected SOCs for USB Erratum A007792 ced4086 fsl/ddr: updated ddr errata-A008378 for arm and power SoCs 17f724f fsl/errata: move fsl_errata.h to common directory 6acff65 arm: ls102x: add get_svr and IS_SVR_REV helper 0caf24c arm: ls102xa: Set fdt_high and initrd_high to the value of 0xffffffff 263a323 powerpc: e6500: Lock/unlock L2 cache instead of L1 as init_ram f28fd70 powerpc: configs: Fix init_ram physical address for several boards 46be0a4 ls102xa: fdt: Disable IFC in SD boot for QSPI f1ca68a ls102xa: etsec: Use proper settings for BE BDs e0712fe mpc85xx/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_ definition a04b8b3 mmc: fsl_esdhc: fix mmc read/write error on T4160/T4080 23a735b arm: ls1021a: Fix the patch check warnings for the previous commit 5a42d5d SECURE_BOOT: Correct reading of ITS bit f6310eb arm: ls1021a: Add QSPI or IFC support in SD boot ab2db1a arm: ls102xa: fix patch check issue. 7611d2c Merge pull request #40 in SDK/u-boot-devel from ~B29983/u-boot-devel-tyt:feature/QUBOOT-1181-the-u-boot-deepsleep-resume-time to master d406c4f arm: ls102xa: enable all the snoop signal for masters. 1686b84 Merge pull request #38 in SDK/u-boot-devel from ~B46683/u-boot-devel:bugfix/QUBOOT-1173-ls1021atwr-sd-boot-don-t-support to master 0258a33 Merge pull request #37 in SDK/u-boot-devel from ~B18965/my-u-boot-devel:master to master dfc49e9 arm: ls1021atwr: optimize the deep sleep latency 2023326 Merge pull request #34 in SDK/u-boot-devel from ~B40530/u-boot-devel:feature/QUBOOT-789-sd-boot-on-t4-rdb to master 3a8f547 Merge pull request #35 in SDK/u-boot-devel from ~B47093/u-boot-devel-sdhc:feature/QLINUX-3755-support-the-uhs-speed-mode-for to master e4957df Merge pull request #31 in SDK/u-boot-devel from DNNPI/ls1-uboot:feature/LS1-for-SDK1.9 to master 774b080 configs: ls1021atwr: Enable ID EEPROM for SD boot 95a9abb arm: mmu: Add missing volatile for reading SCTLR register c9a7868 mmc: fsl_esdhc: enable EVDD automatic control for SD/MMC legacy card 3fe5a18 Merge pull request #27 in SDK/u-boot-devel from ~B45475/u-boot-devel-fork:feature/QUBOOT-1057-support-qe-tdm-on-t1040rdbd4 to master 767a4ad powerpc/t1040qds: enable peripheral clock for eSDHC 0867fed powerpc/t1040qds: enable adapter card type identification support 26d6853 mmc: fsl_esdhc: enable dat[4:7] for eMMC4.5 acd4c74 powerpc/t4rdb: Add SD boot support for T4240RDB board b773c94 configs: ls1021atwr: Disable DSPI2 with NOR boot 98bf337 mtd: sf: Add support AT26DF081A chip 91bdf34 dm: dts: ls1021a-twr: Enable DSPI2 on LS1021ATWR 7289cb9 configs: ls1021atwr: Enable DSPI for LS1021ATWR 870af21 t1040d4rdb: assign muxed pins to qe-tdm when set hwconfig qe-tdm 300674e powerpc/t1023rdb: change default core frequency to 1200MHz 45f88eb powerpc/t1023rdb: eMMC boot without external SD card aee4875 board/t1023rdb: add support for T1023RDB RevC 2c86026 ls1021atwr: sdboot: change serdes 0x20 to 0x30 8d38d25 LS102XA:workaround:disable priorities within DDR 2621445 arm: ls1021a: allow OCRAM access permission as R/W in SPL 10bc2b0 crypto/fsl: fix "era" property value on LE platforms 6d5733d arm: ls102xa: enable snooping for CAAM transactions d3e6f11 Revert "Enable snooping on transactions from CAAM block" a5dc0f7 arm: ls1021a: Ensure LS1021 ARM Generic Timer CompareValue Set 64-bit 0669b57 LS102XA: Workaround: DDR require a register write 449ab6a ls102xa: Enable snoop and DVM message requests. 6ae8810 Revert "arm: ls102xa: workaround for cache coherency problem" 617f1fd Revert "sf: Add support for flag status register on Micron chips" 18bd7bb arm: ls102xa: Add LE mode support for audio IPs on Rev2.0 silicon 80a22d8 QE: modify the address of qe ucode 784f7f2 arm: ls1021atwr: program the regulator for deep sleep 8971e50 ls1021atwr: added deep sleep support in uboot 9f692ae ls102xa: etsec: Enable Tx Data and TxBD snooping 79da560 arm/ls102xa:Add support of conditional workaround implementation as per SoC ver b6876d0 arm: ls102xa: Adjust the load address of U-Boot for NOR boot Remove the useless Fix-the-depend-race-issue.patch. Signed-off-by: Ting Liu Signed-off-by: Zhenhua Luo Signed-off-by: Otavio Salvador --- ...-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch | 77 ------------------- .../files/Fix-the-depend-race-issue.patch | 38 --------- recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb | 5 +- 3 files changed, 2 insertions(+), 118 deletions(-) delete mode 100644 recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch delete mode 100644 recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch diff --git a/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch b/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch deleted file mode 100644 index e6b8d2e5..00000000 --- a/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 9ba002f1b1afc7af84a352f4ecab32a30d7ba353 Mon Sep 17 00:00:00 2001 -From: Zhenhua Luo -Date: Mon, 9 Feb 2015 18:33:56 +0800 -Subject: [PATCH] u-boot/mpc85xx/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_ - definition - -In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in -u-boot.lds overrides the linker built-in symbols -(https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=b893397a4b1316610f49819344817715e4305de9), -so the linker is treating _GLOBAL_OFFSET_TABLE_ as a definition into the .reloc section. - -To align with the change of binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbol -should not be defined in sections, and the symbols in linker generated .got -section should be used(https://sourceware.org/ml/binutils/2008-09/msg00122.html). - -Fixed the following build errors with binutils-2.25: -| powerpc-poky-linux-gnuspe-ld.bfd: _GLOBAL_OFFSET_TABLE_ not defined in linker created .got - -Signed-off-by: Zhenhua Luo ---- - arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 1 - - arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 1 - - arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 1 - - arch/powerpc/cpu/mpc85xx/u-boot.lds | 1 - - 4 files changed, 4 deletions(-) - -diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds -index f933b21..0399f93 100644 ---- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds -+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds -@@ -44,7 +44,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } -diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds -index b83c553..f044564 100644 ---- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds -+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds -@@ -22,7 +22,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } -diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds -index 5ae7b3e..889a4c2 100644 ---- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds -+++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds -@@ -29,7 +29,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } -diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds -index 2cf0b25..f15eaf3 100644 ---- a/arch/powerpc/cpu/mpc85xx/u-boot.lds -+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds -@@ -50,7 +50,6 @@ SECTIONS - _GOT2_TABLE_ = .; - KEEP(*(.got2)) - KEEP(*(.got)) -- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); - _FIXUP_TABLE_ = .; - KEEP(*(.fixup)) - } --- -2.1.0 - diff --git a/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch b/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch deleted file mode 100644 index 1ddc6675..00000000 --- a/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Pending - -From 301832414369b749918e0d5db850eed19b81c0fc Mon Sep 17 00:00:00 2001 -From: Zhenhua Luo -Date: Tue, 24 Sep 2013 00:54:40 -0500 -Subject: [PATCH] Fix the depend race issue - -| make[3]: Entering directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx' -| /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/.depend:125: *** missing separator. Stop. -| make[3]: Leaving directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx' -| make[2]: *** [/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/start.o] Error 2 -| make[2]: *** Waiting for unfinished jobs.... - -Signed-off-by: Zhenhua Luo ---- - spl/Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/spl/Makefile b/spl/Makefile -index 6dbb105..3156d87 100644 ---- a/spl/Makefile -+++ b/spl/Makefile -@@ -185,7 +185,11 @@ $(eval $(call make_u_boot_list, $(obj)u-boot.lst, $(LIBS))) - $(obj)u-boot-spl.lds: $(LDSCRIPT) $(obj)u-boot.lst depend - $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@ - --depend: $(obj).depend -+# Explicitly make _depend in subdirs containing multiple targets to prevent -+# parallel sub-makes creating .depend files simultaneously. -+depend dep: $(obj).depend -+ for dir in $(SUBDIRS) $(CPUDIR) $(LDSCRIPT_MAKEFILE_DIR) ; do \ -+ $(MAKE) -C $(SRCTREE)/$$dir _depend ; done - .PHONY: depend - - # defines $(obj).depend target --- -1.8.2.1 - diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb index dfb698c0..6df17206 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb @@ -22,13 +22,12 @@ DEPENDS_append_qoriq-ppc = " boot-format-native" inherit deploy -SRCBRANCH = "sdk-v1.8.x" +SRCBRANCH = "sdk-v1.9.x" SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;branch=${SRCBRANCH} \ - file://0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch \ file://gcc5.patch \ file://add-fgnu89-inline-option-for-gcc5.patch \ " -SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad" +SRCREV = "eb3d4fc5759729d7af71ac31ebf6a7e8d0e79da3" python () { if d.getVar("TCMODE", True) == "external-fsl": -- 2.40.1