diff options
Diffstat (limited to 'board')
20 files changed, 34 insertions, 44 deletions
diff --git a/board/freescale/ls1088a/ddr.h b/board/freescale/ls1088a/ddr.h index 764ed7945b..b35c4ae2da 100644 --- a/board/freescale/ls1088a/ddr.h +++ b/board/freescale/ls1088a/ddr.h @@ -30,12 +30,12 @@ static const struct board_specific_parameters udimm0[] = { #if defined(CONFIG_TARGET_LS1088ARDB) {2, 1666, 0, 8, 8, 0x090A0B0E, 0x0F10110D,}, - {2, 1900, 0, 4, 7, 0x09090B0D, 0x0E10120B,}, + {2, 1900, 0, 8, 9, 0x0A0B0C10, 0x1112140E,}, {2, 2300, 0, 8, 9, 0x0A0C0E11, 0x1214160F,}, {} #elif defined(CONFIG_TARGET_LS1088AQDS) {2, 1666, 0, 8, 8, 0x0A0A0C0E, 0x0F10110C,}, - {2, 1900, 0, 4, 7, 0x09090B0D, 0x0E10120B,}, + {2, 1900, 0, 8, 9, 0x0A0B0C10, 0x1112140E,}, {2, 2300, 0, 4, 9, 0x0A0C0D11, 0x1214150E,}, {} diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c index 9907fd2a33..40b1a0e631 100644 --- a/board/freescale/ls1088a/eth_ls1088aqds.c +++ b/board/freescale/ls1088a/eth_ls1088aqds.c @@ -4,12 +4,14 @@ */ #include <common.h> +#include <command.h> #include <netdev.h> #include <asm/io.h> #include <asm/arch/fsl_serdes.h> #include <hwconfig.h> #include <fsl_mdio.h> #include <malloc.h> +#include <phy.h> #include <fm_eth.h> #include <i2c.h> #include <miiphy.h> diff --git a/board/freescale/ls2080aqds/MAINTAINERS b/board/freescale/ls2080aqds/MAINTAINERS index 62c8fac09c..f7f1f09513 100644 --- a/board/freescale/ls2080aqds/MAINTAINERS +++ b/board/freescale/ls2080aqds/MAINTAINERS @@ -10,6 +10,6 @@ F: configs/ls2080aqds_qspi_defconfig F: configs/ls2080aqds_sdcard_defconfig LS2080A_SECURE_BOOT BOARD -M: Saksham Jain <saksham.jain@nxp.freescale.com> -S: Maintained +#M: Saksham Jain <saksham.jain@nxp.freescale.com> +S: Orphan (since 2018-05) F: configs/ls2080aqds_SECURE_BOOT_defconfig diff --git a/board/freescale/ls2080ardb/MAINTAINERS b/board/freescale/ls2080ardb/MAINTAINERS index 8da1c6d0ae..bbe56e2052 100644 --- a/board/freescale/ls2080ardb/MAINTAINERS +++ b/board/freescale/ls2080ardb/MAINTAINERS @@ -18,8 +18,8 @@ S: Maintained F: configs/ls2081ardb_defconfig LS2080A_SECURE_BOOT BOARD -M: Saksham Jain <saksham.jain@nxp.freescale.com> -S: Maintained +#M: Saksham Jain <saksham.jain@nxp.freescale.com> +S: Orphan (since 2018-05) F: configs/ls2080ardb_SECURE_BOOT_defconfig LS2088A_QSPI_SECURE_BOOT BOARD diff --git a/board/freescale/mpc8315erdb/MAINTAINERS b/board/freescale/mpc8315erdb/MAINTAINERS index 938c1527e0..5a67b40993 100644 --- a/board/freescale/mpc8315erdb/MAINTAINERS +++ b/board/freescale/mpc8315erdb/MAINTAINERS @@ -1,6 +1,6 @@ MPC8315ERDB BOARD -M: Dave Liu <daveliu@freescale.com> -S: Maintained +#M: Dave Liu <daveliu@freescale.com> +S: Orphan (since 2018-05) F: board/freescale/mpc8315erdb/ F: include/configs/MPC8315ERDB.h F: configs/MPC8315ERDB_defconfig diff --git a/board/freescale/mpc8323erdb/MAINTAINERS b/board/freescale/mpc8323erdb/MAINTAINERS index 05057c0c2d..496ab2af27 100644 --- a/board/freescale/mpc8323erdb/MAINTAINERS +++ b/board/freescale/mpc8323erdb/MAINTAINERS @@ -1,6 +1,6 @@ MPC8323ERDB BOARD -M: Michael Barkowski <michael.barkowski@freescale.com> -S: Maintained +#M: Michael Barkowski <michael.barkowski@freescale.com> +S: Orphan (since 2018-05) F: board/freescale/mpc8323erdb/ F: include/configs/MPC8323ERDB.h F: configs/MPC8323ERDB_defconfig diff --git a/board/freescale/mpc832xemds/MAINTAINERS b/board/freescale/mpc832xemds/MAINTAINERS index 56d70733b4..232658a203 100644 --- a/board/freescale/mpc832xemds/MAINTAINERS +++ b/board/freescale/mpc832xemds/MAINTAINERS @@ -1,6 +1,6 @@ MPC832XEMDS BOARD -M: Dave Liu <daveliu@freescale.com> -S: Maintained +#M: Dave Liu <daveliu@freescale.com> +S: Orphan (since 2018-05) F: board/freescale/mpc832xemds/ F: include/configs/MPC832XEMDS.h F: configs/MPC832XEMDS_defconfig diff --git a/board/freescale/mpc8349emds/MAINTAINERS b/board/freescale/mpc8349emds/MAINTAINERS index 141e77a94e..e6648d66a0 100644 --- a/board/freescale/mpc8349emds/MAINTAINERS +++ b/board/freescale/mpc8349emds/MAINTAINERS @@ -1,6 +1,6 @@ MPC8349EMDS BOARD -M: Kim Phillips <kim.phillips@freescale.com> -S: Maintained +#M: Kim Phillips <kim.phillips@freescale.com> +S: Orphan (since 2018-05) F: board/freescale/mpc8349emds/ F: include/configs/MPC8349EMDS.h F: configs/MPC8349EMDS_defconfig diff --git a/board/freescale/mpc837xemds/MAINTAINERS b/board/freescale/mpc837xemds/MAINTAINERS index 6ff1346206..8386aa7297 100644 --- a/board/freescale/mpc837xemds/MAINTAINERS +++ b/board/freescale/mpc837xemds/MAINTAINERS @@ -1,6 +1,6 @@ MPC837XEMDS BOARD -M: Dave Liu <daveliu@freescale.com> -S: Maintained +#M: Dave Liu <daveliu@freescale.com> +S: Orphan (since 2018-05) F: board/freescale/mpc837xemds/ F: include/configs/MPC837XEMDS.h F: configs/MPC837XEMDS_defconfig diff --git a/board/freescale/p1022ds/MAINTAINERS b/board/freescale/p1022ds/MAINTAINERS index 86aac365d3..62256c3703 100644 --- a/board/freescale/p1022ds/MAINTAINERS +++ b/board/freescale/p1022ds/MAINTAINERS @@ -1,5 +1,5 @@ P1022DS BOARD -M: Timur Tabi <timur@freescale.com> +M: Timur Tabi <timur@tabi.org> S: Maintained F: board/freescale/p1022ds/ F: include/configs/P1022DS.h diff --git a/board/freescale/t102xqds/MAINTAINERS b/board/freescale/t102xqds/MAINTAINERS index 23480e2d71..7e30e5f84b 100644 --- a/board/freescale/t102xqds/MAINTAINERS +++ b/board/freescale/t102xqds/MAINTAINERS @@ -1,6 +1,6 @@ T102XQDS BOARD -M: Shengzhou Liu <Shengzhou.Liu@freescale.com> -S: Maintained +#M: Shengzhou Liu <Shengzhou.Liu@freescale.com> +S: Orphan (since 2018-05) F: board/freescale/t102xqds/ F: include/configs/T102xQDS.h F: configs/T1024QDS_defconfig diff --git a/board/freescale/t102xrdb/MAINTAINERS b/board/freescale/t102xrdb/MAINTAINERS index 297e63a6ee..6c24f7785c 100644 --- a/board/freescale/t102xrdb/MAINTAINERS +++ b/board/freescale/t102xrdb/MAINTAINERS @@ -1,6 +1,6 @@ T102XRDB BOARD -M: Shengzhou Liu <Shengzhou.Liu@freescale.com> -S: Maintained +#M: Shengzhou Liu <Shengzhou.Liu@freescale.com> +S: Orphan (since 2018-05) F: board/freescale/t102xrdb/ F: include/configs/T102xRDB.h F: configs/T1024RDB_defconfig diff --git a/board/freescale/t4qds/MAINTAINERS b/board/freescale/t4qds/MAINTAINERS index b288571c7a..44bb2f5c6d 100644 --- a/board/freescale/t4qds/MAINTAINERS +++ b/board/freescale/t4qds/MAINTAINERS @@ -1,6 +1,6 @@ T4QDS BOARD -M: Shaohui Xie <Shaohui.Xie@freescale.com> -S: Maintained +#M: Shaohui Xie <Shaohui.Xie@freescale.com> +S: Orphan (since 2018-05) F: board/freescale/t4qds/ F: include/configs/T4240QDS.h F: configs/T4160QDS_defconfig diff --git a/board/freescale/t4rdb/MAINTAINERS b/board/freescale/t4rdb/MAINTAINERS index 53ccabc0fb..4ba5c3a546 100644 --- a/board/freescale/t4rdb/MAINTAINERS +++ b/board/freescale/t4rdb/MAINTAINERS @@ -1,6 +1,6 @@ T4RDB BOARD -M: Chunhe Lan <Chunhe.Lan@freescale.com> -S: Maintained +#M: Chunhe Lan <Chunhe.Lan@freescale.com> +S: Orphan (since 2018-05) F: board/freescale/t4rdb/ F: include/configs/T4240RDB.h F: configs/T4160RDB_defconfig diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c index 49bcafef74..6508e0ffa7 100644 --- a/board/liebherr/display5/spl.c +++ b/board/liebherr/display5/spl.c @@ -19,6 +19,7 @@ #include <environment.h> #include <fsl_esdhc.h> #include <netdev.h> +#include <bootcount.h> #include "common.h" DECLARE_GLOBAL_DATA_PTR; @@ -213,7 +214,7 @@ void board_boot_order(u32 *spl_boot_list) env_load(); s = env_get("BOOT_FROM"); - if (s && strcmp(s, "ACTIVE") == 0) { + if (s && !bootcount_error() && strcmp(s, "ACTIVE") == 0) { spl_boot_list[0] = BOOT_DEVICE_MMC1; spl_boot_list[1] = spl_boot_device(); } diff --git a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c index 3bd02f3c83..500dcce4da 100644 --- a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c +++ b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. * (c) Copyright 2017 Opal Kelly Inc. -* -* SPDX-License-Identifier: GPL-2.0+ *****************************************************************************/ #include <asm/arch/ps7_init_gpl.h> diff --git a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c index 5cf627d223..39afd82195 100644 --- a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** diff --git a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c index fc325a6b02..88ff7947f2 100644 --- a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** diff --git a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c index ca5490f0b0..e9e4e4d077 100644 --- a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** diff --git a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c index 54c803cfa6..df7d3535dd 100644 --- a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** |