diff options
author | Martin Schiller <ms@dev.tdt.de> | 2021-10-07 08:56:19 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-12-13 23:22:29 +0100 |
commit | 674af9c1f6a811fdf1f1a82dc16ce19175a6e6d2 (patch) | |
tree | 1cd7737dba714d08513e4136379becb6e07c2999 /package/boot/uboot-layerscape/patches | |
parent | 8ef768c2efda99b9da7efcb1ff2a1864916f00d7 (diff) | |
download | upstream-674af9c1f6a811fdf1f1a82dc16ce19175a6e6d2.tar.gz upstream-674af9c1f6a811fdf1f1a82dc16ce19175a6e6d2.tar.bz2 upstream-674af9c1f6a811fdf1f1a82dc16ce19175a6e6d2.zip |
uboot-layerscape: bump to LSDK-21.08
Update layerscape u-boot package to LSDK-21.08 and drop patches which
are no longer needed.
The new env variable 'fsl_bootcmd_mcinitcmd_set' is needed to protect
the configured bootcmd and mc_init values. See [1] for more
informations.
[1] https://source.denx.de/u-boot/u-boot/-/commit/b62c174e861bddc3c7131045ed018556645cecb9
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Diffstat (limited to 'package/boot/uboot-layerscape/patches')
3 files changed, 67 insertions, 46 deletions
diff --git a/package/boot/uboot-layerscape/patches/0001-board-ls1046ardb-force-PCI-device-enumeration.patch b/package/boot/uboot-layerscape/patches/0001-board-ls1046ardb-force-PCI-device-enumeration.patch new file mode 100644 index 0000000000..25a6b16363 --- /dev/null +++ b/package/boot/uboot-layerscape/patches/0001-board-ls1046ardb-force-PCI-device-enumeration.patch @@ -0,0 +1,33 @@ +From 089b90b11008ec95a56da12e31d11e3f31a9bb26 Mon Sep 17 00:00:00 2001 +From: Martin Schiller <ms@dev.tdt.de> +Date: Wed, 17 Nov 2021 07:29:55 +0100 +Subject: [PATCH] board: ls1046ardb: force PCI device enumeration + +Commit 045ecf899252 ("configs: enable DM_ETH support for LS1046ARDB") +resulted in the PCI bus no longer being implicitly enumerated. + +However, this is necessary for the fdt pcie fixups to work. + +Therefore, similar to commit 8b6558bd4187 ("board: ls1088ardb: +transition to DM_ETH"), pci_init() is now called in the board_init() +routine when CONFIG_DM_ETH is active. + +Signed-off-by: Martin Schiller <ms@dev.tdt.de> +CC: Priyanka Jain <priyanka.jain@nxp.com> +--- + board/freescale/ls1046ardb/ls1046ardb.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/board/freescale/ls1046ardb/ls1046ardb.c ++++ b/board/freescale/ls1046ardb/ls1046ardb.c +@@ -88,6 +88,10 @@ int board_init(void) + ppa_init(); + #endif + ++#if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH) ++ pci_init(); ++#endif ++ + /* invert AQR105 IRQ pins polarity */ + out_be32(&scfg->intpcr, AQR105_IRQ_MASK); + diff --git a/package/boot/uboot-layerscape/patches/0002-board-ls1043ardb-force-PCI-device-enumeration.patch b/package/boot/uboot-layerscape/patches/0002-board-ls1043ardb-force-PCI-device-enumeration.patch new file mode 100644 index 0000000000..d38102a13c --- /dev/null +++ b/package/boot/uboot-layerscape/patches/0002-board-ls1043ardb-force-PCI-device-enumeration.patch @@ -0,0 +1,34 @@ +From 64d2dffa8b51c1beb7e472690dcac965ac0f7ac4 Mon Sep 17 00:00:00 2001 +From: Martin Schiller <ms@dev.tdt.de> +Date: Tue, 23 Nov 2021 07:24:19 +0100 +Subject: [PATCH] board: ls1043ardb: force PCI device enumeration + +Commit eb1986804d1d ("configs: enable DM_ETH support for LS1043ARDB") +resulted in the PCI bus no longer being implicitly enumerated. + +However, this is necessary for the fdt pcie fixups to work. + +Therefore, similar to commit 8b6558bd4187 ("board: ls1088ardb: +transition to DM_ETH"), pci_init() is now called in the board_init() +routine when CONFIG_DM_ETH is active. + +Signed-off-by: Martin Schiller <ms@dev.tdt.de> +CC: Priyanka Jain <priyanka.jain@nxp.com> +CC: Camelia Groza <camelia.groza@nxp.com> +--- + board/freescale/ls1043ardb/ls1043ardb.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/board/freescale/ls1043ardb/ls1043ardb.c ++++ b/board/freescale/ls1043ardb/ls1043ardb.c +@@ -214,6 +214,10 @@ int board_init(void) + ppa_init(); + #endif + ++#if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH) ++ pci_init(); ++#endif ++ + #ifdef CONFIG_U_QE + u_qe_init(); + #endif diff --git a/package/boot/uboot-layerscape/patches/010-fix_dtc_compilation_on_host_gcc10.patch b/package/boot/uboot-layerscape/patches/010-fix_dtc_compilation_on_host_gcc10.patch deleted file mode 100644 index 6abb151608..0000000000 --- a/package/boot/uboot-layerscape/patches/010-fix_dtc_compilation_on_host_gcc10.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e33a814e772cdc36436c8c188d8c42d019fda639 Mon Sep 17 00:00:00 2001 -From: Dirk Mueller <dmueller@suse.com> -Date: Tue, 14 Jan 2020 18:53:41 +0100 -Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration - -gcc 10 will default to -fno-common, which causes this error at link -time: - - (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here - -This is because both dtc-lexer as well as dtc-parser define the same -global symbol yyloc. Before with -fcommon those were merged into one -defintion. The proper solution would be to to mark this as "extern", -however that leads to: - - dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls] - 26 | extern YYLTYPE yylloc; - | ^~~~~~ -In file included from dtc-lexer.l:24: -dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here - 127 | extern YYLTYPE yylloc; - | ^~~~~~ -cc1: all warnings being treated as errors - -which means the declaration is completely redundant and can just be -dropped. - -Signed-off-by: Dirk Mueller <dmueller@suse.com> -Signed-off-by: David Gibson <david@gibson.dropbear.id.au> -[robh: cherry-pick from upstream] -Cc: stable@vger.kernel.org -Signed-off-by: Rob Herring <robh@kernel.org> ---- - scripts/dtc/dtc-lexer.l | 1 - - 1 file changed, 1 deletion(-) - ---- a/scripts/dtc/dtc-lexer.l -+++ b/scripts/dtc/dtc-lexer.l -@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n - #include "srcpos.h" - #include "dtc-parser.tab.h" - --YYLTYPE yylloc; - extern bool treesource_error; - - /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ |